Эх сурвалжийг харах

fix:收款统计表添加起始月,结束月表格列

ly 10 сар өмнө
parent
commit
e07dd5f4f9

+ 6 - 0
src/main/java/cn/ezhizao/project/business/collection/domain/vo/ResStatisticsVo.java

@@ -26,6 +26,12 @@ public class ResStatisticsVo {
     private Long contractId;
     @Excel(name = "合同编号")
     private String contractNo;
+    @Excel(name = "开始月",dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date inputStartMonth;
+    @Excel(name = "结束月",dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date inputEndMonth;
     //到账日期
     @Excel(name = "到账日期", width = 20, dateFormat = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")

+ 6 - 2
src/main/resources/mybatis/business/BizCollectionMapper.xml

@@ -35,10 +35,14 @@
         tt1.shenheshijian as examineTime,
         tt1.verifyName,
         tt1.actually_date,
-        tt2.zhichu as outAmount
+        tt2.zhichu as outAmount,
+        tt1.input_start_month as inputStartMonth,
+        tt1.input_end_month as inputEndMonth
         FROM
         (
         SELECT
+        inputdetail.input_start_month,
+        inputdetail.input_end_month,
         c.company_id,
         GROUP_CONCAT( DISTINCT date_format( c.actually_date, '%Y-%m-%d' )) AS actually_date,
         com.NAME,
@@ -75,6 +79,7 @@
         LEFT JOIN sys_user u ON u.user_id = c.applier_id
         LEFT JOIN biz_task_type type on type.id = detail.task_type_id
         LEFT JOIN sys_user u2 on u2.user_id = c.verify_id
+        left join biz_archive_input_detail inputdetail on c.contract_id = inputdetail.contract_id and detail.task_type_id = inputdetail.task_type_id
         WHERE
         c.deleted = 0
         AND c.STATUS != 2
@@ -173,7 +178,6 @@
         ) tt2 ON tt1.company_id = tt2.company_id
         AND tt1.task_type_id = tt2.task_type_id
         AND tt1.contract_id = tt2.contract_id
-
     </select>
     <select id="getByContractIn" resultType="cn.ezhizao.project.business.collection.domain.vo.ResStatisticsVo">
         SELECT