修改bug2

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

@@ -39,7 +39,7 @@ public class commissionController {
         editBO.set("OLD_COMMISSION_DOLLARS", commissionBO.get("COMMISSION_DOLLARS"));
         editBO.set("OLD_RATIO", commissionBO.get("DOLLARS"));
         editBO.set("COMMISSION_BINDID", commissionBindid);
-        editBO.set("OLD_DOLLARS", "未执行");
+        editBO.set("IS_EFFECTIVE", "未执行");
         SDK.getBOAPI().create("BO_EU_DNCTT_COMMISSION_ADJUST", editBO, contractInstance, uc);
 
         if (commissionAgentList != null && commissionAgentList.size() > 0) {
@@ -47,7 +47,10 @@ public class commissionController {
                 BO editAgentBO = new BO();
                 bo.remove("CREATEDATE");
                 bo.remove("CREATEUSER");
+                bo.remove("ID");
+                bo.remove("BINDID");
                 editAgentBO.setAll(bo.asMap());
+                editAgentBO.setBindId(contractInstance.getId());
                 editAgentBO.set("OLD_RATIO", bo.get("RATIO"));
                 editAgentBO.set("OLD_DOLLARS", bo.get("DOLLARS"));
                 editAgentBO.set("OLD_TAX_DEDUCT", bo.get("TAX_DEDUCT"));
@@ -61,7 +64,10 @@ public class commissionController {
                 BO editSalesBO = new BO();
                 bo.remove("CREATEDATE");
                 bo.remove("CREATEUSER");
+                bo.remove("ID");
+                bo.remove("BINDID");
                 editSalesBO.setAll(bo.asMap());
+                editSalesBO.setBindId(contractInstance.getId());
                 editSalesBO.set("OLD_RATIO", bo.get("RATIO"));
                 editSalesBO.set("OLD_DOLLARS", bo.get("DOLLARS"));
                 editSalesBO.set("OLD_TAX_DEDUCT", bo.get("TAX_DEDUCT"));
@@ -70,7 +76,6 @@ public class commissionController {
             }
         }
 
-
         String processUrl = SDK.getFormAPI().getFormURL(SDK.getPortalAPI().getPortalUrl(), uc.getSessionId(), contractInstance.getId(), null, 1, null, editBO.getId(), null, true);
 
         ResponseObject responseObject = ResponseObject.newOkResponse();

com.awspaas.user.apps.donenow_ctt/src/com/awspaas/user/apps/donenow_ctt/event/commissionFormAfterSave.java

@@ -230,7 +230,7 @@ public class commissionFormAfterSave extends ExecuteListener {
                         } else {
                             //佣金周期
                             BO periodBO = new BO();
-                            periodBO.set("ZB_BILLING_DATE", period.getPeriodMonthStr());
+                            periodBO.set("ZB_FEE_DATE", period.getPeriodMonthStr());
                             periodBO.set("PERIOD_BEGIN_DATE", period.getPeriodBeginDateStr());
                             periodBO.set("PERIOD_END_DATE", period.getPeriodEndDateStr());
                             periodBO.set("COMMISSION_DOLLARS", multiply(period.getRate(), commissionBO.get("COMMISSION_DOLLARS")));

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

@@ -15,7 +15,6 @@ import com.actionsoft.bpms.util.DBSql;
 import com.actionsoft.sdk.local.SDK;
 import org.apache.commons.lang3.StringUtils;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -23,8 +22,6 @@ import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 @Controller
@@ -159,13 +156,10 @@ public class sysController {
                 return "请选择要发版的app";
             }
 
-            if (SDK.getAppAPI().isActive(appId) == false || SDK.getAppAPI().isInstalled(appId) == false) {
-                return "请选择要发版的app";
-            }
-
             Path target = targetDirectory.resolve(source.getFileName());
 
-            // 检查目标文件是否存在
+            // 检查目标文件是否存在  以前文件不保存
+            /*
             File targetFile = target.toFile();
             if (targetFile.exists()) {
                 System.out.println("目标文件已存在，尝试重命名...");
@@ -181,11 +175,12 @@ public class sysController {
                 Files.move(target, newFilePath, StandardCopyOption.REPLACE_EXISTING);
                 System.out.println("已重命名现有文件为: " + newFileName);
             }
+
+             */
+            Files.move(source, target, StandardCopyOption.REPLACE_EXISTING);
             System.out.println("文件已移动到目标目录: " + target);
             FBjar.set("STATUS", "已发版--成功");
-            SDK.getBOAPI().update("BO_EU_HTJAR", FBjar);
-            Files.move(source, target, StandardCopyOption.REPLACE_EXISTING);
-
+            SDK.getBOAPI().update("BO_EU_DNSYS_JAR", FBjar);
 
             return "成功";
         } catch (IOException e1) {