no message

src/main/java/cn/ezhizao/project/business/collection/controller/BizCollectionController.java

@@ -558,7 +558,6 @@ public class BizCollectionController extends BaseController {
 
     @ApiOperation("收款统计报表")
     @GetMapping("/statistics")
-//    @PreAuthorize("@ss.hasPermi('business:collection:statistics')")
     public TableDataInfo statistics(ReqStatisticsVo conditions) throws NoSuchFieldException, IllegalAccessException {
         startPage();
         List<ResStatisticsVo> list = collectionService.statistics(conditions);

src/main/java/cn/ezhizao/project/business/collection/domain/vo/ReqStatisticsVo.java

@@ -22,9 +22,11 @@ public class ReqStatisticsVo {
     private List<Integer> taskTypeIds;
     private List<String> receiptDateFilter;
     private List<String> examineTimeFilter;
+    private List<String> actuallyDateFilter;
     private Integer isProject;
     private Integer isNew;
     private Long tenantId;
     private String contractId;
+    private String examineName;
 
 }

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

@@ -30,6 +30,11 @@ public class ResStatisticsVo {
     @Excel(name = "到账日期", width = 20, dateFormat = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date receiptDate;
+
+    @Excel(name = "确认所属时间",width = 20, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date actuallyDate;
+
     //提收款金额
     @Excel(name = "提收款金额")
     private BigDecimal withdrawalAmount;
@@ -55,4 +60,5 @@ public class ResStatisticsVo {
     @Excel(name = "审核时间")
     private String examineTime;
 
+
 }

src/main/resources/mybatis/business/BizCollectionMapper.xml

@@ -17,6 +17,7 @@
     </select>
     <select id="statistics" resultType="resStatisticsVo">
         SELECT
+        tt1.actually_date,
         tt1.company_id as companyId,
         tt1.name as companyName,
         tt1.task_type_id as taskTypeId,
@@ -37,6 +38,7 @@
         (
         SELECT
         c.company_id,
+        c.actually_date,
         com.NAME,
         detail.task_type_id,
         type.`name` as typeName,
@@ -76,6 +78,9 @@
         <if test="conditions.companyName != null and conditions.companyName != ''">
             AND com.NAME LIKE CONCAT('%',#{conditions.companyName},'%')
         </if>
+        <if test="conditions.examineName != null and conditions.examineName != ''">
+            AND c.NAME LIKE CONCAT('%',#{examineName},'%')
+        </if>
         <if test="conditions.contractNo != null and conditions.contractNo != ''">
             AND input.contract_no LIKE CONCAT('%',#{conditions.contractNo},'%')
         </if>
@@ -99,6 +104,14 @@
             DATE_FORMAT(c.verify_date,'%Y-%m-%d') &lt;= #{conditions.examineTimeFilter[1]}
             )
         </if>
+
+        <if test="conditions.actuallyDateFilter != null and conditions.actuallyDateFilter.size() ">
+            AND(
+            DATE_FORMAT(c.actually_date,'%Y-%m-%d') &gt;= #{conditions.actuallyDateFilter[0]}
+            AND
+            DATE_FORMAT(c.actually_date,'%Y-%m-%d') &lt;= #{conditions.actuallyDateFilter[1]}
+            )
+        </if>
         <if test="conditions.isProject != null">
             AND c.is_project = #{conditions.isProject}
         </if>