czh 2 yıl önce
ebeveyn
işleme
4afb82fe5b

+ 1 - 1
sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsService.java

@@ -644,7 +644,7 @@ public class KwcContractLogisticsService {
         List<KwcContractLogistics> kwcContractLogistics = kwcContractLogisticsMapper.selectBatchIds(contractIdList);
         Date date = new Date();
         kwcContractLogistics.forEach(item -> {
-            if (item.getStatus() != ContractStatusEnum.SAVE.getCode()) {
+            if (item.getStatus().equals(ContractStatusEnum.SAVE.getCode())) {
                 throw new SystemException(HttpStatus.CODE_10301, HttpStatus.MSG_022);
             }
             item.setDelFlag(Global.YES);

+ 2 - 2
sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeService.java

@@ -717,10 +717,10 @@ public class KwcContractTradeService {
         List<KwcContractTrade> kwcContractTradeList = kwcContractTradeMapper.selectBatchIds(contractIdList);
         Date date = new Date();
         kwcContractTradeList.forEach(item -> {
-            if (item.getStatus() != ContractStatusEnum.SAVE.getCode()) {
+            if (item.getStatus().equals(ContractStatusEnum.SAVE.getCode())) {
                 throw new SystemException(HttpStatus.CODE_10301, HttpStatus.MSG_022);
             }
-            item.setStatus(ContractStatusEnum.COMPLETE.getCode());
+            item.setDelFlag(Global.YES);
             item.setUpdateBy(LoginUserHolder.getUserId());
             item.setUpdateTime(date);
             if (kwcContractTradeMapper.updateById(item) <= 0) {