BJ_FS / urbanops

Commit 6a9697c95d3f795efb343313f5bc4617d04a9605

Authored by wangqian
2 parents b96de9a4 7ba7dc66

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

Inline Side-by-side
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
  View file @6a9697c
... ... @@ -146,9 +146,6 @@ public class MainInfoRespVO {
146 146 @ExcelProperty("创建时间")
147 147 private LocalDateTime createTime;
148 148  
149   - @Schema(description = "文件名称")
150   - private List<String> fileNames;
151   -
152 149 @Schema(description = "共同处理人")
153 150 private Set<Long> coHandlers;
154 151 @Schema(description = "共同处理人名称，多个为数组")
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/convert/garden/BpmGardenWorkOrderConverter.java
  View file @6a9697c
... ... @@ -51,14 +51,14 @@ public class BpmGardenWorkOrderConverter {
51 51 source.getOrderNo(),
52 52 attachmentMapper
53 53 );
54   - List<String> completeImgsList = queryAttachment(
  54 + List<String> endImgsList = queryAttachment(
55 55 source.getBusiLine(),
56   - BpmCommonConstant.PROCESS_IMG_GROUP,
  56 + BpmCommonConstant.END_IMG_GROUP,
57 57 source.getOrderNo(),
58 58 attachmentMapper
59 59 );
60   - target.setProblemImgsList(problemImgsList);
61   - target.setCompleteImgsList(completeImgsList);
  60 + target.setProblemsImgs(problemImgsList);
  61 + target.setEndImgs(endImgsList);
62 62  
63 63 return target;
64 64 }
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/garden/BpmGardenWorkOrderDO.java
  View file @6a9697c
... ... @@ -22,9 +22,9 @@ import java.util.List;
22 22 @AllArgsConstructor
23 23 public class BpmGardenWorkOrderDO extends MainInfoDO {
24 24  
25   - @Schema(description = "问题图片", example = "9184")
26   - private List<String> problemImgsList;
  25 + @Schema(description = "开始的问题拍照图片")
  26 + private List<String> problemsImgs;
27 27  
28   - @Schema(description = "处理完成照片", example = "9184")
29   - private List<String> completeImgsList;
  28 + @Schema(description = "实施结束的拍照图片")
  29 + private List<String> endImgs;
30 30 }
... ...