材料等级增加来源

王富生
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
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/MaintainPlanCommitController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitService.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanCommitServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanCommitMapper.xml
@@ -17,6 +17,13 @@ public class InspectionPlanCommitRespVO {
     @ExcelProperty("计划编码")
     private String planNo;
  
+    /**
+     * 排序号:第n次计划提交
+     */
+    @Schema(description = "排序号")
+    @ExcelProperty("排序号")
+    private Integer sortNum;
+
     @Schema(description = "计划名称")
     @ExcelProperty("计划名称")
     private String planName;
@@ -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<List<MaintainPlanCommitDetailRespVO>> getMaintainPlanCommitDetailByPlanNo(@RequestParam("plan_no") String planNo) {
-        return success( maintainPlanCommitService.getMaintainPlanCommitDetailByPlanNo(planNo));
+    public CommonResult<List<MaintainPlanCommitDetailRespVO>> getMaintainPlanCommitDetailByPlanNo(@RequestParam("plan_no") String planNo,
+                                                                                                  @RequestParam(value="sort_num", required = false) String  sortNum) {
+        return success( maintainPlanCommitService.getMaintainPlanCommitDetailByPlanNo(planNo, sortNum));
     }
  
     @GetMapping("/page")
@@ -70,7 +70,7 @@ public interface MaintainPlanCommitService {
      * @param planNo 计划编号
      * @return 养护计划明细列表
      */
-    List<MaintainPlanCommitDetailRespVO> getMaintainPlanCommitDetailByPlanNo(String planNo);
+    List<MaintainPlanCommitDetailRespVO> getMaintainPlanCommitDetailByPlanNo(String planNo, String sortNum);
  
     /**
      * 获得养护计划明细分页
@@ -219,11 +219,13 @@ public class MaintainPlanCommitServiceImpl implements MaintainPlanCommitService 
     }
  
     @Override
-    public List<MaintainPlanCommitDetailRespVO> getMaintainPlanCommitDetailByPlanNo(String planNo) {
+    public List<MaintainPlanCommitDetailRespVO> getMaintainPlanCommitDetailByPlanNo(String planNo, String sortNum) {
         List<MaintainPlanCommitDetailRespVO> respList = new ArrayList<>();
         /*1.查询处理明细*/
         List<MaintainPlanCommitDO> list = maintainPlanCommitMapper.selectList(new QueryWrapper<MaintainPlanCommitDO>().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();
         }
@@ -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,
@@ -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