Commit b540c6a73a30edf8ef3a46672f325feb841849f3
1 parent
a8e895fc
app首页已完成修改
Showing
1 changed file
with
3 additions
and
3 deletions
urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml
| @@ -404,7 +404,7 @@ | @@ -404,7 +404,7 @@ | ||
| 404 | ) AS rn | 404 | ) AS rn |
| 405 | FROM act_hi_taskinst t | 405 | FROM act_hi_taskinst t |
| 406 | LEFT JOIN workorder_main_info m ON t.PROC_INST_ID_ = m.process_instance_id AND m.deleted = 0 | 406 | LEFT JOIN workorder_main_info m ON t.PROC_INST_ID_ = m.process_instance_id AND m.deleted = 0 |
| 407 | - WHERE t.END_TIME_ IS NOT NULL AND m.order_name IS NOT NULL | 407 | + WHERE t.state_ ='completed' |
| 408 | AND t.ASSIGNEE_ = #{userId} | 408 | AND t.ASSIGNEE_ = #{userId} |
| 409 | ) res | 409 | ) res |
| 410 | WHERE res.rn = 1 | 410 | WHERE res.rn = 1 |
| @@ -415,7 +415,7 @@ | @@ -415,7 +415,7 @@ | ||
| 415 | <select id="queryPendingTaskDetails" resultType="com.zteits.urbanops.module.garden.controller.app.homepage.vo.TaskDetailsRspVo" > | 415 | <select id="queryPendingTaskDetails" resultType="com.zteits.urbanops.module.garden.controller.app.homepage.vo.TaskDetailsRspVo" > |
| 416 | SELECT taskName, busiDateTime, pressingType | 416 | SELECT taskName, busiDateTime, pressingType |
| 417 | FROM ( | 417 | FROM ( |
| 418 | - SELECT a.plan_name as taskName,a.begin_time as busiDateTime,null as pressingType | 418 | + SELECT a.plan_name as taskName,a.create_time as busiDateTime,null as pressingType |
| 419 | from garden_inspection_plan a | 419 | from garden_inspection_plan a |
| 420 | INNER JOIN garden_inspection_plan_role b on a.batch_no=b.batch_no | 420 | INNER JOIN garden_inspection_plan_role b on a.batch_no=b.batch_no |
| 421 | where a.finish_state in(1,3) and a.dept_id = #{deptId} | 421 | where a.finish_state in(1,3) and a.dept_id = #{deptId} |
| @@ -424,7 +424,7 @@ | @@ -424,7 +424,7 @@ | ||
| 424 | #{roleId} | 424 | #{roleId} |
| 425 | </foreach> | 425 | </foreach> |
| 426 | union all | 426 | union all |
| 427 | - SELECT a.plan_name as taskName,a.begin_time as busiDateTime, null as pressingType | 427 | + SELECT a.plan_name as taskName,a.create_time as busiDateTime, null as pressingType |
| 428 | from garden_maintain_plan a | 428 | from garden_maintain_plan a |
| 429 | INNER JOIN garden_maintain_plan_role b on a.batch_no=b.batch_no | 429 | INNER JOIN garden_maintain_plan_role b on a.batch_no=b.batch_no |
| 430 | where a.finish_state in(1,3) and a.dept_id = #{deptId} | 430 | where a.finish_state in(1,3) and a.dept_id = #{deptId} |