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

wangqian
2 parents 7694ac51 1f17e37c
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
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanCommitSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AppGardenWorkOrderConvert.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/BuzStatusUpdateAspect.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/common/AppUniversalApprovalReqVO.java
 package com.zteits.urbanops.module.workorder.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -82,10 +83,10 @@ public class AppGardenWorkOrderReqVO {
     @Schema(description = "三方工单ID")
     private String thirdWorkNo;
-    @Schema(description = "希望完成时间")
+    @Schema(description = "希望完成时间", example = "1766505427000") // Swagger文档示例
     private LocalDateTime expectedFinishDate;
-    @Schema(description = "完成时间")
+    @Schema(description = "完成时间", example = "1766505427000")
     private LocalDateTime finishDate;
     @NotNull
@@ -5,6 +5,7 @@ import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
+import java.time.LocalDateTime;
 import java.util.List;
 @Schema(description = "APP管理 - 巡检计划提交明细新增/修改 Request VO")
@@ -41,4 +42,7 @@ public class AppInspectionPlanCommitSaveReqVO {
     @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
     private String remark;
+    @Schema(description = "希望完成时间")
+    private LocalDateTime expectedFinishDate;
+
 }
 \ No newline at end of file
@@ -33,6 +33,7 @@ public interface AppGardenWorkOrderConvert {
         orderReqVO.setLat(new BigDecimal(roadDO.getStartingLatitude()));
         orderReqVO.setLon(new BigDecimal(roadDO.getStartingLongitude()));
         orderReqVO.setLonLatAddress(roadDO.getStartingRemark());
+        orderReqVO.setExpectedFinishDate(createReqVO.getExpectedFinishDate());
         return orderReqVO;
     }
 }
@@ -111,7 +111,7 @@ public class BuzStatusUpdateAspect {
             targeVO.setUserId(SecurityFrameworkUtils.getLoginUserId());
             targeVO.setUserName(SecurityFrameworkUtils.getLoginUserNickname());
             targeVO.setFinishDate(reqVO.getFinishDate());
-            List<String> problemsImgs = reqVO.getImgs();
+            List<String> problemsImgs = reqVO.getProblemsImgs();
             if(ObjectUtils.isNotAllEmpty(problemsImgs) && problemsImgs.size()>0){
                 gardenService.attachmentInsertOrUpdate(problemsImgs,BpmCommonConstant.PROBLEM_IMG_GROUP,targeVO);
             }
@@ -95,9 +95,6 @@ public class AppUniversalApprovalReqVO {
     @Schema(description = "道路名称", example = "测试道路")
     private String roadName;
-    @Schema(description = "开始的问题拍照图片")
-    private List<String> imgs;
-
     @Schema(description = "工单描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对")
     @NotEmpty(message = "工单描述不能为空", groups = RelaunchGroup.class)
     @Length(max = 500)