合同服务调整修改bug

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

@@ -331,7 +331,10 @@ public class contractCreateController {
         editBO.set("OLD_TOTAL_COST", contractService.get("TOTAL_COST"));
         editBO.setBindId(contractInstance.getId());
 
-        String maxEffectiveDate = DBSql.getString("SELECT MAX(EFFECTIVE_DATE) FROM BO_EU_DNCTT_CONTRACT_SERVICE_EDIT WHERE CONTRACT_ID=? and CONTRACT_SERVICE_ID=? and IS_EFFECTIVE='已执行' ", new Object[]{contractService.get("CONTRACT_ID"), contractService.get("ID")});
+        String maxEffectiveDate = DBSql.getString("SELECT MAX(EFFECTIVE_DATE) FROM BO_EU_DNCTT_CONTRACT_SERVICE_EDIT WHERE CONTRACT_ID=? and CONTRACT_SERVICE_ID=? and IS_EFFECTIVE='已执行' ", new Object[]{contractService.get("CONTRACT_ID"), serviceId});
+        if (StringUtils.isBlank(maxEffectiveDate))
+            maxEffectiveDate = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+
         editBO.set("EFFECTIVE_DATE", maxEffectiveDate);
         editBO.set("IS_EFFECTIVE", "未执行");
         SDK.getBOAPI().create("BO_EU_DNCTT_CONTRACT_SERVICE_EDIT", editBO, contractInstance, uc);

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

@@ -541,6 +541,8 @@ public class contractService {
             }
 
             DBSql.update(conn, "delete from BO_EU_DNCTT_CONTRACT_SERVICE_ADJUST where BINDID=? and CONTRACT_ID=? and CONTRACT_SERVICE_ID=?", new Object[]{service.get("BINDID"), contract.get("ID"), service.get("ID")});
+
+            DBSql.update("delete from BO_EU_DNCTT_CONTRACT_SERVICE_EDIT where  CONTRACT_SERVICE_ID=?", new Object[]{service.get("ID")});
         }
 
         if (StringUtils.isNotBlank(PERIOD)) {