diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanCommitRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanCommitRespVO.java index f91aced..0c97848 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanCommitRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanCommitRespVO.java @@ -17,6 +17,13 @@ public class InspectionPlanCommitRespVO { @ExcelProperty("计划编码") private String planNo; + /** + * 排序号:第n次计划提交 + */ + @Schema(description = "排序号") + @ExcelProperty("排序号") + private Integer sortNum; + @Schema(description = "计划名称") @ExcelProperty("计划名称") private String planName; 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 1b19679..7ded608 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 @@ -83,8 +83,9 @@ public class MaintainPlanCommitController { @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)); + public CommonResult> getMaintainPlanCommitDetailByPlanNo(@RequestParam("plan_no") String planNo, + @RequestParam(value="sort_num", required = false) String sortNum) { + return success( maintainPlanCommitService.getMaintainPlanCommitDetailByPlanNo(planNo, sortNum)); } @GetMapping("/page") 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 362dd10..1cadc62 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 @@ -70,7 +70,7 @@ public interface MaintainPlanCommitService { * @param planNo 计划编号 * @return 养护计划明细列表 */ - List getMaintainPlanCommitDetailByPlanNo(String planNo); + List getMaintainPlanCommitDetailByPlanNo(String planNo, String sortNum); /** * 获得养护计划明细分页 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 f968a04..347cd22 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 @@ -219,11 +219,13 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService } @Override - public List getMaintainPlanCommitDetailByPlanNo(String planNo) { + public List getMaintainPlanCommitDetailByPlanNo(String planNo, String sortNum) { List respList = new ArrayList<>(); /*1.查询处理明细*/ List list = maintainPlanCommitMapper.selectList(new QueryWrapper().lambda() - .eq(MaintainPlanCommitDO::getPlanNo, planNo).eq(MaintainPlanCommitDO::getDeleted, 0)); + .eq(MaintainPlanCommitDO::getPlanNo, planNo) + .eq(null != sortNum, MaintainPlanCommitDO::getSortNum, sortNum) + .eq(MaintainPlanCommitDO::getDeleted, 0)); if (CollectionUtils.isEmpty(list)) { return Collections.emptyList(); } 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 1673992..81e35fc 100644 --- a/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml @@ -33,6 +33,7 @@ a.finish_time as finishTime, a.user_id, a.user_name, + a.sort_num, a.remark, a.creator, a.creator_name, 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 72c1b74..9e325cf 100644 --- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml @@ -39,7 +39,8 @@ a.dept_id, c.finish_time, c.begin_img, - c.user_name + c.user_name, + c.sort_num FROM garden_maintain_plan_detail a INNER JOIN garden_maintain_plan b ON a.batch_no = b.batch_no