no message

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

@@ -51,14 +51,9 @@
         "续签" ELSE "新签"
         END AS hetongleixing,
         CASE
-
-        WHEN c.is_project = 1 THEN
-        "项目" ELSE
-        CASE
-
-        WHEN c.is_project = 2 THEN
-        "非项目" ELSE ""
-        END
+        WHEN c.is_project = 0 THEN '项目'
+        WHEN c.is_project = 1 THEN '非项目'
+        ELSE ''
         END AS shifouweixiangmu,
         detail.amount AS fuwujine,
         SUM( CASE WHEN c.STATUS = 1 THEN detail.arrive_amount ELSE 0 END ) AS shishoujine,
@@ -147,7 +142,7 @@
                 #{item}
             </foreach>
         </if>
-        <if test="conditions.examineTimeFilter != null and conditions.examineTimeFilter.size() ">
+        <if test="conditions.examineTimeFilter != null and conditions.examineTimeFilter.size() &gt; 0 ">
             AND (
             DATE_FORMAT(t1.verify_date,'%Y-%m-%d') &gt;= #{conditions.examineTimeFilter[0]}
             AND
@@ -172,37 +167,36 @@
         t1.arrive_date,
         t6.nick_name,
         CASE
-
-        WHEN t5.contract_type = 1 THEN
-        "续签" ELSE "新签"
+        WHEN t5.contract_type = 1 THEN "续签" ELSE "新签"
         END AS contractType,
         CASE
-
-        WHEN t1.is_project = 1 THEN
-        "项目" ELSE
-        CASE
-
-        WHEN t1.is_project = 2 THEN
-        "非项目" ELSE ""
-        END
+        WHEN t1.is_project = 0 THEN '项目'
+        WHEN t1.is_project = 1 THEN '非项目'
+        ELSE ''
         END AS isProject,
         t2.amount AS detailAllAmount,
         t2.arrive_amount as reallyDetailAmount,
         t1.verify_date as examineTime
         FROM
         biz_collection t1 right join biz_collection_detail t2 ON t1.id = t2.collection_id
+        LEFT JOIN biz_company t3 ON t3.id = t1.company_id
+        LEFT JOIN biz_task_type t4 ON t4.id = t2.task_type_id
+        LEFT JOIN biz_archive_input t5 ON t5.id = t1.contract_id
+        LEFT JOIN sys_user t6 ON t6.user_id = t1.applier_id
         WHERE
         t1.contract_id = #{conditions.contractId}
         AND
-        t2.task_type_id = #{conditions.taskTypeId[0]}
-        <if test="conditions.receiptDateFilter != null and conditions.receiptDateFilter.size() ">
+        t2.task_type_id = #{conditions.taskTypeIds[0]}
+
+
+        <if test="conditions.receiptDateFilter != null and conditions.receiptDateFilter.size() &gt; 0 ">
             AND (
             DATE_FORMAT(c.arrive_date,'%Y-%m-%d') &gt;= #{conditions.receiptDateFilter[0]}
             AND
             DATE_FORMAT(c.arrive_date,'%Y-%m-%d') &lt;= #{conditions.receiptDateFilter[1]}
             )
         </if>
-        <if test="conditions.examineTimeFilter != null and conditions.examineTimeFilter.size() ">
+        <if test="conditions.examineTimeFilter != null and conditions.examineTimeFilter.size() &gt; 0 ">
             AND(
             DATE_FORMAT(c.verify_date,'%Y-%m-%d') &gt;= #{conditions.examineTimeFilter[1]}
             AND
@@ -229,9 +223,9 @@
         LEFT JOIN biz_task_type t4 ON t4.id = t2.task_type_id
         LEFT JOIN biz_archive_input t5 ON t5.id = t1.contract_id
         LEFT JOIN sys_user t6 ON t6.user_id = t1.applier_id
-        WHERE t1.contract_id = 1806240221966196737
-        AND t2.task_type_id = 2
-        <if test="conditions.examineTimeFilter != null and conditions.examineTimeFilter.size() ">
+        WHERE t1.contract_id = #{conditions.contractId}
+        AND t2.task_type_id = #{conditions.taskTypeIds[0]}
+        <if test="conditions.examineTimeFilter != null and conditions.examineTimeFilter.size() &gt; 0 ">
             AND (
             DATE_FORMAT(t1.verify_date,'%Y-%m-%d') &gt;= #{conditions.examineTimeFilter[0]}
             AND
@@ -249,7 +243,7 @@
         FROM biz_payment p
         right join biz_payment_detail de ON p.id = de.payment_id
         WHERE p.verify_status != 4
-        <if test="conditions.examineTimeFilter != null and conditions.examineTimeFilter.size() ">
+        <if test="conditions.examineTimeFilter != null and conditions.examineTimeFilter.size() &gt; 0 ">
             AND (
             DATE_FORMAT(t1.verify_date,'%Y-%m-%d') &gt;= #{conditions.examineTimeFilter[0]}
             AND