佣金审批并提交、调整佣金、恢复佣金初始值

com.awspaas.user.apps.donenow_ctt/src/com/awspaas/user/apps/donenow_ctt/controller/contractApproveController.java

@@ -1028,9 +1028,7 @@ public class contractApproveController {
     public ResponseObject approveCommission(UserContext uc, String approveDate, String approveIds) throws SQLException {
         if (StringUtils.isBlank(approveDate) || StringUtils.isBlank(approveIds))
             return ResponseObject.newErrResponse("参数错误");
-
         contractService.getInstance().approveCommission(uc, approveDate, approveIds);
-
         return ResponseObject.newOkResponse();
     }
 
@@ -1044,6 +1042,10 @@ public class contractApproveController {
     public ResponseObject updateCommissionPrice(UserContext uc, String id, String periodPrice) throws SQLException {
 
         BO bo = SDK.getBOAPI().get("BO_EU_DNCTT_COMMISSION_PERIOD", id);//佣金
+
+        if(bo.get("APPROVE_AND_POST_DATE")!=null||StringUtils.isNotBlank(bo.getString("APPROVE_AND_POST_USER_ID")))
+            return ResponseObject.newErrResponse("该佣金已审批通过");
+
         bo.set("PERIOD_ADJUSTED_PRICE", periodPrice);
         SDK.getBOAPI().update("BO_EU_DNCTT_COMMISSION_PERIOD", bo);
 
@@ -1057,11 +1059,15 @@ public class contractApproveController {
      * @return
      */
     @Mapping(value = "com.awspaas.user.apps.donenow_ctt.approve_initCommissionPrice")
-    public ResponseObject initCommissionPrice(UserContext uc, String ids) throws SQLException {
+    public ResponseObject initCommissionPrice(UserContext uc, String ids) {
 
         for (String id : ids.split(","))
         {
             BO bo = SDK.getBOAPI().get("BO_EU_DNCTT_COMMISSION_PERIOD", id);//佣金
+
+            if(bo.get("APPROVE_AND_POST_DATE")!=null||StringUtils.isNotBlank(bo.getString("APPROVE_AND_POST_USER_ID")))
+                return ResponseObject.newErrResponse("该佣金已审批通过");
+
             bo.set("PERIOD_ADJUSTED_PRICE", bo.get("COMMISSION_DOLLARS"));
             SDK.getBOAPI().update("BO_EU_DNCTT_COMMISSION_PERIOD", bo);
         }
@@ -1069,4 +1075,46 @@ public class contractApproveController {
         return ResponseObject.newOkResponse();
     }
 
+
+
+    /**
+     * 撤销佣金审批
+     * @param ids
+     * @return
+     */
+    @Mapping("com.awspaas.user.apps.donenow_ctt.revoke_commission")
+    public ResponseObject revokeCommission(UserContext uc, String ids) throws SQLException {
+        Connection connUpdate = null;
+        try {
+            connUpdate = DBSql.open();
+            connUpdate.setAutoCommit(false);
+            for (String id : ids.split(",")) {
+                BO bo = SDK.getBOAPI().get("BO_EU_DNCRM_ACCOUNT_DEDUCTION", id);
+                bo.set("CLOSED", 1);
+                dn.recordFormChanges.record(uc, bo, "撤销佣金审批");
+
+                SDK.getBOAPI().remove("BO_EU_DNCRM_ACCOUNT_DEDUCTION", bo.getId(), connUpdate);
+
+                BO oldEntry = SDK.getBOAPI().get("BO_EU_DNCTT_COMMISSION_PERIOD", bo.getString("OBJECT_ID"));
+                oldEntry.set("APPROVE_AND_POST_DATE", null);
+                oldEntry.set("APPROVE_AND_POST_USER_ID", null);
+                dn.recordFormChanges.record(uc, oldEntry, "撤销佣金审批");
+                SDK.getBOAPI().update("BO_EU_DNCTT_COMMISSION_PERIOD", oldEntry);
+
+            }
+            connUpdate.commit();
+        } catch (SQLException e) {
+            if (connUpdate != null && !connUpdate.isClosed())
+                try {
+                    connUpdate.rollback();
+                } catch (SQLException ex) {
+                    ex.printStackTrace();
+                }
+        } finally {
+            if (connUpdate != null && !connUpdate.isClosed())
+                DBSql.close(connUpdate);
+        }
+        return ResponseObject.newOkResponse();
+    }
+
 }

com.awspaas.user.apps.donenow_ctt/src/com/awspaas/user/apps/donenow_ctt/service/contractService.java

@@ -1720,8 +1720,6 @@ public class contractService {
 
                 BO cad = new BO();// crm_account_deduction();//审批并提交表实体对象
                 String TAX_CATEGORY_ID = null;//物料计费代码
-                String CONTRACT_SERVICE_ID = null;//合同服务ID
-                String CONTRACT_ID = null;//合同ID
 
                 String ORGID = uc.getCompanyModel().getId();
 

com.awspaas.user.apps.donenow_sys/src/com/awspaas/user/apps/donenow_sys/controller/sysController.java

@@ -186,14 +186,7 @@ public class sysController {
             SDK.getBOAPI().update("BO_EU_HTJAR", FBjar);
             Files.move(source, target, StandardCopyOption.REPLACE_EXISTING);
 
-            //输出 targetDirectory 下面所有文件名
-            /*
-            System.out.println("合同lib目录下的文件列表:");
-            for (File file : targetDirectory.toFile().listFiles()) {
-                System.out.println(file.getName());
-                System.out.println(file.getAbsolutePath());
-            }
-            */
+
             return "成功";
         } catch (IOException e1) {
             return "失败";