内控部门计划排除主任务统计与显示

blade-service/blade-control/src/main/java/org/springblade/control/mapper/DepartmentMonthPlanMapper.xml

@@ -14,12 +14,12 @@
     </select>
     <select id="getPage" resultType="org.springblade.control.vo.DepartmentMonthPlanVO">
         SELECT dmp.*,
-               (select COUNT(1)  from c_project_cost_budget pcb WHERE pcb.dept_id = dmp.dept_id
+               (select COUNT(1)  from c_project_cost_budget pcb WHERE pcb.dept_id = dmp.dept_id and pcb.parent_id != 0
                     and dmp.plan_date between DATE_FORMAT(pcb.plan_start_time  ,'%Y-%m') and DATE_FORMAT(pcb.plan_end_time ,'%Y-%m')) as 'planTotal',
-                (select COUNT(1)  from c_project_cost_budget pcb WHERE pcb.dept_id = dmp.dept_id
+                (select COUNT(1)  from c_project_cost_budget pcb WHERE pcb.dept_id = dmp.dept_id and pcb.parent_id != 0
                                                                    and pcb.task_approve = 1
                     and dmp.plan_date between DATE_FORMAT(pcb.plan_start_time  ,'%Y-%m') and DATE_FORMAT(pcb.plan_end_time ,'%Y-%m')) as 'finishPlanTotal',
-                (select COUNT(1)  from c_project_cost_budget pcb WHERE pcb.dept_id = dmp.dept_id
+                (select COUNT(1)  from c_project_cost_budget pcb WHERE pcb.dept_id = dmp.dept_id and pcb.parent_id != 0
                                                                    and pcb.task_approve = 0
                     and dmp.plan_date between DATE_FORMAT(pcb.plan_start_time  ,'%Y-%m') and DATE_FORMAT(pcb.plan_end_time ,'%Y-%m')) as 'beginPlanTotal',
                 (select bu.name from blade_user bu WHERE bu.id = dmp.plan_designer) as 'planDesignerName'

blade-service/blade-control/src/main/java/org/springblade/control/mapper/ProjectCostBudgetMapper.xml

@@ -113,7 +113,7 @@
                (select cpp.name from c_project_process cpp WHERE cpp.id = pcb.project_process) as projectProcessValue,
                (select di.dict_name from c_dict_info di where di.type = 2 and di.id = pcb.plan_task_type) as planTaskTypeValue
         from c_project_cost_budget pcb
-        WHERE pcb.dept_id = #{deptId}
+        WHERE pcb.dept_id = #{deptId} and parent_id != 0
           and #{date} between DATE_FORMAT(pcb.plan_start_time  ,'%Y-%m') and DATE_FORMAT(pcb.plan_end_time ,'%Y-%m')
     </select>
     <select id="getUserALLPlan" resultType="org.springblade.control.vo.ProjectCostBudgetVO3">