diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java index 2dc937d..0f06959 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java +++ b/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 { @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效") @NotNull(message = "完成状态不能为空") @Min(value = 1, message = "状态最小为1") - @Max(value = 3, message = "状态不能大于4") + @Max(value = 4, message = "状态不能大于4") private Integer finishState; diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml index 0c43bc7..f2ea871 100644 --- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml @@ -115,6 +115,6 @@ INNER JOIN garden_maintain_plan b ON a.batch_no = b.batch_no INNER JOIN garden_maintain_plan_commit c ON a.batch_no = c.batch_no AND a.plan_no = c.plan_no WHERE a.plan_no = #{req.planNo} - ODER BY c.id DESC + ORDER BY c.id DESC diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml index 121e331..c012ae6 100644 --- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml @@ -66,6 +66,7 @@ AND a.finish_state = 4 + ORDER BY a.id desc