ly 1 an în urmă
părinte
comite
adcc7c69e1

+ 7 - 21
src/main/resources/mybatis/business/BizCollectionMapper.xml

@@ -46,19 +46,13 @@
         SUM( detail.arrive_amount ) AS tishoukuanjine,
         GROUP_CONCAT( DISTINCT u.nick_name ) AS shenqingren,
         CASE
-
         WHEN input.contract_type = 1 THEN
         "续签" 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,
@@ -172,19 +166,12 @@
         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,
@@ -200,7 +187,6 @@
         AND
         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]}