From f43dbd08226735630192771eb42c69a768129db0 Mon Sep 17 00:00:00 2001 From: wangfs <15029758498@163.com> Date: Sat, 13 Dec 2025 11:17:13 +0800 Subject: [PATCH] app巡查计划明细提交 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/AppInspectionPlanCommitController.java | 39 +++++++++++++++++++++++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanCommitRespVO.java | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanCommitMapper.java | 7 ++++++- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitService.java | 10 ++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java | 16 ++++++++++++++++ urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml | 45 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 203 insertions(+), 1 deletion(-) create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/AppInspectionPlanCommitController.java create mode 100644 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanCommitRespVO.java diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/AppInspectionPlanCommitController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/AppInspectionPlanCommitController.java new file mode 100644 index 0000000..11dfd27 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/AppInspectionPlanCommitController.java @@ -0,0 +1,39 @@ +package com.zteits.urbanops.module.garden.controller.app.inspectionplan; + + +import com.zteits.urbanops.framework.common.pojo.CommonResult; +import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanCommitRespVO; +import com.zteits.urbanops.module.garden.service.inspectionplan.InspectionPlanCommitService; +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.NotBlank; +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 java.util.List; + +import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; + +@Tag(name = "APP管理 - 巡检计划提交明细") +@RestController +@RequestMapping("/app/garden/inspection-plan-commit/") +@Validated +public class AppInspectionPlanCommitController { + + @Resource + private InspectionPlanCommitService inspectionPlanCommitService; + + @GetMapping("/get/by/plan_no") + @Operation(summary = "获得巡检计划提交明细") + @Parameter(name = "plan_no", description = "计划编号", required = true, example = "1024") + //@PreAuthorize("@ss.hasPermission('garden:inspection-plan-commit:query')") + public CommonResult> appInspectionPlanCommitListByPlanNo(@RequestParam("plan_no") @NotBlank String planNo) { + List list = inspectionPlanCommitService.appInspectionPlanCommitListByPlanNo(planNo); + return success(list); + } +} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanCommitRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanCommitRespVO.java new file mode 100644 index 0000000..312a2b5 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanCommitRespVO.java @@ -0,0 +1,87 @@ +package com.zteits.urbanops.module.garden.controller.app.inspectionplan.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 AppInspectionPlanCommitRespVO { + + @Schema(description = "计划编码") + @ExcelProperty("计划编码") + private String planNo; + + @Schema(description = "计划名称") + @ExcelProperty("计划名称") + private String planName; + + @Schema(description = "排序号:第n次计划", requiredMode = Schema.RequiredMode.REQUIRED) + private Integer sortNum; + + @Schema(description = "业务线: yl-园林；wy-物业：sz-市政") + private String busiLine; + + @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704") + private Long roadId; + + @Schema(description = "道路", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704") + private String roadName; + + @Schema(description = "计划属性:1:标准计划；2:临时计划", example = "1") + private Integer planAttr; + + @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输 ;2009:补植;3001:绿地巡视;", example = "24742") + private Integer planTypeId; + + @Schema(description = "计划次数") + private Integer planNum; + + @Schema(description = "完成次数") + private Integer planFinishNum; + + @Schema(description = "完成状态 1:未完成;2:已完成；", requiredMode = Schema.RequiredMode.REQUIRED) + private Integer finishState; + + @Schema(description = "图片地址host") + private String imgHost; + + @Schema(description = "巡检照片") + private String img; + + @Schema(description = "巡检照片") + private List imgList; + + @Schema(description = "巡检结果: 1:正常;2:异常") + private Integer inspectionState; + + @Schema(description = "转交状态: 1:未转交;2:已转交") + private Integer transState; + + @Schema(description = "转交问题单编码") + private String transWorkNo; + + @Schema(description = "完成时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime finishTime; + + @Schema(description = "提交人用户ID", example = "32294") + private Long userId; + + @Schema(description = "提交人", example = "芋艿") + private String userName; + + @Schema(description = "备注", example = "你猜") + private String remark; + + + +} \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanCommitMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanCommitMapper.java index f7c6dca..053ce7b 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanCommitMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanCommitMapper.java @@ -4,6 +4,7 @@ import java.util.*; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX; +import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanCommitRespVO; import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanCommitDO; import org.apache.ibatis.annotations.Mapper; import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.*; @@ -24,5 +25,9 @@ public interface InspectionPlanCommitMapper extends BaseMapperX selectForPage(@Param("page") IPage page, @Param("req") InspectionPlanCommitPageReqVO reqDTO); - + /* + * app 通过计划编码查询list + * @return 列表 + */ + List appInspectionPlanCommitListByPlanNo(@Param("planNo") String planNo, @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/inspectionplan/InspectionPlanCommitService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitService.java index 3df6e84..07c9c15 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitService.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitService.java @@ -1,6 +1,8 @@ package com.zteits.urbanops.module.garden.service.inspectionplan; import java.util.*; + +import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanCommitRespVO; import jakarta.validation.*; import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.*; import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanCommitDO; @@ -58,4 +60,12 @@ public interface InspectionPlanCommitService { */ PageResult getInspectionPlanCommitPage(InspectionPlanCommitPageReqVO pageReqVO); + /** + * app获得巡检计划提交明细 + * + * @param planNo 编号 + * @return 巡检计划提交明细 + */ + List appInspectionPlanCommitListByPlanNo(String planNo); + } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java index aa8d8fd..447c4ee 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java @@ -4,6 +4,7 @@ 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.controller.app.inspectionplan.vo.AppInspectionPlanCommitRespVO; 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; @@ -103,6 +104,21 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ return new PageResult<>(imgProcess(page.getRecords()), page.getTotal()); } + @Override + public List appInspectionPlanCommitListByPlanNo(String planNo) { + String busiLine = SecurityFrameworkUtils.getBusiLine(); + List busiLineList = new ArrayList<>(); + if (StringUtils.isNotEmpty(busiLine)) { + busiLineList = Arrays.asList(busiLine.split(",")); + } + List list = inspectionPlanCommitMapper.appInspectionPlanCommitListByPlanNo(planNo, busiLineList); + + list.forEach(e -> { + e.setImgList(StrUtils.imgProcess(e.getImg(), e.getImgHost())); + }); + return list; + } + /** * 回填部门/公司/角色 * @param list 分页对象 diff --git a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml index a9f4afe..8a21a2f 100644 --- a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml @@ -87,4 +87,49 @@ order by a.id desc + + \ No newline at end of file -- libgit2 0.21.4