操作日志

src/main/java/common/controller/UserLogController.java

@@ -38,9 +38,9 @@ public class UserLogController
     @ResponseBody
     public ResultModel getChangeDelData(@PathVariable String platform, @CurrentAccount User loginAccount,
                                         HttpServletRequest request,
-                                        String contranctCode) {
+                                        String contranctCode,String startDate,String  endDate) {
 
-        return ResultModel.OK(service.getChangeDelData(platform,loginAccount,contranctCode));
+        return ResultModel.OK(service.getChangeDelData(platform,loginAccount,contranctCode,startDate,endDate));
     }
 
     @RequestMapping(value = "change/del/detail", method = RequestMethod.GET)

src/main/java/common/repository/ChangeDelDetailRepository.java

@@ -10,6 +10,6 @@ import java.util.List;
 public interface ChangeDelDetailRepository extends JpaRepository<ChangeDelDetail, Long> {
 
 
-    @Query(value = "select * from change_del_detail where parent_id = 1? order by creat_time desc ",nativeQuery = true)
+    @Query(value = "select * from change_del_detail where parent_id = ?1 order by creat_time desc ",nativeQuery = true)
     List<ChangeDelDetail> findByPid(String pid);
 }

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

@@ -8,6 +8,9 @@ import java.util.List;
 
 public interface ChangeDelInfoRepository  extends JpaRepository<ChangeDelInfo, Long> {
 
-    @Query(value = "select * from change_del_info where contract_code = 1? order by ds desc",nativeQuery = true)
+    @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)
+    List<ChangeDelInfo> findOnStartDate(String startDate, String endDate);
 }

src/main/java/common/repository/SalesRepository.java

@@ -8,11 +8,11 @@ import java.util.List;
 
 public interface SalesRepository extends JpaRepository<Sales, Long> {
 
-    @Query(value = "select * from sales where status = 1? order by area_type,id",nativeQuery = true)
+    @Query(value = "select * from sales where status = ?1 order by area_type,id",nativeQuery = true)
     List<Sales> findSaleByStatus(Integer status);
 
 
-    @Query(value = "select * from sales where id =1? union all select * from sales where id =2?",nativeQuery = true)
+    @Query(value = "select * from sales where id = ?1 union all select * from sales where id =?2",nativeQuery = true)
     List<Sales> findByTwoId(Long sale, Long sale1);
 
     @Query(value = "select * from sales where status = '0' order by area_type,id",nativeQuery = true)

src/main/java/common/repository/TradeTypeRepsitory.java

@@ -12,6 +12,6 @@ import java.util.List;
 public interface TradeTypeRepsitory extends JpaRepository<TradeType, Long>{
 
 
-    @Query(value = "select * from trade_type where id = 1? union all select * from trade_type where id = 2?",nativeQuery = true)
+    @Query(value = "select * from trade_type where id = ?1 union all select * from trade_type where id = ?2",nativeQuery = true)
     List<TradeType> findByTwoId(int tradeType, int tradenow);
 }

src/main/java/common/service/ContractService.java

@@ -65,7 +65,7 @@ public interface ContractService {
 
     Object changesDel(String platform, String id, String type, String ip, User loginAccount);
 
-    List<ChangeDelInfo> getChangeDelData(String platform, User loginAccount, String contranctCode);
+    List<ChangeDelInfo> getChangeDelData(String platform, User loginAccount, String contranctCode, String startDate, String endDate);
 
     List<ChangeDelDetail> getChangeDelDetailData(String platform, User loginAccount, String pid);
 }
\ No newline at end of file

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

@@ -640,71 +640,73 @@ public class ContractServiceImpl implements ContractService {
     private void 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);
+                "客户签约主体","customerBody",pid,delDetailsList,contractCode);
         this.dealChangeInfoDetail(byfind.getCustomerShort(),resource.getCustomerShort(),
-                "客户简称","customerShort",pid,delDetailsList);
+                "客户简称","customerShort",pid,delDetailsList,contractCode);
         this.dealChangeInfoDetail(byfind.getCustomerThird(),resource.getCustomerThird(),
-                "第三方签约主体","customerThird",pid,delDetailsList);
+                "第三方签约主体","customerThird",pid,delDetailsList,contractCode);
 
         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);
+                    "行业分类", "tradeType", pid, delDetailsList,contractCode);
         }
 
         this.dealChangeInfoDetail(byfind.getStartDate(),resource.getStartDate(),
-                "合同开始日期","startDate",pid,delDetailsList);
+                "合同开始日期","startDate",pid,delDetailsList,contractCode);
 
         this.dealChangeInfoDetail(byfind.getEndDate(),resource.getEndDate(),
-                "合同结束日期","startDate",pid,delDetailsList);
+                "合同结束日期","startDate",pid,delDetailsList,contractCode);
 
 
         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);
+                    "签约销售","sale",pid,delDetailsList,contractCode);
         }
 
         this.dealChangeInfoDetail(byfind.getExtraFlow()==null?"":byfind.getExtraFlow().toString(),
                 resource.getExtraFlow()==null?"":resource.getExtraFlow().toString(),
-                "赠送流量","extraFlow",pid,delDetailsList);
+                "赠送流量","extraFlow",pid,delDetailsList,contractCode);
 
         this.dealChangeInfoDetail(byfind.getEmail(),resource.getEmail(),
-                "客户主账号","startDate",pid,delDetailsList);
+                "客户主账号","startDate",pid,delDetailsList,contractCode);
 
         this.dealChangeInfoDetail(CONTRACT_TYPE.get(byfind.getContractType()),
                 CONTRACT_TYPE.get(resource.getContractType()),
-                "签约类型","startDate",pid,delDetailsList);
+                "签约类型","startDate",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);
+                    "套餐","priceLevel",pid,delDetailsList,contractCode);
         }
 
-        this.dealChangeInfoDetail(byfind.getMoney()==null?"":byfind.getMoney().toString(),
-                resource.getMoney()==null?"":resource.getMoney().toString(),
-                "合同金额","money",pid,delDetailsList);
-
-        this.dealChangeInfoDetail(byfind.getPayMoney()==null?"":byfind.getPayMoney().toString(),
-                resource.getPayMoney()==null?"":resource.getPayMoney().toString(),
-                "回款金额","payMoney",pid,delDetailsList);
-
-        this.dealChangeInfoDetail(byfind.getInvoiceMoney()==null?"":byfind.getInvoiceMoney().toString(),
-                resource.getInvoiceMoney()==null?"":resource.getInvoiceMoney().toString(),
-                "发票金额","invoiceMoney",pid,delDetailsList);
+//        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);
+                "赠送时长","discountTimeLong",pid,delDetailsList,contractCode);
 
         changeDelDetailRepository.save(delDetailsList);
 
 
     }
 
-    private void dealChangeInfoDetail(String before, String now,String delDetailinfo,String fildeName, Long pid,List<ChangeDelDetail> delDetails) {
+    private void dealChangeInfoDetail(String before, String now,String delDetailinfo,String fildeName,
+                                      Long pid,List<ChangeDelDetail> delDetails,String contractCode) {
 
         ChangeDelDetail delDetail = new ChangeDelDetail();
         delDetail.setFiledName(fildeName);
@@ -712,6 +714,7 @@ public class ContractServiceImpl implements ContractService {
         delDetail.setCreatTime(new Date());
         delDetail.setItem("合同修改");
         delDetail.setParentId(pid);
+        delDetail.setContractCode(contractCode);
 
         if (before != null && !before.equals(now)) {
             delDetail.setBeforeValue(before);
@@ -1341,7 +1344,6 @@ public class ContractServiceImpl implements ContractService {
             contractMoney.setDelFlag(1);
             contractMoneyRepository.save(contractMoney);
 
-            User user = userRepository.findOne(contractMoney.getModifyAccount());
             ChangeDelInfo changeDelInfo = new ChangeDelInfo();
             changeDelInfo.setContractCode(contractMoney.getContractCode());
             changeDelInfo.setEmail(contractMoney.getEmail());
@@ -1365,9 +1367,9 @@ public class ContractServiceImpl implements ContractService {
     }
 
     @Override
-    public List<ChangeDelInfo> getChangeDelData(String platform, User loginAccount, String contranctCode) {
+    public List<ChangeDelInfo> getChangeDelData(String platform, User loginAccount, String contranctCode, String startDate, String endDate) {
 
-        List<ChangeDelInfo> datas = changeDelInfoRepository.findAll();
+        List<ChangeDelInfo> datas = changeDelInfoRepository.findOnStartDate(startDate,endDate);
         return datas;
     }
 

src/main/java/tkio/repository/PackageTypeRepository.java

@@ -16,6 +16,6 @@ public interface PackageTypeRepository extends JpaRepository<PackageType, Long>
     @Query(value = " select * from package_type where is_new is true ", nativeQuery = true)
     List<PackageType> findIsNewAll();
 
-    @Query(value = "select * from package_type where id =1? union all  select * from package_type where id = 2?",nativeQuery = true)
+    @Query(value = "select * from package_type where id = ?1 union all  select * from package_type where id = ?2",nativeQuery = true)
     List<PackageType> findByTwoId(Long priceLevel, Long priceLevel1);
 }