From 70b72d6e5a4453644096332aa27e52759d2b8665 Mon Sep 17 00:00:00 2001 From: wangfs <15029758498@163.com> Date: Sun, 7 Dec 2025 14:12:31 +0800 Subject: [PATCH] 养护计划明细提交 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanCommitController.java | 8 ++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitDetailRespVO.java | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitPageReqVO.java | 5 ----- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommonUserVO.java | 19 +++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanCommitDO.java | 4 ++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanCommitMapper.java | 4 +++- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitService.java | 8 ++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++++++-- urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml | 8 ++++---- 9 files changed, 175 insertions(+), 12 deletions(-) create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitDetailRespVO.java create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommonUserVO.java diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanCommitController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanCommitController.java index f621aaf..1b19679 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanCommitController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanCommitController.java @@ -79,6 +79,14 @@ public class MaintainPlanCommitController { return success(BeanUtils.toBean(maintainPlanCommit, MaintainPlanCommitRespVO.class)); } + @GetMapping("/get/plan-no") + @Operation(summary = "获取养护计划-共同处理人明细") + @Parameter(name = "plan_no", description = "计划编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('garden:maintain-plan-commit:query')") + public CommonResult> getMaintainPlanCommitDetailByPlanNo(@RequestParam("plan_no") String planNo) { + return success( maintainPlanCommitService.getMaintainPlanCommitDetailByPlanNo(planNo)); + } + @GetMapping("/page") @Operation(summary = "获得养护计划明细分页") @PreAuthorize("@ss.hasPermission('garden:maintain-plan-commit:query')") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitDetailRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitDetailRespVO.java new file mode 100644 index 0000000..0e8d864 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitDetailRespVO.java @@ -0,0 +1,84 @@ +package com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo; + +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; +import java.util.List; + +import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 养护计划明细 Response VO") +@Data +@ExcelIgnoreUnannotated +public class MaintainPlanCommitDetailRespVO { + + @Schema(description = "批次号") + @ExcelProperty("批次号") + private String batchNo; + + @Schema(description = "计划编码") + @ExcelProperty("计划编码") + private String planNo; + + @Schema(description = "提交次序号") + @ExcelProperty("提交次序号") + private Integer sortNum; + + @Schema(description = "业务线: yl-园林；wy-物业：sz-市政") + @ExcelProperty("业务线: yl-园林；wy-物业：sz-市政") + private String busiLine; + + + @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输 ;2009:补植;3001:绿地巡视;", example = "24742") + @ExcelProperty("养护类型") + private Integer planTypeId; + + @Schema(description = "备注", example = "你猜") + @ExcelProperty("备注") + private String remark; + + @Schema(description = "本次完成百分比", example = "98.00") + @ExcelProperty("本次完成百分比") + private Double finishPercent; + + @Schema(description = "照片host", example = "aaa") + @ExcelProperty("照片host") + private String imgHost; + + @Schema(description = "开始照片", example = "aaa") + @ExcelProperty("开始照片") + private List beginImgList; + + @Schema(description = "处理中照片", example = "aaa") + @ExcelProperty("处理中照片") + private List processImgList; + + @Schema(description = "结束照片", example = "aaa") + @ExcelProperty("结束照片") + private List endImgList; + + @Schema(description = "养护面积:单位m²", example = "20") + @ExcelProperty("养护面积:单位m²") + private Double opArea; + /** + * 操作时长 + */ + @Schema(description = "养护面积:单位m²", example = "20") + @ExcelProperty("养护面积:单位m²") + private Double opTime; + /** + * 完成时间 + */ + @Schema(description = "完成时间") + @ExcelProperty("完成时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime finishTime; + + @Schema(description = "共同处理人", example = "张三,莉") + private List commonUsers; + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitPageReqVO.java index e44d4ab..bf9669c 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitPageReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommitPageReqVO.java @@ -27,9 +27,6 @@ public class MaintainPlanCommitPageReqVO extends PageParam { @Schema(description = "业务线: yl-园林；wy-物业：sz-市政") private String busiLine; - @Schema(description = "提交次序号") - private Integer sortNum; - @Schema(description = "归属(一级部门id)", example = "2759") private Long companyId; @@ -63,6 +60,4 @@ public class MaintainPlanCommitPageReqVO extends PageParam { @Schema(description = "提交人用户ID", example = "王五") private String userName; - private List busiLineList; - } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommonUserVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommonUserVO.java new file mode 100644 index 0000000..0e54358 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanCommonUserVO.java @@ -0,0 +1,19 @@ +package com.zteits.urbanops.module.garden.controller.admin.maintainplan.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * 共同处理人 + * @author 创建人：ZTEITS + * @version 创建时间：2021/5/27 + */ +@Data +public class MaintainPlanCommonUserVO { + @Schema(description = "提交人用户", example = "19167") + private Long userId; + + @Schema(description = "提交人用户ID", example = "王五") + private String userName; + +} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanCommitDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanCommitDO.java index 05406ef..ea8fa14 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanCommitDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/maintainplan/MaintainPlanCommitDO.java @@ -39,6 +39,10 @@ public class MaintainPlanCommitDO extends BaseDO { */ private String busiLine; /** + * 养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输 ;2009:补植;3001:绿地巡视; + */ + private Integer planTypeId; + /** * 提交次序号 */ private Integer sortNum; 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 fdd68b4..158d117 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 @@ -8,6 +8,8 @@ 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; + /** * 养护计划明细 Mapper * @@ -21,7 +23,7 @@ public interface MaintainPlanCommitMapper extends BaseMapperX selectForPage(@Param("page") IPage page, @Param("req") MaintainPlanCommitPageReqVO req); + IPage selectForPage(@Param("page") IPage page, @Param("req") MaintainPlanCommitPageReqVO req, @Param("busiLineList") List busiLineList); } \ No newline at end of file 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 6107566..0c76a63 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 @@ -51,6 +51,14 @@ public interface MaintainPlanCommitService { MaintainPlanCommitDO getMaintainPlanCommit(Long id); /** + * 获得养护计划明细列表 + * + * @param planNo 计划编号 + * @return 养护计划明细列表 + */ + List getMaintainPlanCommitDetailByPlanNo(String planNo); + + /** * 获得养护计划明细分页 * * @param pageReqVO 分页查询 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 52b34b1..9138ae8 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 @@ -1,8 +1,12 @@ 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.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.dal.dataobject.maintainplan.MaintainPlanCommonUserDO; +import com.zteits.urbanops.module.garden.dal.mysql.maintainplan.MaintainPlanCommonUserMapper; import com.zteits.urbanops.module.system.api.dept.DeptApi; import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO; import org.apache.commons.lang3.StringUtils; @@ -35,6 +39,9 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService private MaintainPlanCommitMapper maintainPlanCommitMapper; @Resource + private MaintainPlanCommonUserMapper maintainPlanCommonUserMapper; + + @Resource private DeptApi deptApi; @Override @@ -83,6 +90,43 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService } @Override + public List getMaintainPlanCommitDetailByPlanNo(String planNo) { + List respList = new ArrayList<>(); + /*1.查询处理明细*/ + List list = maintainPlanCommitMapper.selectList(new QueryWrapper().lambda() + .eq(MaintainPlanCommitDO::getPlanNo, planNo).eq(MaintainPlanCommitDO::getDeleted, 0)); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyList(); + } + + /*1.查询共同处理人*/ + list.forEach(e -> { + MaintainPlanCommitDetailRespVO respVO = new MaintainPlanCommitDetailRespVO(); + BeanUtils.copyProperties(e, respVO); + respVO.setBeginImgList(StrUtils.imgProcess(e.getBeginImg(), e.getImgHost())); + respVO.setProcessImgList(StrUtils.imgProcess(e.getProcessImg(), e.getImgHost())); + respVO.setEndImgList(StrUtils.imgProcess(e.getEndImg(), e.getImgHost())); + + List commonUsers = new ArrayList<>(); + List maintainPlanCommonUserList = maintainPlanCommonUserMapper.selectList(new QueryWrapper().lambda() + .eq(MaintainPlanCommonUserDO::getPlanNo, e.getPlanNo()) + .eq(MaintainPlanCommonUserDO::getSortNum, e.getSortNum()) + .eq(MaintainPlanCommonUserDO::getDeleted, 0)); + if (!CollectionUtils.isEmpty(maintainPlanCommonUserList)) { + for (MaintainPlanCommonUserDO commonUserDO : maintainPlanCommonUserList) { + commonUsers.add(new MaintainPlanCommonUserVO() + .setUserId(commonUserDO.getUserId()) + .setUserName(commonUserDO.getUserName())); + } + respVO.setCommonUsers(commonUsers); + } + respList.add(respVO); + }); + + return respList; + } + + @Override public PageResult getMaintainPlanCommitPage(MaintainPlanCommitPageReqVO pageReqVO) { String busiLine = SecurityFrameworkUtils.getBusiLine(); List busiLineList = new ArrayList<>(); @@ -93,10 +137,9 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService busiLineList.addAll(Arrays.asList(busiLine.split(","))); } } - pageReqVO.setBusiLineList(busiLineList); //分页 IPage mpPage = MyBatisUtils.buildPage(pageReqVO); - IPage page = maintainPlanCommitMapper.selectForPage(mpPage, pageReqVO); + IPage page = maintainPlanCommitMapper.selectForPage(mpPage, pageReqVO, busiLineList); addDataInspectionPlan(page.getRecords()); // 转换返回 return new PageResult<>(page.getRecords(), page.getTotal()); 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 37bb5a6..33dd7e5 100644 --- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml @@ -27,7 +27,7 @@ a.end_time, a.company_id, a.dept_id, - a.finish_percent, + a.finish_percent as finishPercent, c.role_name, c.finish_time, c.user_name @@ -42,7 +42,7 @@ and a.plan_no = #{req.planNo} - and a.plan_name = #{req.planName} + and b.plan_name = #{req.planName} AND b.road_name LIKE CONCAT(#{req.roadName},'%') @@ -50,9 +50,9 @@ and b.level_id = #{req.levelId} - + AND b.busi_line IN - + #{id} -- libgit2 0.21.4