BJ_FS / urbanops

Commit 4fa0fd5165d928ce082b0056a87fc2197eeaff93

Authored by wangqian
2 parents 7694ac51 1f17e37c

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

Inline Side-by-side
Showing 5 changed files with 9 additions and 6 deletions
urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderReqVO.java
  View file @4fa0fd5
1 1 package com.zteits.urbanops.module.workorder.dto;
2 2  
  3 +import com.fasterxml.jackson.annotation.JsonFormat;
3 4 import io.swagger.v3.oas.annotations.media.Schema;
4 5 import jakarta.validation.constraints.NotEmpty;
5 6 import jakarta.validation.constraints.NotNull;
... ... @@ -82,10 +83,10 @@ public class AppGardenWorkOrderReqVO {
82 83 @Schema(description = "三方工单ID")
83 84 private String thirdWorkNo;
84 85  
85   - @Schema(description = "希望完成时间")
  86 + @Schema(description = "希望完成时间", example = "1766505427000") // Swagger文档示例
86 87 private LocalDateTime expectedFinishDate;
87 88  
88   - @Schema(description = "完成时间")
  89 + @Schema(description = "完成时间", example = "1766505427000")
89 90 private LocalDateTime finishDate;
90 91  
91 92 @NotNull
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanCommitSaveReqVO.java
  View file @4fa0fd5
... ... @@ -5,6 +5,7 @@ import jakarta.validation.constraints.NotEmpty;
5 5 import jakarta.validation.constraints.NotNull;
6 6 import lombok.Data;
7 7  
  8 +import java.time.LocalDateTime;
8 9 import java.util.List;
9 10  
10 11 @Schema(description = "APP管理 - 巡检计划提交明细新增/修改 Request VO")
... ... @@ -41,4 +42,7 @@ public class AppInspectionPlanCommitSaveReqVO {
41 42 @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
42 43 private String remark;
43 44  
  45 + @Schema(description = "希望完成时间")
  46 + private LocalDateTime expectedFinishDate;
  47 +
44 48 }
45 49 \ No newline at end of file
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AppGardenWorkOrderConvert.java
  View file @4fa0fd5
... ... @@ -33,6 +33,7 @@ public interface AppGardenWorkOrderConvert {
33 33 orderReqVO.setLat(new BigDecimal(roadDO.getStartingLatitude()));
34 34 orderReqVO.setLon(new BigDecimal(roadDO.getStartingLongitude()));
35 35 orderReqVO.setLonLatAddress(roadDO.getStartingRemark());
  36 + orderReqVO.setExpectedFinishDate(createReqVO.getExpectedFinishDate());
36 37 return orderReqVO;
37 38 }
38 39 }
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/BuzStatusUpdateAspect.java
  View file @4fa0fd5
... ... @@ -111,7 +111,7 @@ public class BuzStatusUpdateAspect {
111 111 targeVO.setUserId(SecurityFrameworkUtils.getLoginUserId());
112 112 targeVO.setUserName(SecurityFrameworkUtils.getLoginUserNickname());
113 113 targeVO.setFinishDate(reqVO.getFinishDate());
114   - List<String> problemsImgs = reqVO.getImgs();
  114 + List<String> problemsImgs = reqVO.getProblemsImgs();
115 115 if(ObjectUtils.isNotAllEmpty(problemsImgs) && problemsImgs.size()>0){
116 116 gardenService.attachmentInsertOrUpdate(problemsImgs,BpmCommonConstant.PROBLEM_IMG_GROUP,targeVO);
117 117 }
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/common/AppUniversalApprovalReqVO.java
  View file @4fa0fd5
... ... @@ -95,9 +95,6 @@ public class AppUniversalApprovalReqVO {
95 95 @Schema(description = "道路名称", example = "测试道路")
96 96 private String roadName;
97 97  
98   - @Schema(description = "开始的问题拍照图片")
99   - private List<String> imgs;
100   -
101 98 @Schema(description = "工单描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对")
102 99 @NotEmpty(message = "工单描述不能为空", groups = RelaunchGroup.class)
103 100 @Length(max = 500)
... ...