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

fix:收款统计表只显示以审核,并且格式化合同开始结束月

ly 10 сар өмнө
parent
commit
468f33adc2

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

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

+ 1 - 1
src/main/resources/mybatis/business/BizCollectionMapper.xml

@@ -82,7 +82,7 @@
         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
+        AND c.STATUS = 1
         AND com.tenant_id = #{conditions.tenantId}
         <if test="conditions.companyName != null and conditions.companyName != ''">
             AND com.NAME LIKE CONCAT('%',#{conditions.companyName},'%')