Merge branch 'master' of ssh://101.201.226.163:50022/ccsens_wiki/pt_ccsens

src/main/resources/mapper_dao/PluFinanceDao.xml

@@ -11,8 +11,7 @@
             pf.budget,
             pf.bonus
         FROM
-            t_plu_finance AS pf
+         (
-        LEFT JOIN (
             SELECT
                 ppt2.task_detail_id AS taskId,
                 td.`name`,
@@ -32,11 +31,9 @@
                 AND ppt1.rec_status = 0
             )
             AND td.rec_status = 0
-        ) AS task ON pf.task_id = task.taskId
+        ) AS task LEFT JOIN  t_plu_finance AS pf ON pf.task_id = task.taskId AND pf.type = 1 AND pf.rec_status = 0
         WHERE
-            pf.rec_status = 0
+         task.rec_status = 0
-        AND task.rec_status = 0
-        AND pf.type = 1
     </select>
 
     <select id="queryOfProjectTotal"