fix: 添加处置时间

shuili-system/src/main/java/com/kms/yxgh/df/domain/DfRecordItem.java

@@ -10,6 +10,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Date;
 import java.util.List;
 
 
@@ -67,6 +68,9 @@ public class DfRecordItem extends SyBaseEntity {
     @ApiModelProperty("处置内容")
     private String handleContent;
 
+    @ApiModelProperty("处置时间")
+    private Date handleTime;
+
 
     @Data
     @AllArgsConstructor

shuili-system/src/main/java/com/kms/yxgh/df/dto/DfRecordDetailDto.java

@@ -99,6 +99,12 @@ public class DfRecordDetailDto {
     @ApiModelProperty("巡查范围")
     private String scope;
 
+    @ApiModelProperty("创建者")
+    private String createUid;
+
+    @ApiModelProperty("创建者名称")
+    private String createName;
+
 
     @ApiModelProperty("巡查项")
     private List<DfRecordItemDto> items = Collections.emptyList();
@@ -128,6 +134,10 @@ public class DfRecordDetailDto {
         @ApiModelProperty("处置内容")
         private String handleContent;
 
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+        @ApiModelProperty("处置时间")
+        private Date handleTime;
+
         @ApiModelProperty("处置图片")
         private List<String> handleImages = Collections.emptyList();
     }

shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java

@@ -201,31 +201,18 @@ public class DfPlanService extends BaseService<DfPlanMapper, DfPlan> {
     }
 
     private DfCheckingPlanContent toEntity(DfCheckingPlanContentDto dto) {
-        DfCheckingPlanContent entity = new DfCheckingPlanContent();
-        entity.setId(dto.getId());
-        entity.setPlanId(dto.getPlanId());
-        entity.setLineId(dto.getLineId());
-        entity.setName(dto.getName());
-        entity.setStartDate(dto.getStartDate());
-        entity.setEndDate(dto.getEndDate());
-        entity.setScope(dto.getScope());
-        entity.setOperator(JSON.toJSONString(dto.getOperator()));
-        entity.setStatus(dto.getStatus());
+        DfCheckingPlanContent entity = BeanCopyUtils.copy(dto, DfCheckingPlanContent.class);
+        if (entity != null) {
+            entity.setOperator(JSON.toJSONString(dto.getOperator()));
+        }
         return entity;
     }
 
     private DfCheckingPlanContentDto toDto(DfCheckingPlanContent entity) {
-        DfCheckingPlanContentDto dto = new DfCheckingPlanContentDto();
-        dto.setId(entity.getId());
-        dto.setPlanId(entity.getPlanId());
-        dto.setLineId(entity.getLineId());
-        dto.setName(entity.getName());
-        dto.setStartDate(entity.getStartDate());
-        dto.setEndDate(entity.getEndDate());
-        dto.setScope(entity.getScope());
-        dto.setRemark(entity.getRemark());
-        dto.setOperator(JSON.parseArray(entity.getOperator(), OperatorDto.class));
-        dto.setStatus(entity.getStatus());
+        DfCheckingPlanContentDto dto = BeanCopyUtils.copy(entity, DfCheckingPlanContentDto.class);
+        if (dto != null) {
+            dto.setOperator(JSON.parseArray(entity.getOperator(), OperatorDto.class));
+        }
         return dto;
     }
 

shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java

@@ -136,6 +136,7 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
             if (CollectionUtil.isNotEmpty(items) && dto != null) {
                 DfCheckingLine line = checkingLineMapper.selectById(record.getLineId());
                 dto.setEntries(Optional.ofNullable(line).map(DfCheckingLine::getPoints).orElse(""));
+                dto.setCreateName(userService.userName(dto.getCreateUid()));
                 dto.setItems(StreamUtils.toList(items, r -> {
                     DfRecordItemDto itemDto = BeanCopyUtils.copy(r, DfRecordItemDto.class);
                     if (itemDto != null) {

sql/sy/v1.3.0/全量脚本/v1.3.0-all.sql

@@ -113,6 +113,7 @@ CREATE TABLE `bs_sgc_df_xsjhjlz` (
   `DOC` text COLLATE utf8mb4_general_ci COMMENT '文档',
   `HANDLE_IMAGES` text COLLATE utf8mb4_general_ci COMMENT '处置图片',
   `HANDLE_CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '处置描述',
+  `HANDLE_TIME` datetime DEFAULT NULL COMMENT '处置时间',
   `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
   `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间',
   `UPDATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '最近修改人',

sql/sy/v1.3.0/增量脚本/v1.3.0-update.sql

@@ -40,6 +40,7 @@ ALTER TABLE `bs_sgc_df_xsjhjl` ADD `SCOPE` varchar(50) COLLATE utf8mb4_general_c
 ALTER TABLE `bs_sgc_df_xsjhjl` ADD `DIKE_NAME` varchar(50) COLLATE utf8mb4_general_ci COMMENT '堤防名称';
 ALTER TABLE `bs_sgc_df_xsjhjl` ADD `DIKE_TYPE` int  COMMENT '堤防类型';
 
+ALTER TABLE `bs_sgc_df_xsjhjlz` ADD  `HANDLE_TIME` datetime DEFAULT NULL COMMENT '处置时间';
 ALTER TABLE `bs_sgc_df_xsjhjlz` ADD  `HANDLE_IMAGES` text COLLATE utf8mb4_general_ci COMMENT '处置图片';
 ALTER TABLE `bs_sgc_df_xsjhjlz` ADD  `HANDLE_CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '处置描述';