先回款待录入

src/main/java/common/controller/ContractController.java

@@ -132,15 +132,6 @@ public class ContractController {
 
         byte[] content = new byte[0];
         StringBuilder sb = new StringBuilder();
-//        sb.append("合同编号 ,客户账号 ,签约方 ,事项 ,金额 ,日期 ,修改人 \r\n");
-//        if(ValidateUtil.isValid(moneyList)){
-//            for (ContractMoney c : moneyList){
-//                sb.append(c.getContractCode()).append(",").append(c.getEmail()).append(",").append(c.getCompany()).append(",").append(map.get(c.getType())).append(",")
-//                        .append(c.getMoney()).append(",").append(c.getDs()).append(",").append(c.getCreateName()).append("\r\n");
-//            }
-//        }
-
-
 
         Long parseSum = 0L;
         if(ValidateUtil.isValid(moneyList)){
@@ -166,10 +157,12 @@ public class ContractController {
 
         }
 
-        sb.append("日期, 合同编号 ,客户账号 ,签约方名称 ,套餐类型, 销售, 事项 ,金额 ,操作人 \r\n");
-        sb.append("汇总,  - , -  ,  - ,  - ,  - ,  -  ,").append(parseSum).append(" , - \r\n");
+        StringBuffer titlebuffer = new StringBuffer();
+        titlebuffer.append("日期, 合同编号 ,客户账号 ,签约方名称 ,套餐类型, 销售, 事项 ,金额 ,操作人 \r\n");
+        titlebuffer.append("汇总,  - , -  ,  - ,  - ,  - ,  -  ,").append(parseSum).append(" , - \r\n");
+        titlebuffer.append(sb);
 
-        InputStream in =  new  ByteArrayInputStream(sb.toString().getBytes());
+        InputStream in =  new  ByteArrayInputStream(titlebuffer.toString().getBytes());
         try {
             content  = IOUtils.toByteArray(in);
         } catch (IOException e) {

src/main/java/common/repository/ContractMoneyRepository.java

@@ -24,8 +24,8 @@ public interface ContractMoneyRepository extends JpaRepository<ContractMoney, Lo
     @Query(value="select * from contract_money where email = ?1 and platform = ?2 and type = 'pay' order by ds desc",nativeQuery=true)
     List<ContractMoney> findByEmail(String email, String platform);
 
-    @Query(value = "select a.id,b.customer_body company,a.contract_code,u.name create_name,a.create_account,a.create_time,a.ds,a.email,a.modify_account,a.modify_time,a.money,a.platform,a.type,a.user,a.del_flag,b.sale salse,b.price_level from contract_money a left join contract b on a.contract_code = b.contract_code left join user u on a.create_account = u.id where a.ds >= ?1 and a.ds <= ?2  and a.platform = ?3 order by a.ds desc",nativeQuery = true)
-    List<ContractMoney> findByDsAllContract(String startDate, String endDate, String platfrom);
+//    @Query(value = "select a.id,b.customer_body company,a.contract_code,u.name create_name,a.create_account,a.create_time,a.ds,a.email,a.modify_account,a.modify_time,a.money,a.platform,a.type,a.user,a.del_flag,b.sale salse,b.price_level from contract_money a left join contract b on a.contract_code = b.contract_code left join user u on a.create_account = u.id where a.ds >= ?1 and a.ds <= ?2  and a.platform = ?3 order by a.ds desc",nativeQuery = true)
+//    List<ContractMoney> findByDsAllContract(String startDate, String endDate, String platfrom);
 
 
 //    @Query(value = "select a.id,b.customer_body company,a.contract_code,u.name create_name,a.create_account,a.create_time,a.ds,a.email,a.modify_account,a.modify_time,a.money,a.platform,a.type,a.user,a.del_flag,b.sale salse,b.price_level from contract_money a left join contract b on a.contract_code = b.contract_code left join user u on a.create_account = u.id where a.ds >= ?1 and a.ds <= ?2 and a.platform = ?3 and a.type = ?4 and b.price_level = ?5 order by a.ds desc",nativeQuery = true)
@@ -37,6 +37,9 @@ public interface ContractMoneyRepository extends JpaRepository<ContractMoney, Lo
 //    @Query(value = "select a.id,b.customer_body company,a.contract_code,u.name create_name,a.create_account,a.create_time,a.ds,a.email,a.modify_account,a.modify_time,a.money,a.platform,a.type,a.user,a.del_flag,b.sale salse,b.price_level from contract_money a left join contract b on a.contract_code = b.contract_code left join user u on a.create_account = u.id where a.ds >= ?1 and a.ds <= ?2 and a.platform = ?3  and b.price_level = ?4 order by a.ds desc",nativeQuery = true)
 //    List<ContractMoney> findByDsAllContractPkSearch(String startDate, String endDate, String platfrom, String pkType);
 
+    @Query(value = "select a.id,a.company,a.contract_code,a.create_account,a.create_time,a.ds,a.email,a.modify_account,a.modify_time,a.money,a.platform,a.type,a.user,a.del_flag,a.salse,a.price_level,u.name create_name from contract_money a left join user u on a.create_account = u.id where a.ds >= ?1 and a.ds <= ?2 and a.platform = ?3  order by a.ds desc",nativeQuery = true)
+    List<ContractMoney> findByDsAllContract(String startDate, String endDate, String platfrom);
+
     @Query(value = "select a.id,a.company,a.contract_code,a.create_account,a.create_time,a.ds,a.email,a.modify_account,a.modify_time,a.money,a.platform,a.type,a.user,a.del_flag,a.salse,a.price_level,u.name create_name from contract_money a left join user u on a.create_account = u.id where a.ds >= ?1 and a.ds <= ?2 and a.platform = ?3 and a.type = ?4 and a.price_level = ?5 order by a.ds desc",nativeQuery = true)
     List<ContractMoney> findByDsAllContractAll(String startDate, String endDate, String platfrom, String moneyType, String packageTypeSearch);
 

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

@@ -1369,6 +1369,8 @@ public class ContractServiceImpl implements ContractService {
         resource.setCreateAccount(loginUser.getId());
         resource.setCreateTime(new Date());
         resource.setUser(loginUser.getId());
+        resource.setContractCode(contract.getContractCode());
+        resource.setEmail(contract.getEmail());
 
 //        if (resource.getType().equals("pay") && contract.getPlatform().equals("tkio")) {
 //            tkioAccountService.contractPay(loginUser, resource);