From cfa1dff1113808fb4041773c2e6fa2dea3650ed7 Mon Sep 17 00:00:00 2001 From: wangfs <15029758498@163.com> Date: Sun, 14 Dec 2025 12:13:49 +0800 Subject: [PATCH] app养护计划明细提交 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailRespVO.java | 2 +- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/AppMaintainPlanDetailController.java | 7 +++++-- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailRespVO.java | 2 +- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeRespVO.java | 2 +- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanDetailMapper.java | 2 +- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailService.java | 2 +- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java | 4 ++-- urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml | 3 +++ 8 files changed, 15 insertions(+), 9 deletions(-) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailRespVO.java index 7cf2b27..71c0d99 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanDetailRespVO.java @@ -57,7 +57,7 @@ public class MaintainPlanDetailRespVO { @Schema(description = "完成百分比", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("完成百分比") - private Double finishPercent; + private Integer finishPercent; @Schema(description = "完成状态 1:未完成;2:进行中；3:已完成", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("完成状态 1:未完成;2:进行中；3:已完成") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/AppMaintainPlanDetailController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/AppMaintainPlanDetailController.java index 5cd837d..b8b313c 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/AppMaintainPlanDetailController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/AppMaintainPlanDetailController.java @@ -32,9 +32,12 @@ public class AppMaintainPlanDetailController { @Operation(summary = "app-获得养护计划明细") @Parameter(name = "road_id", description = "道路ID", required = true, example = "1024") @Parameter(name = "finish_state", description = "完成状态 1:未完成;2:已完成;3:已失效", required = true, example = "1024") + @Parameter(name = "plan_name", description = "计划名称", required = true, example = "1024") // @PreAuthorize("@ss.hasPermission('app:garden:maintain-plan-detail:road:query')") - public CommonResult> appMaintainPlanDetailListByRoad(@RequestParam("road_id") @NotNull Long roadId, @RequestParam("finish_state") Integer finishState) { - List list = maintainPlanDetailService.appMaintainPlanDetailListByRoad(roadId, finishState); + public CommonResult> appMaintainPlanDetailListByRoad(@RequestParam("road_id") @NotNull Long roadId, + @RequestParam("finish_state") Integer finishState, + @RequestParam("plan_name") String planName) { + List list = maintainPlanDetailService.appMaintainPlanDetailListByRoad(roadId, finishState, planName); return success(list); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailRespVO.java index 661056a..141f506 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailRespVO.java @@ -38,7 +38,7 @@ public class AppMaintainPlanDetailRespVO { private Integer planNum; @Schema(description = "完成百分比", requiredMode = Schema.RequiredMode.REQUIRED) - private Double finishPercent; + private Integer finishPercent; @Schema(description = "完成状态 1:未完成;2:进行中；3:已完成", requiredMode = Schema.RequiredMode.REQUIRED) private Integer finishState; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeRespVO.java index 700e739..058d9b1 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeRespVO.java @@ -44,7 +44,7 @@ public class AppMaintainPlanPagePlanTypeRespVO { @Schema(description = "完成百分比", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("完成百分比") - private Double finishPercent; + private Integer finishPercent; @Schema(description = "完成状态 1:未完成;2:进行中；3:已完成", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("完成状态 1:未完成;2:进行中；3:已完成") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanDetailMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanDetailMapper.java index 5aebcfe..2f0ccd1 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanDetailMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanDetailMapper.java @@ -55,7 +55,7 @@ public interface MaintainPlanDetailMapper extends BaseMapperX appMaintainPlanDetailListByRoad(@Param("busiLineList") List busiLineList, @Param("roadId") Long roadId, @Param("companyId") Long companyId, - @Param("roleIds") List roleIds, @Param("localDate") LocalDate now, @Param("finishState") Integer finishState); + @Param("roleIds") List roleIds, @Param("localDate") LocalDate now, @Param("finishState") Integer finishState, @Param("planName") String planName); } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailService.java index c00defc..6740ab6 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailService.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailService.java @@ -65,6 +65,6 @@ public interface MaintainPlanDetailService { * @param roadId 道路ID * @return */ - List appMaintainPlanDetailListByRoad(Long roadId, Integer finishState); + List appMaintainPlanDetailListByRoad(Long roadId, Integer finishState, String planName); } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java index be085f3..11b41c7 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java @@ -84,7 +84,7 @@ public class MaintainPlanDetailServiceImpl implements MaintainPlanDetailService } @Override - public List appMaintainPlanDetailListByRoad(Long roadId, Integer finishState) { + public List appMaintainPlanDetailListByRoad(Long roadId, Integer finishState, String planName) { String busiLine = SecurityFrameworkUtils.getBusiLine(); Long companyId = SecurityFrameworkUtils.getCompanyId(); List busiLineList = new ArrayList<>(); @@ -95,7 +95,7 @@ public class MaintainPlanDetailServiceImpl implements MaintainPlanDetailService /*1.查询登录用户角色*/ List roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId()); LocalDate now = LocalDate.now(); - return maintainPlanDetailMapper.appMaintainPlanDetailListByRoad(busiLineList, roadId, companyId, roleIds, now, finishState); + return maintainPlanDetailMapper.appMaintainPlanDetailListByRoad(busiLineList, roadId, companyId, roleIds, now, finishState, planName); } } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml index b570056..f3de0a1 100644 --- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml @@ -38,6 +38,9 @@ AND a.deleted=0 AND a.company_id = #{companyId} AND a.road_id = #{roadId} + + AND a.plan_name LIKE CONCAT('%',#{planName},'%') + AND b.role_id IN -- libgit2 0.21.4