app首页统计修改

wangqian
1 parent 322d4a01
Showing 1 changed file with 34 additions and 18 deletions
urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml
@@ -415,24 +415,40 @@
     <select id="queryPendingTaskDetails"  resultType="com.zteits.urbanops.module.garden.controller.app.homepage.vo.TaskDetailsRspVo" >
         SELECT taskName, busiDateTime, pressingType
         FROM (
-             SELECT a.plan_name as taskName,a.create_time as busiDateTime,null as pressingType
+             SELECT
+                 a.plan_name as taskName,c.begin_time as busiDateTime,null as pressingType
              from garden_inspection_plan a
-                      INNER JOIN  garden_inspection_plan_role b  on a.batch_no=b.batch_no
-             where a.finish_state in(1,3) and a.dept_id = #{deptId}
-                    AND b.role_id IN
-                    <foreach collection='roleIds' item='roleId' open='(' close=')' separator=','>
-                        #{roleId}
-                    </foreach>
-             union all
-             SELECT a.plan_name as taskName,a.create_time as busiDateTime, null as pressingType
-             from garden_maintain_plan a
-                      INNER JOIN  garden_maintain_plan_role b  on a.batch_no=b.batch_no
-             where a.finish_state in(1,3) and a.dept_id = #{deptId}
-                    AND b.role_id IN
-                    <foreach collection='roleIds' item='roleId' open='(' close=')' separator=','>
-                        #{roleId}
-                    </foreach>
+             INNER JOIN garden_inspection_plan_role b  on a.batch_no=b.batch_no
+             inner join garden_inspection_plan_detail c on a.batch_no=c.batch_no
+             where a.deleted = b.deleted and a.deleted = 0
+                and c.finish_state = 1
+                and c.begin_time &lt;=  NOW()
+                AND c.end_time  >=  NOW()
+                and a.dept_id = #{deptId}
+                AND b.role_id IN
+                <foreach collection='roleIds' item='roleId' open='(' close=')' separator=','>
+                    #{roleId}
+                </foreach>
+
+            union all
+
+            SELECT
+                a.plan_name as taskName,a.create_time as busiDateTime, null as pressingType
+            from garden_maintain_plan a
+            INNER JOIN garden_maintain_plan_role b  on a.batch_no=b.batch_no
+            inner join garden_maintain_plan_detail c on a.batch_no=c.batch_no
+            where a.deleted=b.deleted and a.deleted = 0
+                and c.finish_state = 1
+                and c.begin_time  &lt;=  NOW()
+                AND c.end_time  >=  NOW()
+                and a.dept_id = #{deptId}
+                AND b.role_id IN
+                <foreach collection='roleIds' item='roleId' open='(' close=')' separator=','>
+                    #{roleId}
+                </foreach>
+
              union all
+
              SELECT
                 m.order_name as taskName ,m.create_time as busiDateTime , m.pressing_type as pressingType
              FROM act_ru_task t
@@ -482,7 +498,7 @@
         FROM
             garden_maintain_plan_detail a
         INNER JOIN garden_maintain_plan_role b ON a.batch_no = b.batch_no
-        WHERE a.finish_state IN (1, 3)  and a.dept_id = #{deptId} -- 1:未完成；3:已过期
+        WHERE a.deleted = 0  and a.finish_state = 1  and a.dept_id = #{deptId} -- 1:未完成；3:已过期
         <if test="beginTime != null and beginTime != ''">
             AND a.begin_time  &lt;= #{beginTime}
         </if>
@@ -499,7 +515,7 @@
         FROM
              garden_inspection_plan_detail a
         INNER JOIN garden_inspection_plan_role b ON a.batch_no = b.batch_no
-        WHERE a.finish_state IN (1, 3)  and a.dept_id = #{deptId} -- 1:未完成；3:已过期
+        WHERE a.deleted = 0  and a.finish_state = 1  and a.dept_id = #{deptId} -- 1:未完成；3:已过期
         <if test="beginTime != null and beginTime != ''">
             AND a.begin_time  &lt;= #{beginTime}
         </if>