合同变更更改

hx-sale/src/main/java/com/fjhx/sale/flow/ContractUpdateFlow.java

@@ -9,6 +9,7 @@ import com.fjhx.common.utils.Assert;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.flow.enums.FlowStatusEnum;
+import com.fjhx.sale.entity.claim.po.Claim;
 import com.fjhx.sale.entity.claim.po.ClaimContract;
 import com.fjhx.sale.entity.contract.dto.ContractDto;
 import com.fjhx.sale.entity.contract.po.Contract;
@@ -16,6 +17,7 @@ import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.entity.contract.po.ContractProject;
 import com.fjhx.sale.entity.contract.po.ContractShipment;
 import com.fjhx.sale.service.claim.ClaimContractService;
+import com.fjhx.sale.service.claim.ClaimService;
 import com.fjhx.sale.service.contract.ContractProductService;
 import com.fjhx.sale.service.contract.ContractProjectService;
 import com.fjhx.sale.service.contract.ContractService;
@@ -51,9 +53,12 @@ public class ContractUpdateFlow extends FlowDelegate {
 
     @Autowired
     private ContractProductService contractProductService;
+
     @Autowired
     private ClaimContractService claimContractService;
 
+    @Autowired
+    private ClaimService claimService;
 
     @Autowired
     private ContractProjectService contractProjectService;
@@ -275,8 +280,16 @@ public class ContractUpdateFlow extends FlowDelegate {
         oldContract.setIsChange("1");
         contractService.updateById(oldContract);
 
+
+        List<ClaimContract> claimContractList = claimContractService.list(Wrappers.<ClaimContract>query().lambda().eq(ClaimContract::getContractId,oldContractId));
+        List<Long> claimIds = claimContractList.stream().map(ClaimContract::getClaimId).collect(Collectors.toList());
+        List<Long> claimContractIds = claimContractList.stream().map(ClaimContract::getId).collect(Collectors.toList());
         //删除到账认领数据
-        claimContractService.remove(q -> q.eq(ClaimContract::getContractId, oldContractId));
+        claimContractService.remove(q -> q.in(ClaimContract::getId, claimContractIds));
+        //删除到账认领数据
+        claimService.remove(q -> q.in(Claim::getId, claimIds));
+
+
         oldContract.setUpId(temOldId);
         oldContract.setIsShow(1);//隐藏旧合同
         contractService.updateContract(oldContract);