Commit 4c567386f1ccbb4ff41f5b8e9d9d5ff157dcbc41
1 parent
8f9bec32
优化
Showing
3 changed files
with
4 additions
and
2 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java
| @@ -30,7 +30,7 @@ public class AppMaintainPlanPagePlanTypeReqVO extends PageParam { | @@ -30,7 +30,7 @@ public class AppMaintainPlanPagePlanTypeReqVO extends PageParam { | ||
| 30 | @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效") | 30 | @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效") |
| 31 | @NotNull(message = "完成状态不能为空") | 31 | @NotNull(message = "完成状态不能为空") |
| 32 | @Min(value = 1, message = "状态最小为1") | 32 | @Min(value = 1, message = "状态最小为1") |
| 33 | - @Max(value = 3, message = "状态不能大于4") | 33 | + @Max(value = 4, message = "状态不能大于4") |
| 34 | private Integer finishState; | 34 | private Integer finishState; |
| 35 | 35 | ||
| 36 | 36 |
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
| @@ -115,6 +115,6 @@ | @@ -115,6 +115,6 @@ | ||
| 115 | INNER JOIN garden_maintain_plan b ON a.batch_no = b.batch_no | 115 | INNER JOIN garden_maintain_plan b ON a.batch_no = b.batch_no |
| 116 | INNER JOIN garden_maintain_plan_commit c ON a.batch_no = c.batch_no AND a.plan_no = c.plan_no | 116 | INNER JOIN garden_maintain_plan_commit c ON a.batch_no = c.batch_no AND a.plan_no = c.plan_no |
| 117 | WHERE a.plan_no = #{req.planNo} | 117 | WHERE a.plan_no = #{req.planNo} |
| 118 | - ODER BY c.id DESC | 118 | + ORDER BY c.id DESC |
| 119 | </select> | 119 | </select> |
| 120 | </mapper> | 120 | </mapper> |
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml
| @@ -66,6 +66,7 @@ | @@ -66,6 +66,7 @@ | ||
| 66 | AND a.finish_state = 4 | 66 | AND a.finish_state = 4 |
| 67 | </when> | 67 | </when> |
| 68 | </choose> | 68 | </choose> |
| 69 | + ORDER BY a.id desc | ||
| 69 | </select> | 70 | </select> |
| 70 | 71 | ||
| 71 | <select id="appMaintainPlanPlanTypePage" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeRespVO"> | 72 | <select id="appMaintainPlanPlanTypePage" resultType="com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanPagePlanTypeRespVO"> |
| @@ -122,6 +123,7 @@ | @@ -122,6 +123,7 @@ | ||
| 122 | <if test="req.finishState == 4"> | 123 | <if test="req.finishState == 4"> |
| 123 | and a.finish_state = 4 | 124 | and a.finish_state = 4 |
| 124 | </if> | 125 | </if> |
| 126 | + ORDER BY a.id desc | ||
| 125 | </select> | 127 | </select> |
| 126 | 128 | ||
| 127 | </mapper> | 129 | </mapper> |