导出

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

@@ -49,6 +49,8 @@ public class ContractController {
         putdata(this, ContractStatusEnum.END);
         putdata(this, ContractStatusEnum.CANCEL);
         putdata(this, ContractStatusEnum.NFORMAL);
+        putdata(this, ContractStatusEnum.SUSPEND);
+        putdata(this, ContractStatusEnum.LATE);
         putdata(this, ContractStatusEnum.BACK_ALL);
         putdata(this, ContractStatusEnum.BACK_NONE);
         putdata(this, ContractStatusEnum.BACK_PART);
@@ -450,16 +452,19 @@ public class ContractController {
                                   @RequestParam String startDate, @RequestParam String endDate,
                                   String bodyCode, String serchName, HttpServletResponse response, HttpServletRequest request) {
 
-        List<Contract> contracts = service.shareIncomeList(loginAccount, startDate, endDate, platform, bodyCode, serchName);
+        List<Contract> contracts = shareIncomeService.shareIncomeList(loginAccount, startDate, endDate, platform, bodyCode, serchName);
         byte[] content = new byte[0];
         DecimalFormat df = new DecimalFormat("##,##0.00");
         StringBuilder sb = new StringBuilder();
-        sb.append("我方签约主体,签约方,合同编号,合同金额,不含税收入,合同开始时间,合同截止时间,区间使用天数,区间分摊收入,调整额,分摊总收入\r\n");
+        /*sb.append("我方签约主体,签约方,合同编号,合同金额,不含税收入,合同开始时间,合同截止时间,区间使用天数,区间分摊收入,调整额,分摊总收入\r\n");*/
+        sb.append("我方签约主体,签约方,合同编号,合同状态,合同金额,不含税收入,合同开始日期,合同截止日期,区间使用天数,区间分摊收入,调整额,分摊总收入\r\n");
+
         if (ValidateUtil.isValid(contracts)) {
             for (Contract c : contracts) {
                 sb.append(c.getMyBodyName()).append(",")
                         .append(c.getCustomerBody()).append(",")
                         .append(c.getContractCode()).append(",")
+                        .append(CONTRACT_STATUS.get(c.getStatus())).append(",")
                         .append("\"").append(df.format(c.getMoney())).append("\",")
                         .append("\"").append(df.format(c.getIncomeExcludingTax() * 1.0 / 100)).append("\",")
                         .append(c.getStartDate()).append(",")

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

@@ -2405,6 +2405,7 @@ public class ContractServiceImpl implements ContractService {
         return true;
     }
 
+    @Deprecated
     @Override
     public List<Contract> shareIncomeList(User loginAccount, String startDate, String endDate, String
             platform, String bodyCode, String serchName) {