Commit 6f97d30d3f42e32c85aba3a27432e14066fac54c
Merge branch 'dev' of http://gitlab1.renniting.cn/JCSS/urbanops into dev
Showing
2 changed files
with
3 additions
and
2 deletions
urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml
| @@ -377,9 +377,10 @@ | @@ -377,9 +377,10 @@ | ||
| 377 | </select> | 377 | </select> |
| 378 | <!--已完成任务详情--> | 378 | <!--已完成任务详情--> |
| 379 | <select id="queryCompletedTaskDetails" resultType="com.zteits.urbanops.module.garden.controller.app.homepage.vo.TaskDetailsRspVo" > | 379 | <select id="queryCompletedTaskDetails" resultType="com.zteits.urbanops.module.garden.controller.app.homepage.vo.TaskDetailsRspVo" > |
| 380 | - -- 巡查已办理 | 380 | + |
| 381 | SELECT taskName, busiDateTime, pressingType | 381 | SELECT taskName, busiDateTime, pressingType |
| 382 | FROM ( | 382 | FROM ( |
| 383 | + -- 巡查已办理 | ||
| 383 | SELECT B.plan_name as taskName,A.finish_time as busiDateTime, null as pressingType | 384 | SELECT B.plan_name as taskName,A.finish_time as busiDateTime, null as pressingType |
| 384 | from garden_inspection_plan_commit a , garden_inspection_plan b | 385 | from garden_inspection_plan_commit a , garden_inspection_plan b |
| 385 | where a.batch_no=b.batch_no | 386 | where a.batch_no=b.batch_no |
urbanops-server/src/main/resources/application-prod.yaml