app巡查汇总查询提交

王富生 · 王彪总
1 parent 05df533d
Showing 9 changed files with 80 additions and 31 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadUpdateReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanInterceptMapper.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/api/constant/BpmCommonConstant.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/AppGardenWorkOrderRespVO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/garden/BpmGardenWorkOrderDO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
urbanops-server/src/main/resources/application.yaml
@@ -28,6 +28,10 @@ public class InspectionPlanPageReqVO extends PageParam {
     @Schema(description = "归属(一级部门id)", example = "20800")
     private Long companyId;
  
+    @Schema(description = "部门ID", example = "101")
+    private String deptId;
+
+
     @Schema(description = "道路名称", example = "赵六")
     private String roadName;
  
@@ -85,8 +85,7 @@ public class RoadSaveReqVO {
     private String endRemark;
  
     @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
-    @NotEmpty(message = "备注不能为空")
-    @Size(min=0, max = 500, message = "备注不能为空")
+    @Size(max = 500, message = "备注最大500字符")
     private String remark;
  
     @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2323")
@@ -89,8 +89,7 @@ public class RoadUpdateReqVO {
     private String endRemark;
  
     @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
-    @NotEmpty(message = "备注不能为空")
-    @Size(max = 500, message = "备注不能为空")
+    @Size(max = 500, message = "备注最大500")
     private String remark;
  
     @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2323")
@@ -23,6 +23,7 @@ public interface InspectionPlanInterceptMapper extends BaseMapperX&lt;InspectionPla
                 .likeIfPresent(InspectionPlanDO::getPlanName, reqVO.getPlanName())
                 .eqIfPresent(InspectionPlanDO::getPlanAttr, reqVO.getPlanAttr())
                 .eqIfPresent(InspectionPlanDO::getPlanTypeId, reqVO.getPlanTypeId())
+                .eqIfPresent(InspectionPlanDO::getDeptId, reqVO.getDeptId())
                 .eqIfPresent(InspectionPlanDO::getCompanyId, reqVO.getCompanyId())
                 .likeIfPresent(InspectionPlanDO::getRoadName, reqVO.getRoadName())
                 .eqIfPresent(InspectionPlanDO::getLevelId, reqVO.getLevelId())
@@ -26,15 +26,15 @@ public  class BpmCommonConstant {
     /**
      * 园林问题单图片类型
      */
-    public static final String GARDEN_INSPECT_WO_ATTACH1 = "01";
+    public static final String PROBLEM_IMG_GROUP = "01";
     /**
-     * 园林街道图片类型
+     * 园林处理结果图片类型
      */
-    public static final String GARDEN_INSPECT_WO_ATTACH2 = "02";
+    public static final String RESULT_IMG_GROUP = "02";
     /**
      * 园林远景图片类型
      */
-    public static final String GARDEN_INSPECT_WO_ATTACH3 = "03";
+//    public static final String GARDEN_INSPECT_WO_ATTACH3 = "03";
     /**
      * 园林工单编号前缀
      */
@@ -4,6 +4,8 @@ import com.zteits.urbanops.module.workorder.controller.admin.maininfo.vo.MainInf
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
  
+import java.util.List;
+
 /**
  * @author yanhuiqing
  * @version 1.0
@@ -13,4 +15,10 @@ import lombok.Data;
 @Schema(description = "APP - 园林工单流程 Response VO")
 @Data
 public class AppGardenWorkOrderRespVO extends MainInfoRespVO {
+
+    @Schema(description = "问题图片", example = "9184")
+    private List<String> problemImgsList;
+
+    @Schema(description = "处理完成照片", example = "9184")
+    private List<String> completeImgsList;
 }
 package com.zteits.urbanops.module.workorder.dal.dataobject.garden;
  
 import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
  
 /**
  * @author yanhuiqing
@@ -8,5 +12,12 @@ import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoDO;
  * @description: TODO
  * @date 2025/12/1 11:34
  */
+@Data
 public class BpmGardenWorkOrderDO extends MainInfoDO {
+
+    @Schema(description = "问题图片", example = "9184")
+    private List<String> problemImgsList;
+
+    @Schema(description = "处理完成照片", example = "9184")
+    private List<String> completeImgsList;
 }
@@ -31,6 +31,8 @@ import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Arrays;
+import java.util.stream.Collectors;
  
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zteits.urbanops.module.workorder.enums.ErrorCodeConstants.MAIN_INFO_NOT_EXISTS;
@@ -175,43 +177,49 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         if(ObjectUtils.isNotAllEmpty(imgList)){
             AttachmentDO saveDO = new AttachmentDO();
             saveDO.setBusiLine(workOrder.getBusiLine());
-            saveDO.setBusiType(BpmCommonConstant.GARDEN_INSPECT_WO_ATTACH1);
+            saveDO.setBusiType(BpmCommonConstant.PROBLEM_IMG_GROUP);
             saveDO.setOrderNo(workOrder.getOrderNo());
             String filePaths = String.join(",",imgList);
             saveDO.setFileNames(filePaths);
             LambdaQueryWrapper<AttachmentDO> deleteWrapper = new LambdaQueryWrapper<AttachmentDO>()
                     .eq(AttachmentDO::getBusiLine, workOrder.getBusiLine())
-                    .eq(AttachmentDO::getBusiType, BpmCommonConstant.GARDEN_INSPECT_WO_ATTACH1)
+                    .eq(AttachmentDO::getBusiType, BpmCommonConstant.PROBLEM_IMG_GROUP)
                     .eq(AttachmentDO::getOrderNo, workOrder.getOrderNo());
             attachmentMapper.delete(deleteWrapper);
             attachmentMapper.insert(saveDO);
         }
-        //街道图片
-        if(ObjectUtils.isNotAllEmpty(streetImgList)){
-            AttachmentDO saveDO = new AttachmentDO();
-            saveDO.setBusiLine(workOrder.getBusiLine());
-            saveDO.setBusiType(BpmCommonConstant.GARDEN_INSPECT_WO_ATTACH2);
-            saveDO.setOrderNo(workOrder.getOrderNo());
-            String filePaths = String.join(",",streetImgList);
-            saveDO.setFileNames(filePaths);
-            LambdaQueryWrapper<AttachmentDO> deleteWrapper = new LambdaQueryWrapper<AttachmentDO>()
-                    .eq(AttachmentDO::getBusiLine, workOrder.getBusiLine())
-                    .eq(AttachmentDO::getBusiType, BpmCommonConstant.GARDEN_INSPECT_WO_ATTACH2)
-                    .eq(AttachmentDO::getOrderNo, workOrder.getOrderNo());
-            attachmentMapper.delete(deleteWrapper);
-            attachmentMapper.insert(saveDO);
+//        //街道图片
+//        if(ObjectUtils.isNotAllEmpty(streetImgList)){
+//            AttachmentDO saveDO = new AttachmentDO();
+//            saveDO.setBusiLine(workOrder.getBusiLine());
+//            saveDO.setBusiType(BpmCommonConstant.GARDEN_INSPECT_WO_ATTACH2);
+//            saveDO.setOrderNo(workOrder.getOrderNo());
+//            String filePaths = String.join(",",streetImgList);
+//            saveDO.setFileNames(filePaths);
+//            LambdaQueryWrapper<AttachmentDO> deleteWrapper = new LambdaQueryWrapper<AttachmentDO>()
+//                    .eq(AttachmentDO::getBusiLine, workOrder.getBusiLine())
+//                    .eq(AttachmentDO::getBusiType, BpmCommonConstant.GARDEN_INSPECT_WO_ATTACH2)
+//                    .eq(AttachmentDO::getOrderNo, workOrder.getOrderNo());
+//            attachmentMapper.delete(deleteWrapper);
+//            attachmentMapper.insert(saveDO);
+//        }
+        List<String> resultImgs = new java.util.ArrayList<>();
+        if (ObjectUtils.isNotAllEmpty(streetImgList)) {
+            resultImgs.addAll(streetImgList);
+        }
+        if (ObjectUtils.isNotAllEmpty(longRangeImgList)) {
+            resultImgs.addAll(longRangeImgList);
         }
-        //远景图片
-        if(ObjectUtils.isNotAllEmpty(longRangeImgList)){
+        if(ObjectUtils.isNotAllEmpty(resultImgs)){
             AttachmentDO saveDO = new AttachmentDO();
             saveDO.setBusiLine(workOrder.getBusiLine());
-            saveDO.setBusiType(BpmCommonConstant.GARDEN_INSPECT_WO_ATTACH3);
+            saveDO.setBusiType(BpmCommonConstant.RESULT_IMG_GROUP);
             saveDO.setOrderNo(workOrder.getOrderNo());
-            String filePaths = String.join(",",longRangeImgList);
+            String filePaths = String.join(",",resultImgs);
             saveDO.setFileNames(filePaths);
             LambdaQueryWrapper<AttachmentDO> deleteWrapper = new LambdaQueryWrapper<AttachmentDO>()
                     .eq(AttachmentDO::getBusiLine, workOrder.getBusiLine())
-                    .eq(AttachmentDO::getBusiType, BpmCommonConstant.GARDEN_INSPECT_WO_ATTACH3)
+                    .eq(AttachmentDO::getBusiType, BpmCommonConstant.RESULT_IMG_GROUP)
                     .eq(AttachmentDO::getOrderNo, workOrder.getOrderNo());
             attachmentMapper.delete(deleteWrapper);
             attachmentMapper.insert(saveDO);
@@ -220,6 +228,24 @@ public class BpmGardenServiceImpl implements BpmGardenService{
  
     }
  
+    private List<String> attachmentGet(String busiLine, String busiType, String orderNo) {
+        LambdaQueryWrapper<AttachmentDO> queryWrapper = new LambdaQueryWrapper<AttachmentDO>()
+                .eq(AttachmentDO::getBusiLine, busiLine)
+                .eq(AttachmentDO::getBusiType, busiType)
+                .eq(AttachmentDO::getOrderNo, orderNo);
+        List<AttachmentDO> attachments = attachmentMapper.selectList(queryWrapper);
+        if (attachments == null || attachments.isEmpty()) {
+            return List.of();
+        }
+        return attachments.stream()
+                .map(AttachmentDO::getFileNames)
+                .filter(s -> s != null && !s.isEmpty())
+                .flatMap(s -> Arrays.stream(s.split(",")).map(String::trim))
+                .filter(s -> !s.isEmpty())
+                .distinct()
+                .collect(Collectors.toList());
+    }
+
  
     @Override
     public void updateWorkOrderStatus(Long id, Integer status) {
@@ -236,7 +262,8 @@ public class BpmGardenServiceImpl implements BpmGardenService{
     public BpmGardenWorkOrderDO getWorkOrder(Long id) {
         MainInfoDO workOrder = workOrderMapper.selectById(id);
         BpmGardenWorkOrderDO targetVo = BeanUtils.toBean(workOrder, BpmGardenWorkOrderDO.class);
-        //TODO 定义页面展示字段在此扩展
+        targetVo.setProblemImgsList(attachmentGet(workOrder.getBusiLine(), BpmCommonConstant.PROBLEM_IMG_GROUP, workOrder.getOrderNo()));
+        targetVo.setCompleteImgsList(attachmentGet(workOrder.getBusiLine(), BpmCommonConstant.RESULT_IMG_GROUP, workOrder.getOrderNo()));
         return targetVo;
     }
  
@@ -67,7 +67,7 @@ flowable:
 mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+   # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
   global-config:
     db-config:
       id-type: NONE # “智能”模式，基于 IdTypeEnvironmentPostProcessor + 数据源的类型，自动适配成 AUTO、INPUT 模式。