Merge remote-tracking branch 'origin/master'

戈灵虎
2 parents f15a8d3a ae6f1e89
Showing 1 changed file with 3 additions and 3 deletions
urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml
@@ -404,7 +404,7 @@
                 ) AS rn
                 FROM act_hi_taskinst t
                 LEFT JOIN workorder_main_info m   ON t.PROC_INST_ID_ = m.process_instance_id  AND m.deleted = 0
-                WHERE t.END_TIME_ IS NOT NULL AND m.order_name IS NOT NULL
+                WHERE t.state_ ='completed'
                 AND t.ASSIGNEE_ = #{userId}
                 ) res
             WHERE res.rn = 1
@@ -415,7 +415,7 @@
     <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.begin_time as busiDateTime,null as pressingType
+             SELECT a.plan_name as taskName,a.create_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}
@@ -424,7 +424,7 @@
                         #{roleId}
                     </foreach>
              union all
-             SELECT a.plan_name as taskName,a.begin_time as busiDateTime, null as pressingType
+             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}