Merge remote-tracking branch 'origin/dev' into dev

wangqian
2 parents b96de9a4 7ba7dc66
Showing 3 changed files with 8 additions and 11 deletions
urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/MainInfoRespVO.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/garden/BpmGardenWorkOrderConverter.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/garden/BpmGardenWorkOrderDO.java
@@ -146,9 +146,6 @@ public class MainInfoRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
-    @Schema(description = "文件名称")
-    private List<String> fileNames;
-
     @Schema(description = "共同处理人")
     private Set<Long> coHandlers;
     @Schema(description = "共同处理人名称，多个为数组")
@@ -51,14 +51,14 @@ public class BpmGardenWorkOrderConverter {
                 source.getOrderNo(),
                 attachmentMapper
         );
-        List<String> completeImgsList = queryAttachment(
+        List<String> endImgsList = queryAttachment(
                 source.getBusiLine(),
-                BpmCommonConstant.PROCESS_IMG_GROUP,
+                BpmCommonConstant.END_IMG_GROUP,
                 source.getOrderNo(),
                 attachmentMapper
         );
-        target.setProblemImgsList(problemImgsList);
-        target.setCompleteImgsList(completeImgsList);
+        target.setProblemsImgs(problemImgsList);
+        target.setEndImgs(endImgsList);
         return target;
     }
@@ -22,9 +22,9 @@ import java.util.List;
 @AllArgsConstructor
 public class BpmGardenWorkOrderDO extends MainInfoDO {
-    @Schema(description = "问题图片", example = "9184")
-    private List<String> problemImgsList;
+    @Schema(description = "开始的问题拍照图片")
+    private List<String> problemsImgs;
-    @Schema(description = "处理完成照片", example = "9184")
-    private List<String> completeImgsList;
+    @Schema(description = "实施结束的拍照图片")
+    private List<String> endImgs;
 }