如果合同服务上面的生效日期小于服务调整的生效日期，则将合同服务生效日期改为服务调整的生效日期

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

@@ -72,8 +72,17 @@ public class contractServiceController {
             if (DBSql.getInt("SELECT count(1) FROM BO_EU_DNCTT_CONTRACT_SERVICE_PERIOD WHERE APPROVE_AND_POST_USER_ID IS NOT NULL AND LENGTH(APPROVE_AND_POST_USER_ID)>1 AND APPROVE_AND_POST_DATE IS NOT NULL and CONTRACT_SERVICE_ID=? AND  PERIOD_END_DATE>=?", new Object[]{serviceId, LocalDateYYYYMMDD(EFFECTIVE_DATE)}) > 0) {
                 return ResponseObject.newErrResponse("生效日期之后的合同服务已经进行审批！");
             }
+
+            //服务生效日期 不能大于合同服务上的生效日期
+            /*
+            if (DBSql.getInt("select count(1) CNT from BO_EU_DNCTT_CONTRACT_SERVICE where  ID =? and EFFECTIVE_DATE <=?", new Object[]{serviceId, LocalDateYYYYMMDD(EFFECTIVE_DATE)}) == 0) {
+                return ResponseObject.newErrResponse("调整服务生效日期不能大于合同服务上的生效日期");
+            }
+
+             */
         }
 
+
         if (contractServiceAdj.getInstance().execServiceSaleAdj(uc, boId))
 
             return ResponseObject.newOkResponse();

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

@@ -273,6 +273,11 @@ public class contractServiceAdj {
             orgContractService.set("PERIOD_TYPE", contractService.get("PERIOD_TYPE"));
             orgContractService.set("CALC_METHOD_1STPERIOD", contractService.get("CALC_METHOD_1STPERIOD"));
             orgContractService.set("MONTH_1STQUARTER", contractService.get("MONTH_1STQUARTER"));
+
+            //如果合同服务上面的生效日期小于服务调整的生效日期，则将合同服务生效日期改为服务调整的生效日期
+            if (orgContractService.get("EFFECTIVE_DATE", LocalDate.class).compareTo(contractService.get("EFFECTIVE_DATE", LocalDate.class)) < 0)
+                orgContractService.set("EFFECTIVE_DATE", contractService.get("EFFECTIVE_DATE"));
+
             SDK.getBOAPI().update("BO_EU_DNCTT_CONTRACT_SERVICE", orgContractService, conn);
 
             conn.commit();
@@ -633,6 +638,11 @@ public class contractServiceAdj {
             orgContractService.set("MONTH_1STQUARTER", contractService.get("MONTH_1STQUARTER"));
             orgContractService.set("PURCHASE_PERIOD_TYPE", contractService.get("PURCHASE_PERIOD_TYPE"));
             orgContractService.set("PURCHASE_END_DATE", contractService.get("PURCHASE_END_DATE"));
+
+            //如果合同服务上面的生效日期小于服务调整的生效日期，则将合同服务生效日期改为服务调整的生效日期
+            if (orgContractService.get("PURCHASE_START_DATE", LocalDate.class).compareTo(contractService.get("PURCHASE_START_DATE", LocalDate.class)) < 0)
+                orgContractService.set("PURCHASE_START_DATE", contractService.get("PURCHASE_START_DATE"));
+
             SDK.getBOAPI().update("BO_EU_DNCTT_CONTRACT_SERVICE", orgContractService, conn);