Commit b759a67e3fc96ab293329f1f5174d2c8ed85f2e6
1 parent
6f8d8515
材料等级增加来源
Showing
6 changed files
with
18 additions
and
6 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanCommitRespVO.java
| @@ -17,6 +17,13 @@ public class InspectionPlanCommitRespVO { | @@ -17,6 +17,13 @@ public class InspectionPlanCommitRespVO { | ||
| 17 | @ExcelProperty("计划编码") | 17 | @ExcelProperty("计划编码") |
| 18 | private String planNo; | 18 | private String planNo; |
| 19 | 19 | ||
| 20 | + /** | ||
| 21 | + * 排序号:第n次计划提交 | ||
| 22 | + */ | ||
| 23 | + @Schema(description = "排序号") | ||
| 24 | + @ExcelProperty("排序号") | ||
| 25 | + private Integer sortNum; | ||
| 26 | + | ||
| 20 | @Schema(description = "计划名称") | 27 | @Schema(description = "计划名称") |
| 21 | @ExcelProperty("计划名称") | 28 | @ExcelProperty("计划名称") |
| 22 | private String planName; | 29 | private String planName; |
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanCommitController.java
| @@ -83,8 +83,9 @@ public class MaintainPlanCommitController { | @@ -83,8 +83,9 @@ public class MaintainPlanCommitController { | ||
| 83 | @Operation(summary = "获取养护计划-共同处理人明细") | 83 | @Operation(summary = "获取养护计划-共同处理人明细") |
| 84 | @Parameter(name = "plan_no", description = "计划编号", required = true, example = "1024") | 84 | @Parameter(name = "plan_no", description = "计划编号", required = true, example = "1024") |
| 85 | @PreAuthorize("@ss.hasPermission('garden:maintain-plan-commit:query')") | 85 | @PreAuthorize("@ss.hasPermission('garden:maintain-plan-commit:query')") |
| 86 | - public CommonResult<List<MaintainPlanCommitDetailRespVO>> getMaintainPlanCommitDetailByPlanNo(@RequestParam("plan_no") String planNo) { | ||
| 87 | - return success( maintainPlanCommitService.getMaintainPlanCommitDetailByPlanNo(planNo)); | 86 | + public CommonResult<List<MaintainPlanCommitDetailRespVO>> getMaintainPlanCommitDetailByPlanNo(@RequestParam("plan_no") String planNo, |
| 87 | + @RequestParam(value="sort_num", required = false) String sortNum) { | ||
| 88 | + return success( maintainPlanCommitService.getMaintainPlanCommitDetailByPlanNo(planNo, sortNum)); | ||
| 88 | } | 89 | } |
| 89 | 90 | ||
| 90 | @GetMapping("/page") | 91 | @GetMapping("/page") |
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitService.java
| @@ -70,7 +70,7 @@ public interface MaintainPlanCommitService { | @@ -70,7 +70,7 @@ public interface MaintainPlanCommitService { | ||
| 70 | * @param planNo 计划编号 | 70 | * @param planNo 计划编号 |
| 71 | * @return 养护计划明细列表 | 71 | * @return 养护计划明细列表 |
| 72 | */ | 72 | */ |
| 73 | - List<MaintainPlanCommitDetailRespVO> getMaintainPlanCommitDetailByPlanNo(String planNo); | 73 | + List<MaintainPlanCommitDetailRespVO> getMaintainPlanCommitDetailByPlanNo(String planNo, String sortNum); |
| 74 | 74 | ||
| 75 | /** | 75 | /** |
| 76 | * 获得养护计划明细分页 | 76 | * 获得养护计划明细分页 |
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java
| @@ -219,11 +219,13 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService | @@ -219,11 +219,13 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService | ||
| 219 | } | 219 | } |
| 220 | 220 | ||
| 221 | @Override | 221 | @Override |
| 222 | - public List<MaintainPlanCommitDetailRespVO> getMaintainPlanCommitDetailByPlanNo(String planNo) { | 222 | + public List<MaintainPlanCommitDetailRespVO> getMaintainPlanCommitDetailByPlanNo(String planNo, String sortNum) { |
| 223 | List<MaintainPlanCommitDetailRespVO> respList = new ArrayList<>(); | 223 | List<MaintainPlanCommitDetailRespVO> respList = new ArrayList<>(); |
| 224 | /*1.查询处理明细*/ | 224 | /*1.查询处理明细*/ |
| 225 | List<MaintainPlanCommitDO> list = maintainPlanCommitMapper.selectList(new QueryWrapper<MaintainPlanCommitDO>().lambda() | 225 | List<MaintainPlanCommitDO> list = maintainPlanCommitMapper.selectList(new QueryWrapper<MaintainPlanCommitDO>().lambda() |
| 226 | - .eq(MaintainPlanCommitDO::getPlanNo, planNo).eq(MaintainPlanCommitDO::getDeleted, 0)); | 226 | + .eq(MaintainPlanCommitDO::getPlanNo, planNo) |
| 227 | + .eq(null != sortNum, MaintainPlanCommitDO::getSortNum, sortNum) | ||
| 228 | + .eq(MaintainPlanCommitDO::getDeleted, 0)); | ||
| 227 | if (CollectionUtils.isEmpty(list)) { | 229 | if (CollectionUtils.isEmpty(list)) { |
| 228 | return Collections.emptyList(); | 230 | return Collections.emptyList(); |
| 229 | } | 231 | } |
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
| @@ -39,7 +39,8 @@ | @@ -39,7 +39,8 @@ | ||
| 39 | a.dept_id, | 39 | a.dept_id, |
| 40 | c.finish_time, | 40 | c.finish_time, |
| 41 | c.begin_img, | 41 | c.begin_img, |
| 42 | - c.user_name | 42 | + c.user_name, |
| 43 | + c.sort_num | ||
| 43 | FROM | 44 | FROM |
| 44 | garden_maintain_plan_detail a | 45 | garden_maintain_plan_detail a |
| 45 | INNER JOIN garden_maintain_plan b ON a.batch_no = b.batch_no | 46 | INNER JOIN garden_maintain_plan b ON a.batch_no = b.batch_no |