操作日志

src/main/java/common/service/impl/ContractServiceImpl.java

@@ -617,8 +617,18 @@ public class ContractServiceImpl implements ContractService {
         delInfo.setDetail("修改详情");
         delInfo.setIp(ip);
 
+
+        List<ChangeDelDetail> updateFields = this.changeDelInfoForContract(contract,resource,delInfo.getId(),"");
+
+        if (updateFields != null && updateFields.size() > 0) {
             changeDelInfoRepository.save(delInfo);
-        this.changeDelInfoForContract(contract,resource,delInfo.getId(),"");
+
+            for (ChangeDelDetail delDetail : updateFields) {
+                delDetail.setParentId(delInfo.getId());
+            }
+
+            changeDelDetailRepository.save(updateFields);
+        }
 
         resource.setCreateName(contract.getCreateName());
         resource.setCreateAccount(contract.getCreateAccount());
@@ -637,52 +647,52 @@ public class ContractServiceImpl implements ContractService {
 
     }
 
-    private void changeDelInfoForContract(Contract byfind,Contract resource,Long pid,String ip){
+    private List<ChangeDelDetail> changeDelInfoForContract(Contract byfind, Contract resource, Long pid, String ip){
 
         List<ChangeDelDetail> delDetailsList = new ArrayList<>();
         String contractCode = byfind.getContractCode();
         this.dealChangeInfoDetail(byfind.getCustomerBody(),resource.getCustomerBody(),
-                "客户签约主体","customerBody",pid,delDetailsList,contractCode);
+                "客户签约主体","customerBody",pid,delDetailsList,byfind);
         this.dealChangeInfoDetail(byfind.getCustomerShort(),resource.getCustomerShort(),
-                "客户简称","customerShort",pid,delDetailsList,contractCode);
+                "客户简称","customerShort",pid,delDetailsList,byfind);
         this.dealChangeInfoDetail(byfind.getCustomerThird(),resource.getCustomerThird(),
-                "第三方签约主体","customerThird",pid,delDetailsList,contractCode);
+                "第三方签约主体","customerThird",pid,delDetailsList,byfind);
 
         if (byfind.getTradeType() != resource.getTradeType()) {
             List<TradeType> types = tradeTypeRepsitory.findByTwoId(byfind.getTradeType(), resource.getTradeType());
             this.dealChangeInfoDetail(types.get(0).getName(), types.get(1).getName(),
-                    "行业分类", "tradeType", pid, delDetailsList,contractCode);
+                    "行业分类", "tradeType", pid, delDetailsList,byfind);
         }
 
         this.dealChangeInfoDetail(byfind.getStartDate(),resource.getStartDate(),
-                "合同开始日期","startDate",pid,delDetailsList,contractCode);
+                "合同开始日期","startDate",pid,delDetailsList,byfind);
 
         this.dealChangeInfoDetail(byfind.getEndDate(),resource.getEndDate(),
-                "合同结束日期","startDate",pid,delDetailsList,contractCode);
+                "合同结束日期","startDate",pid,delDetailsList,byfind);
 
 
         if (byfind.getSale() != resource.getSale()) {
             List<Sales> sales = salesRepository.findByTwoId(byfind.getSale(),resource.getSale());
             this.dealChangeInfoDetail(sales.get(0).getName(),sales.get(1).getName(),
-                    "签约销售","sale",pid,delDetailsList,contractCode);
+                    "签约销售","sale",pid,delDetailsList,byfind);
         }
 
         this.dealChangeInfoDetail(byfind.getExtraFlow()==null?"":byfind.getExtraFlow().toString(),
                 resource.getExtraFlow()==null?"":resource.getExtraFlow().toString(),
-                "赠送流量","extraFlow",pid,delDetailsList,contractCode);
+                "赠送流量","extraFlow",pid,delDetailsList,byfind);
 
         this.dealChangeInfoDetail(byfind.getEmail(),resource.getEmail(),
-                "客户主账号","startDate",pid,delDetailsList,contractCode);
+                "客户主账号","startDate",pid,delDetailsList,byfind);
 
         this.dealChangeInfoDetail(CONTRACT_TYPE.get(byfind.getContractType()),
                 CONTRACT_TYPE.get(resource.getContractType()),
-                "签约类型","startDate",pid,delDetailsList,contractCode);
+                "签约类型","startDate",pid,delDetailsList,byfind);
 
-        if(byfind.getPriceLevel()!=null && !byfind.getPriceLevel().equals(resource.getPriceLevel())){
-            List<PackageType> packageTypes = packageTypeRepository.findByTwoId(byfind.getPriceLevel(),resource.getPriceLevel());
-            this.dealChangeInfoDetail(packageTypes.get(0).getPackageName(),packageTypes.get(1).getPackageName(),
-                    "套餐","priceLevel",pid,delDetailsList,contractCode);
-        }
+//        if(byfind.getPriceLevel()!=null && !byfind.getPriceLevel().equals(resource.getPriceLevel())){
+//            List<PackageType> packageTypes = packageTypeRepository.findByTwoId(byfind.getPriceLevel(),resource.getPriceLevel());
+//            this.dealChangeInfoDetail(packageTypes.get(0).getPackageName(),packageTypes.get(1).getPackageName(),
+//                    "套餐","priceLevel",pid,delDetailsList,byfind);
+//        }
 
 //        this.dealChangeInfoDetail(byfind.getMoney()==null?"":byfind.getMoney().toString(),
 //                resource.getMoney()==null?"":resource.getMoney().toString(),
@@ -698,15 +708,17 @@ public class ContractServiceImpl implements ContractService {
 
         this.dealChangeInfoDetail(byfind.getDiscountTimeLong()==null?"":byfind.getDiscountTimeLong().toString(),
                 resource.getDiscountTimeLong()==null?"":resource.getDiscountTimeLong().toString(),
-                "赠送时长","discountTimeLong",pid,delDetailsList,contractCode);
+                "赠送时长","discountTimeLong",pid,delDetailsList,byfind);
+
+        return delDetailsList;
+
 
-        changeDelDetailRepository.save(delDetailsList);
 
 
     }
 
     private void dealChangeInfoDetail(String before, String now,String delDetailinfo,String fildeName,
-                                      Long pid,List<ChangeDelDetail> delDetails,String contractCode) {
+                                      Long pid,List<ChangeDelDetail> delDetails,Contract contract) {
 
         ChangeDelDetail delDetail = new ChangeDelDetail();
         delDetail.setFiledName(fildeName);
@@ -714,7 +726,8 @@ public class ContractServiceImpl implements ContractService {
         delDetail.setCreatTime(new Date());
         delDetail.setItem("合同修改");
         delDetail.setParentId(pid);
-        delDetail.setContractCode(contractCode);
+        delDetail.setContractCode(contract.getContractCode());
+        delDetail.setEmail(contract.getEmail());
 
         if (before != null && !before.equals(now)) {
             delDetail.setBeforeValue(before);