大后台

src/main/java/common/repository/ChangeDelInfoRepository.java

@@ -11,6 +11,6 @@ public interface ChangeDelInfoRepository  extends JpaRepository<ChangeDelInfo, L
     @Query(value = "select * from change_del_info where contract_code = ?1 order by ds desc",nativeQuery = true)
     List<ChangeDelInfo> findByContract(String contranctCode);
 
-    @Query(value = "select * from change_del_info where ds >= ?1  and ds <= ?2 order by ds desc",nativeQuery = true)
+    @Query(value = "select * from change_del_info where ds >= ?1  and ds <= ?2 order by creat_time desc",nativeQuery = true)
     List<ChangeDelInfo> findOnStartDate(String startDate, String endDate);
 }

src/main/java/common/repository/ContractRepository.java

@@ -72,4 +72,8 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
 
     @Query(value = "select contract_code from contract where my_body_code = ?1 order by code_num desc limit 1",nativeQuery = true)
     String findLastCode(String code);
+
+
+    @Query(value = "select * from contract where id = ?1 union all select * from contract where id = ?2",nativeQuery = true)
+    List<Contract> findByTwoIds(Long relationContract, Long relationContract1);
 }

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

@@ -659,8 +659,14 @@ public class ContractServiceImpl implements ContractService {
 
         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,byfind);
+            Map<String,String> dataDic = new HashMap();
+            for(TradeType tradeType: types){
+                dataDic.put(tradeType.getId().toString(),tradeType.getName());
+            }
+            String nameFind = dataDic.get(byfind.getTradeType()+"");
+            String nameResource = dataDic.get(resource.getTradeType()+"");
+            this.dealChangeInfoDetail(nameFind == null ? "无" : nameFind, nameResource == null ? "无" : nameResource,
+                    "行业分类", "tradeType", pid, delDetailsList, byfind);
         }
 
         this.dealChangeInfoDetail(byfind.getStartDate(),resource.getStartDate(),
@@ -687,28 +693,14 @@ public class ContractServiceImpl implements ContractService {
                 CONTRACT_TYPE.get(resource.getContractType()),
                 "签约类型","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,byfind);
-//        }
-
-//        this.dealChangeInfoDetail(byfind.getMoney()==null?"":byfind.getMoney().toString(),
-//                resource.getMoney()==null?"":resource.getMoney().toString(),
-//                "合同金额","money",pid,delDetailsList,contractCode);
-//
-//        this.dealChangeInfoDetail(byfind.getPayMoney()==null?"":byfind.getPayMoney().toString(),
-//                resource.getPayMoney()==null?"":resource.getPayMoney().toString(),
-//                "回款金额","payMoney",pid,delDetailsList,contractCode);
-//
-//        this.dealChangeInfoDetail(byfind.getInvoiceMoney()==null?"":byfind.getInvoiceMoney().toString(),
-//                resource.getInvoiceMoney()==null?"":resource.getInvoiceMoney().toString(),
-//                "发票金额","invoiceMoney",pid,delDetailsList,contractCode);
-
         this.dealChangeInfoDetail(byfind.getDiscountTimeLong()==null?"":byfind.getDiscountTimeLong().toString(),
                 resource.getDiscountTimeLong()==null?"":resource.getDiscountTimeLong().toString(),
                 "赠送时长","discountTimeLong",pid,delDetailsList,byfind);
 
+        this.dealChangeInfoDetail(byfind.getRelationCode()==null?"无":byfind.getRelationCode(),
+                resource.getRelationCode()==null?"无":resource.getRelationCode(),
+                    "关联合同","relationCode",pid,delDetailsList,byfind);
+
         return delDetailsList;