From 758c32c27edddd19b341d785f1ae604fe2abff82 Mon Sep 17 00:00:00 2001 From: wangfs <15029758498@163.com> Date: Sun, 14 Dec 2025 15:24:41 +0800 Subject: [PATCH] app养护计划明细提交 --- urbanops-framework/urbanops-spring-boot-starter-security/src/main/java/com/zteits/urbanops/framework/security/core/util/SecurityFrameworkUtils.java | 11 +++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitRespVO.java | 8 -------- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanDetailReqVO.java | 4 ---- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/AppMaintainPlanCommitController.java | 20 ++++++++++---------- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/AppMaintainPlanDetailController.java | 33 +++++++++++++++++---------------- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainNotFinishPlanDetailReqVO.java | 24 ++++++++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainNotFinishPlanDetailRespVO.java | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitDetailPageRespVO.java | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitPageReqVO.java | 16 ++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java | 44 ++++++++++++++++++++++++++++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPagePlanTypeReqVO.java | 8 +++----- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadReqVO.java | 11 +++-------- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanCommitMapper.java | 13 +++++++++++-- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanDetailMapper.java | 34 ++++++++++++++++++---------------- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java | 32 ++++++++++++++++---------------- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitService.java | 11 +++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java | 17 +++++++++++++++-- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailService.java | 14 ++++++++++++-- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java | 37 ++++++++++++++++++++++++++----------- urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml | 9 +-------- urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml | 31 +++++++++++++++++++++++++++++++ urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml | 71 ++++++++++++++++++++++++++++++++++++++++++++++------------------------- urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml | 44 ++++++++++++++------------------------------ 24 files changed, 521 insertions(+), 177 deletions(-) create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainNotFinishPlanDetailReqVO.java create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainNotFinishPlanDetailRespVO.java create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitDetailPageRespVO.java create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitPageReqVO.java create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java diff --git a/urbanops-framework/urbanops-spring-boot-starter-security/src/main/java/com/zteits/urbanops/framework/security/core/util/SecurityFrameworkUtils.java b/urbanops-framework/urbanops-spring-boot-starter-security/src/main/java/com/zteits/urbanops/framework/security/core/util/SecurityFrameworkUtils.java index dbf0c2d..6e9cae7 100644 --- a/urbanops-framework/urbanops-spring-boot-starter-security/src/main/java/com/zteits/urbanops/framework/security/core/util/SecurityFrameworkUtils.java +++ b/urbanops-framework/urbanops-spring-boot-starter-security/src/main/java/com/zteits/urbanops/framework/security/core/util/SecurityFrameworkUtils.java @@ -136,6 +136,17 @@ public class SecurityFrameworkUtils { } /** + * 获得当前用户的业务线，从上下文中 + * + * @return 部门编号 + */ + @Nullable + public static Long getDeptId() { + LoginUser loginUser = getLoginUser(); + return loginUser != null ? MapUtil.getLong(loginUser.getInfo(), LoginUser.INFO_KEY_DEPT_ID) : null; + } + + /** * 设置当前用户 * * @param loginUser 登录用户 diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitRespVO.java index 89a2a8b..3e65525 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitRespVO.java @@ -84,14 +84,6 @@ public class MaintainPlanCommitRespVO { @ExcelProperty("提交人用户ID") private String userName; - @Schema(description = "角色ID", example = "你猜") - @ExcelProperty("角色ID") - private Long roleId; - - @Schema(description = "角色", example = "你猜") - @ExcelProperty("角色") - private String roleName; - @Schema(description = "备注", example = "你猜") @ExcelProperty("备注") private String remark; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanDetailReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanDetailReqVO.java index 5c3c3b9..b0a1017 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanDetailReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanDetailReqVO.java @@ -30,10 +30,6 @@ public class AppInspectionPlanDetailReqVO { @Hidden private Long companyId; - @Schema(description = "角色IDS") - @Hidden - private List roleIds; - @Schema(description = "业务线") @Hidden private List busiLineList; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/AppMaintainPlanCommitController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/AppMaintainPlanCommitController.java index 230261f..7cf20f9 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/AppMaintainPlanCommitController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/AppMaintainPlanCommitController.java @@ -1,19 +1,20 @@ package com.zteits.urbanops.module.garden.controller.app.maintainplan; import com.zteits.urbanops.framework.common.pojo.CommonResult; -import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanCommitDetailRespVO; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanCommitDetailPageRespVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanCommitPageReqVO; import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanCommitSaveReqVO; import com.zteits.urbanops.module.garden.service.maintainplan.MaintainPlanCommitService; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import jakarta.validation.Valid; -import jakarta.validation.constraints.NotBlank; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; @@ -33,12 +34,11 @@ public class AppMaintainPlanCommitController { return success(maintainPlanCommitService.appCreateMaintainPlanCommit(createReqVO)); } - @GetMapping("/get/plan-no") + @PostMapping("/page") @Operation(summary = "获取养护计划-共同处理人明细") - @Parameter(name = "plan_no", description = "计划编号", required = true, example = "1024") //@PreAuthorize("@ss.hasPermission('app:garden:maintain-plan-commit:query')") - public CommonResult> getMaintainPlanCommitDetailByPlanNo(@RequestParam("plan_no") @NotBlank String planNo) { - return success( maintainPlanCommitService.getMaintainPlanCommitDetailByPlanNo(planNo)); + public CommonResult> appMaintainPlanCommitDetailPage(@Valid @RequestBody AppMaintainPlanCommitPageReqVO pageReqVO) { + return success(maintainPlanCommitService.appMaintainPlanCommitDetailPage(pageReqVO)); } } \ No newline at end of file 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 b8b313c..3d89af5 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 @@ -1,18 +1,19 @@ package com.zteits.urbanops.module.garden.controller.app.maintainplan; import com.zteits.urbanops.framework.common.pojo.CommonResult; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainNotFinishPlanDetailReqVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainNotFinishPlanDetailRespVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanDetailListByRoadPageReqVO; import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanDetailRespVO; import com.zteits.urbanops.module.garden.service.maintainplan.MaintainPlanDetailService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; -import jakarta.validation.constraints.NotNull; +import jakarta.validation.Valid; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -30,17 +31,17 @@ public class AppMaintainPlanDetailController { @GetMapping("/get/details-road") @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, - @RequestParam("plan_name") String planName) { - List list = maintainPlanDetailService.appMaintainPlanDetailListByRoad(roadId, finishState, planName); - return success(list); + // @PreAuthorize("@ss.hasPermission('app:garden:maintain-plan-detail:road:query')") + public CommonResult> appMaintainPlanDetailListByRoad(@Valid AppMaintainPlanDetailListByRoadPageReqVO pageReqVO) { + PageResult pageResult = maintainPlanDetailService.appMaintainPlanDetailListByRoadPage(pageReqVO); + return success(pageResult); } - - + @PostMapping("/get/not-finish") + @Operation(summary = "获取未养护计划明细") + @Parameter(name = "plan_no", description = "计划编号", required = true, example = "1024") + //@PreAuthorize("@ss.hasPermission('app:garden:maintain-plan-commit:query')") + public CommonResult> getMaintainNotFinishPlanCommitDetail(@Valid @RequestBody AppMaintainNotFinishPlanDetailReqVO reqVO) { + return success( maintainPlanDetailService.getMaintainNotFinishPlanCommitDetail(reqVO)); + } } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainNotFinishPlanDetailReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainNotFinishPlanDetailReqVO.java new file mode 100644 index 0000000..fd951dc --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainNotFinishPlanDetailReqVO.java @@ -0,0 +1,24 @@ +package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo; + +import io.swagger.v3.oas.annotations.Hidden; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@Schema(description = "管理后台 - 未完成养护计划明细 Request VO") +@Data +public class AppMaintainNotFinishPlanDetailReqVO { + + @Schema(description = "计划编码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "计划编码不能为空") + private String planNo; + + @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输 ;2009:补植;3001:绿地巡视;", requiredMode = Schema.RequiredMode.REQUIRED, example = "24742") + @NotNull(message = "养护类型不能为空") + private Integer planTypeId; + + @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效") + @Hidden + private Integer finishState; +} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainNotFinishPlanDetailRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainNotFinishPlanDetailRespVO.java new file mode 100644 index 0000000..0169307 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainNotFinishPlanDetailRespVO.java @@ -0,0 +1,65 @@ +package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo; + +import cn.idev.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; + +@Schema(description = "管理后台 - 未完成养护计划明细 Request VO") +@Data +public class AppMaintainNotFinishPlanDetailRespVO { + @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704") + private String batchNo; + + @Schema(description = "计划编码", example = "王五") + private String planNo; + + @Schema(description = "计划名称", example = "王五") + private String planName; + + @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输 ;2009:补植;3001:绿地巡视;", requiredMode = Schema.RequiredMode.REQUIRED, example = "24742") + @NotNull(message = "养护类型不能为空") + private Integer planTypeId; + + @Schema(description = "次数 如：1/3等", requiredMode = Schema.RequiredMode.REQUIRED, example = "1/3") + @ExcelProperty("次数 如：1/3等") + private String rate; + + @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次", requiredMode = Schema.RequiredMode.REQUIRED, example = "6415") + @ExcelProperty("周期ID: 1:日/次；2:周/次；3:月/次；4:年/次") + private Integer cycleId; + + @Schema(description = "本次完成百分比") + @ExcelProperty("本次完成百分比") + private Integer finishPercent; + + @Schema(description = "提交人用户", example = "19167") + @ExcelProperty("提交人用户") + private Long userId; + + @Schema(description = "提交人用户ID", example = "王五") + @ExcelProperty("提交人用户ID") + private String userName; + + @Schema(description = "备注", example = "你猜") + @ExcelProperty("备注") + private String remark; + + @Schema(description = "完成时间") + @ExcelProperty("完成时间") + private LocalDateTime finishTime; + + @Schema(description = "执行开始时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + private LocalDateTime beginTime; + + @Schema(description = "执行时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + private LocalDateTime endTime; + +} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitDetailPageRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitDetailPageRespVO.java new file mode 100644 index 0000000..3705531 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitDetailPageRespVO.java @@ -0,0 +1,67 @@ +package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + +@Schema(description = "管理后台 - 养护计划 Response VO") +@Data +public class AppMaintainPlanCommitDetailPageRespVO { + + @Schema(description = "批次号", requiredMode = Schema.RequiredMode.REQUIRED) + private String batchNo; + + @Schema(description = "计划编码", requiredMode = Schema.RequiredMode.REQUIRED) + private String planNo; + + @Schema(description = "计划名称", requiredMode = Schema.RequiredMode.REQUIRED) + private String planName; + + @Schema(description = "排序号:第n次计划", requiredMode = Schema.RequiredMode.REQUIRED) + private Integer sortNum; + + @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输 ;2009:补植;3001:绿地巡视;", requiredMode = Schema.RequiredMode.REQUIRED, example = "24742") + private Integer planTypeId; + + @Schema(description = "次数 如：1/3等", requiredMode = Schema.RequiredMode.REQUIRED, example = "1/3") + private String rate; + + @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次", requiredMode = Schema.RequiredMode.REQUIRED, example = "6415") + private Integer cycleId; + + @Schema(description = "计划次数") + private Integer planNum; + + @Schema(description = "照片host") + private String imgHost; + + @Schema(description = "开始照片") + private String beginImg; + + @Schema(description = "开始照片") + private List beginImgList; + + /** + * 养护面积:单位m² + */ + private Double opArea; + /** + * 操作时长 + */ + private Double opTime; + + @Schema(description = "完成百分比", requiredMode = Schema.RequiredMode.REQUIRED) + private Integer finishPercent; + + @Schema(description = "完成状态 1:未完成;2:进行中；3:已完成", requiredMode = Schema.RequiredMode.REQUIRED) + private Integer finishState; + + @Schema(description = "执行开始时间") + private LocalDateTime beginTime; + + @Schema(description = "执行时间") + private LocalDateTime endTime; + +} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitPageReqVO.java new file mode 100644 index 0000000..68f2d6d --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanCommitPageReqVO.java @@ -0,0 +1,16 @@ +package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo; + +import com.zteits.urbanops.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import lombok.Data; + +@Schema(description = "管理后台 - 未完成养护计划明细 Request VO") +@Data +public class AppMaintainPlanCommitPageReqVO extends PageParam { + + @Schema(description = "计划编码") + @NotBlank(message = "计划编码不能为空") + private String planNo; + +} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java new file mode 100644 index 0000000..a278e87 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java @@ -0,0 +1,44 @@ +package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo; + +import com.zteits.urbanops.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.Hidden; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.time.LocalDate; +import java.util.List; +import java.util.Set; + +@Schema(description = "管理后台 - 养护计划汇总分页 Request VO") +@Data +public class AppMaintainPlanDetailListByRoadPageReqVO extends PageParam { + + + @Schema(description = "道路名称") + @NotNull + private Long roadId; + + @Schema(description = "完成状态 1:未完成;2:已完成;3:已失效") + @NotNull(message = "完成状态不能为空") + @Min(value = 1, message = "状态最小为1") + @Max(value = 3, message = "状态不能大于4") + private Integer finishState; + + @Schema(description = "计划名称") + private String planName; + + @Schema(description = "计划批次号列表") + @Hidden + private Set batchNos; + + @Schema(description = "业务线") + @Hidden + private List busiLineList; + + @Schema(description = "系统时间") + @Hidden + private LocalDate localDate; +} 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 f08f1d5..41fbc78 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 @@ -10,6 +10,7 @@ import lombok.Data; import java.time.LocalDate; import java.util.List; +import java.util.Set; @Schema(description = "管理后台 - 养护计划汇总分页 Request VO") @Data @@ -28,13 +29,10 @@ public class AppMaintainPlanPagePlanTypeReqVO extends PageParam { @Max(value = 3, message = "状态不能大于4") private Integer finishState; - @Schema(description = "公司ID") - @Hidden - private Long companyId; - @Schema(description = "角色IDS") + @Schema(description = "计划批次号列表") @Hidden - private List roleIds; + private Set batchNos; @Schema(description = "业务线") @Hidden diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadReqVO.java index c8d4f02..cb4a883 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadReqVO.java @@ -7,12 +7,10 @@ import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotNull; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDate; import java.util.List; - -import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; +import java.util.Set; @Schema(description = "管理后台 - 养护计划汇总分页 Request VO") @Data @@ -27,13 +25,10 @@ public class AppMaintainPlanPageRoadReqVO extends PageParam { @Max(value = 3, message = "状态不能大于4") private Integer finishState; - @Schema(description = "公司ID") - @Hidden - private Long companyId; - @Schema(description = "角色IDS") + @Schema(description = "批次号") @Hidden - private List roleIds; + private Set batchNos; @Schema(description = "业务线") @Hidden diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanCommitMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanCommitMapper.java index 158d117..fbf458e 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanCommitMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanCommitMapper.java @@ -3,9 +3,12 @@ package com.zteits.urbanops.module.garden.dal.mysql.maintainplan; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanCommitPageReqVO; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanCommitRespVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanCommitDetailPageRespVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanCommitPageReqVO; import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanCommitDO; import org.apache.ibatis.annotations.Mapper; -import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -25,5 +28,11 @@ public interface MaintainPlanCommitMapper extends BaseMapperX selectForPage(@Param("page") IPage page, @Param("req") MaintainPlanCommitPageReqVO req, @Param("busiLineList") List busiLineList); - + /** + * 查询已完成明细 + * + * @param pageReqVO 分页参数 + * @return 分页结果 + */ + IPage appMaintainPlanCommitDetailPage(@Param("page") IPage page, @Param("req") AppMaintainPlanCommitPageReqVO pageReqVO); } \ No newline at end of file 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 2f0ccd1..690912c 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 @@ -1,20 +1,19 @@ package com.zteits.urbanops.module.garden.dal.mysql.maintainplan; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX; -import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils; +import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanDetailPageReqVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainNotFinishPlanDetailReqVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainNotFinishPlanDetailRespVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanDetailListByRoadPageReqVO; import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanDetailRespVO; import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDetailDO; -import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Mapper; -import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; import org.apache.ibatis.annotations.Param; -import java.time.LocalDate; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -46,16 +45,19 @@ 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("planName") String planName); + IPage appMaintainPlanDetailListByRoadPage(@Param("page") IPage page, @Param("req") AppMaintainPlanDetailListByRoadPageReqVO req); + /** + * app-获取未完成养护计划列表-app + * @param reqVO 入参数 + * @return 列表 + */ + List getMaintainNotFinishPlanCommitDetail(AppMaintainNotFinishPlanDetailReqVO reqVO); } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java index 4bf6e69..110af2b 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java @@ -1,26 +1,24 @@ package com.zteits.urbanops.module.garden.service.inspectionplan; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.util.object.BeanUtils; import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils; +import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanDetailPageReqVO; +import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanDetailSaveReqVO; import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanDetailReqVO; import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanDetailRespVO; +import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDetailDO; +import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanDetailMapper; +import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanRoleMapper; import com.zteits.urbanops.module.system.api.permission.RoleApi; +import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; -import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.*; -import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.*; -import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDetailDO; -import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.framework.common.util.object.BeanUtils; - -import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanDetailMapper; - -import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertList; +import java.util.Arrays; +import java.util.List; /** * 巡检计划 Service 实现类 @@ -35,6 +33,9 @@ public class InspectionPlanDetailServiceImpl implements InspectionPlanDetailServ private InspectionPlanDetailMapper inspectionPlanDetailMapper; @Resource + private InspectionPlanRoleMapper inspectionPlanRoleMapper; + + @Resource private RoleApi roleApi; @Override @@ -91,16 +92,15 @@ public class InspectionPlanDetailServiceImpl implements InspectionPlanDetailServ public List getInspectionPlanDetailForApp(AppInspectionPlanDetailReqVO pageReqVO) { String busiLine = SecurityFrameworkUtils.getBusiLine(); Long companyId = SecurityFrameworkUtils.getCompanyId(); + Long deptId = SecurityFrameworkUtils.getDeptId(); if (StringUtils.isNotEmpty(busiLine)) { pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(","))); } pageReqVO.setCompanyId(companyId); - /*1.查询登录用户角色*/ - List roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId()); - pageReqVO.setRoleIds(roleIds); pageReqVO.setLocalDateTime(LocalDateTime.now()); - /*2.明细*/ + + /*2.明细*/ return inspectionPlanDetailMapper.getInspectionPlanDetailForApp(pageReqVO); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitService.java index 4d8377a..362dd10 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitService.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitService.java @@ -2,6 +2,8 @@ package com.zteits.urbanops.module.garden.service.maintainplan; import java.util.*; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanCommitDetailPageRespVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanCommitPageReqVO; import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanCommitSaveReqVO; import jakarta.validation.*; import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; @@ -78,4 +80,13 @@ public interface MaintainPlanCommitService { */ PageResult getMaintainPlanCommitPage(MaintainPlanCommitPageReqVO pageReqVO); + /** + * app-获得养护计划明细分页 + * + * @param pageReqVO 分页查询 + * @return 养护计划明细分页 + */ + PageResult appMaintainPlanCommitDetailPage(AppMaintainPlanCommitPageReqVO pageReqVO); + + } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java index c4d478d..cb22ec0 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java @@ -10,7 +10,7 @@ import com.zteits.urbanops.framework.common.util.string.StrUtils; import com.zteits.urbanops.framework.mybatis.core.util.MyBatisUtils; import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils; import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; -import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanCommitSaveReqVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.*; import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanCommitDO; import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanCommonUserDO; import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDO; @@ -210,6 +210,20 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService } @Override + public PageResult appMaintainPlanCommitDetailPage(AppMaintainPlanCommitPageReqVO pageReqVO) { + //分页 + IPage mpPage = MyBatisUtils.buildPage(pageReqVO); + IPage page = maintainPlanCommitMapper.appMaintainPlanCommitDetailPage(mpPage, pageReqVO); + + page.getRecords().forEach(respVO -> { + respVO.setBeginImgList(StrUtils.imgProcess(respVO.getBeginImg(), "")); + }); + + // 转换返回 + return new PageResult<>(page.getRecords(), page.getTotal()); + } + + @Override public List getMaintainPlanCommitDetailByPlanNo(String planNo) { List respList = new ArrayList<>(); /*1.查询处理明细*/ @@ -270,7 +284,6 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService // 转换返回 return new PageResult<>(page.getRecords(), page.getTotal()); } - /** * 回填部门/公司/角色 * @param list 分页对象 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 6740ab6..4e9e19a 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 @@ -2,6 +2,9 @@ package com.zteits.urbanops.module.garden.service.maintainplan; import java.util.*; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainNotFinishPlanDetailReqVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainNotFinishPlanDetailRespVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanDetailListByRoadPageReqVO; import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanDetailRespVO; import jakarta.validation.*; import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; @@ -62,9 +65,16 @@ public interface MaintainPlanDetailService { /** * 按照道路查询养护计划列表 - * @param roadId 道路ID + * @param pageReqVO 道路ID * @return */ - List appMaintainPlanDetailListByRoad(Long roadId, Integer finishState, String planName); + PageResult appMaintainPlanDetailListByRoadPage(AppMaintainPlanDetailListByRoadPageReqVO pageReqVO); + + /** + * 获得未完成养护计划明细列表 + * @param reqVO + * @return + */ + List getMaintainNotFinishPlanCommitDetail(AppMaintainNotFinishPlanDetailReqVO reqVO); } \ 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 11b41c7..bf9fa45 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 @@ -1,21 +1,34 @@ package com.zteits.urbanops.module.garden.service.maintainplan; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zteits.urbanops.framework.common.pojo.PageResult; +import com.zteits.urbanops.framework.common.util.object.BeanUtils; +import com.zteits.urbanops.framework.mybatis.core.util.MyBatisUtils; import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanDetailPageReqVO; +import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.MaintainPlanDetailSaveReqVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainNotFinishPlanDetailReqVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainNotFinishPlanDetailRespVO; +import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanDetailListByRoadPageReqVO; import com.zteits.urbanops.module.garden.controller.app.maintainplan.vo.AppMaintainPlanDetailRespVO; +import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDetailDO; +import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanRoleDO; +import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanDetailMapper; +import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanRoleMapper; import com.zteits.urbanops.module.system.api.permission.RoleApi; +import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; +import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; import java.time.LocalDate; -import java.util.*; -import com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo.*; -import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDetailDO; -import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.framework.common.util.object.BeanUtils; - -import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanDetailMapper; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; /** @@ -31,6 +44,9 @@ public class MaintainPlanDetailServiceImpl implements MaintainPlanDetailService private MaintainPlanDetailMapper maintainPlanDetailMapper; @Resource + private MaintainPlanRoleMapper maintainPlanRoleMapper; + + @Resource private RoleApi roleApi; @Override @@ -84,18 +100,48 @@ public class MaintainPlanDetailServiceImpl implements MaintainPlanDetailService } @Override - public List appMaintainPlanDetailListByRoad(Long roadId, Integer finishState, String planName) { + public PageResult appMaintainPlanDetailListByRoadPage(AppMaintainPlanDetailListByRoadPageReqVO pageReqVO) { String busiLine = SecurityFrameworkUtils.getBusiLine(); - Long companyId = SecurityFrameworkUtils.getCompanyId(); - List busiLineList = new ArrayList<>(); if (StringUtils.isNotEmpty(busiLine)) { - busiLineList = Arrays.asList(busiLine.split(",")); + pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(","))); } /*1.查询登录用户角色*/ + Set batchNos = this.getBatchNosByLoginUserId(); + pageReqVO.setLocalDate(LocalDate.now()); + pageReqVO.setBatchNos(batchNos); + /*2.分页*/ + IPage mpPage = MyBatisUtils.buildPage(pageReqVO); + IPage page = maintainPlanDetailMapper.appMaintainPlanDetailListByRoadPage(mpPage, pageReqVO); + // 转换返回 + return new PageResult<>(page.getRecords(), page.getTotal()); + } + + @Override + public List getMaintainNotFinishPlanCommitDetail(AppMaintainNotFinishPlanDetailReqVO reqVO) { + //完成状态 1:未完成;2:已完成;3:已失效 + reqVO.setFinishState(1); + return maintainPlanDetailMapper.getMaintainNotFinishPlanCommitDetail(reqVO); + } + + /** + * 获取登录用户批次号List + */ + private Set getBatchNosByLoginUserId() { + Long companyId = SecurityFrameworkUtils.getCompanyId(); + Long deptId = SecurityFrameworkUtils.getDeptId(); + /*1.查询登录用户角色*/ List roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId()); - LocalDate now = LocalDate.now(); - return maintainPlanDetailMapper.appMaintainPlanDetailListByRoad(busiLineList, roadId, companyId, roleIds, now, finishState, planName); + QueryWrapper roleSql = new QueryWrapper<>(); + roleSql.select("batch_no"); + roleSql.lambda().in(MaintainPlanRoleDO::getRoleId, roleIds). + eq(MaintainPlanRoleDO::getCompanyId, companyId) + .eq(MaintainPlanRoleDO::getDeptId, deptId); + List roleList = maintainPlanRoleMapper.selectList(roleSql); + if (CollectionUtils.isEmpty(roleList)) { + return Collections.emptySet(); + } + return roleList.stream().map(MaintainPlanRoleDO::getBatchNo).collect(Collectors.toSet()); } } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java index 4c85a92..6d69136 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java @@ -341,17 +341,14 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { @Override public PageResult appMaintainPlanRoadPage(AppMaintainPlanPageRoadReqVO pageReqVO) { String busiLine = SecurityFrameworkUtils.getBusiLine(); - Long companyId = SecurityFrameworkUtils.getCompanyId(); if (StringUtils.isNotEmpty(busiLine)) { pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(","))); } - pageReqVO.setCompanyId(companyId); - /*1.查询登录用户角色*/ - List roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId()); - pageReqVO.setRoleIds(roleIds); + /*1.查询登录用户计划编码列表*/ + Set batchNos = this.getBatchNosByLoginUserId(); + pageReqVO.setBatchNos(batchNos); pageReqVO.setLocalDate(LocalDate.now()); - /*2.分页*/ IPage mpPage = MyBatisUtils.buildPage(pageReqVO); IPage page = maintainPlanMapper.appMaintainPlanRoadPage(mpPage, pageReqVO); @@ -359,6 +356,26 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { return new PageResult<>(page.getRecords(), page.getTotal()); } + /** + * 获取登录用户批次号List + */ + private Set getBatchNosByLoginUserId() { + Long companyId = SecurityFrameworkUtils.getCompanyId(); + Long deptId = SecurityFrameworkUtils.getDeptId(); + /*1.查询登录用户角色*/ + List roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId()); + QueryWrapper roleSql = new QueryWrapper<>(); + roleSql.select("batch_no"); + roleSql.lambda().in(MaintainPlanRoleDO::getRoleId, roleIds). + eq(MaintainPlanRoleDO::getCompanyId, companyId) + .eq(MaintainPlanRoleDO::getDeptId, deptId); + List roleList = maintainPlanRoleMapper.selectList(roleSql); + if (CollectionUtils.isEmpty(roleList)) { + return Collections.emptySet(); + } + return roleList.stream().map(MaintainPlanRoleDO::getBatchNo).collect(Collectors.toSet()); + } + @Override public PageResult appMaintainPlanPlanTypePage(AppMaintainPlanPagePlanTypeReqVO pageReqVO) { String busiLine = SecurityFrameworkUtils.getBusiLine(); @@ -366,11 +383,9 @@ public class MaintainPlanServiceImpl implements MaintainPlanService { if (StringUtils.isNotEmpty(busiLine)) { pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(","))); } - pageReqVO.setCompanyId(companyId); - - /*1.查询登录用户角色*/ - List roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId()); - pageReqVO.setRoleIds(roleIds); + /*1.查询登录用户计划编码列表*/ + Set batchNos = this.getBatchNosByLoginUserId(); + pageReqVO.setBatchNos(batchNos); pageReqVO.setLocalDate(LocalDate.now()); /*2.分页*/ IPage mpPage = MyBatisUtils.buildPage(pageReqVO); diff --git a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml index 374a767..548d4aa 100644 --- a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanDetailMapper.xml @@ -32,8 +32,7 @@ b.end_time FROM garden_inspection_plan a, - garden_inspection_plan_detail b, - garden_inspection_plan_role c + garden_inspection_plan_detail b WHERE a.batch_no = b.batch_no AND b.batch_no=c.batch_no @@ -43,12 +42,6 @@ AND a.deleted = 0 AND a.batch_no = #{req.batchNo} AND a.company_id = #{req.companyId} - - AND c.role_id IN - - #{roleId} - - AND a.busi_line IN 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 33dd7e5..5e3b4be 100644 --- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml @@ -79,4 +79,35 @@ + \ 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 f3de0a1..793d5eb 100644 --- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml @@ -13,7 +13,7 @@ delete from garden_maintain_plan_detail where batch_no =#{batchNo} - SELECT c.batch_no, c.plan_no, @@ -29,40 +29,61 @@ c.sort_num FROM garden_maintain_plan a, - garden_maintain_plan_role b, garden_maintain_plan_detail c - WHERE - a.batch_no = b.batch_no - and a.batch_no=b.batch_no - AND a.dept_id =b.dept_id + WHERE a.batch_no=c.batch_no AND a.deleted=0 - AND a.company_id = #{companyId} - AND a.road_id = #{roadId} - - AND a.plan_name LIKE CONCAT('%',#{planName},'%') + AND a.road_id = #{req.roadId} + + AND a.plan_name LIKE CONCAT('%',#{req.planName},'%') - - AND b.role_id IN - - #{roleId} - - - + AND a.busi_line IN - + #{busiLine} + + AND a.batch_no IN + + #{batchNo} + + - - + + - - and c.finish_state = #{finishState} + + and c.finish_state = #{req.finishState} - - and c.finish_state = #{finishState} - = #{localDate}]]> + + and c.finish_state = #{req.finishState} + = #{req.localDate}]]> + + \ No newline at end of file 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 e3d3c40..318cc07 100644 --- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanMapper.xml @@ -20,25 +20,20 @@ a.road_name, a.level_id, a.finish_state, - max(a.plan_num) as plan_num, - max(a.plan_finish_num) as plan_finish_num, + a.plan_num, + a.plan_finish_num, a.begin_time, a.end_time FROM - garden_maintain_plan a, - garden_maintain_plan_role b - WHERE - a.batch_no = b.batch_no - AND a.dept_id =b.dept_id - AND a.deleted=0 - AND a.company_id = #{req.companyId} + garden_maintain_plan a + WHERE a.deleted=0 AND a.road_name LIKE CONCAT('%',#{req.roadName},'%') - - AND b.role_id IN - - #{roleId} + + AND a.batch_no IN + + #{batchNo} @@ -58,14 +53,6 @@ and a.finish_state = #{req.finishState} = #{req.localDate}]]> - GROUP BY - a.batch_no, - a.road_id, - a.road_name, - a.level_id, - a.finish_state, - a.begin_time, - a.end_time