feat: 添加维修养护记录字段

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

@@ -1,15 +1,12 @@
 package com.kms.yxgh.df.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kms.yxgh.base.SyBaseEntity;
 import com.kms.yxgh.common.service.IApprovalStats;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 @TableName("bs_sgc_df_yhjl")
 @Data
 @ApiModel("堤防维修养护记录")
@@ -32,9 +29,6 @@ public class DfYhRecord extends SyBaseEntity implements IApprovalStats {
     @ApiModelProperty("计划名称")
     private String planName;
 
-    @ApiModelProperty("名称")
-    private String name;
-
     @ApiModelProperty("资金")
     private String supplement;
 
@@ -49,25 +43,4 @@ public class DfYhRecord extends SyBaseEntity implements IApprovalStats {
 
     @ApiModelProperty("状态")
     private String status;
-
-    @ApiModelProperty("维修养护类型")
-    private String type;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty("计划开始时间")
-    private Date startDate;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty("计划结束时间")
-    private Date endDate;
-
-    @ApiModelProperty("工程单位")
-    private String engineeringUnit;
-
-    @ApiModelProperty("负责人")
-    private String responsiblePerson;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty("提醒时间")
-    private Date reminderTime;
 }

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

@@ -2,6 +2,7 @@ package com.kms.yxgh.df.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kms.yxgh.common.dto.DocDto;
+import com.kms.yxgh.common.dto.OperatorDto;
 import com.kms.yxgh.common.dto.SupplementDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -61,7 +62,7 @@ public class DfYhPlanDetailDto {
     private String engineeringUnit;
 
     @ApiModelProperty("负责人")
-    private String responsiblePerson;
+    private OperatorDto responsiblePerson;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("提醒时间")
@@ -74,6 +75,4 @@ public class DfYhPlanDetailDto {
     private String status;
 
 
-
-
 }

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

@@ -40,9 +40,6 @@ public class DfYhRecordDetailDto {
     @ApiModelProperty("计划名称")
     private String planName;
 
-    @ApiModelProperty("名称")
-    private String name;
-
     @ApiModelProperty("资金")
     private List<SupplementDto> supplements;
 
@@ -52,27 +49,6 @@ public class DfYhRecordDetailDto {
     @ApiModelProperty("状态")
     private String status;
 
-    @ApiModelProperty("维修养护类型")
-    private String type;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty("计划开始时间")
-    private Date startDate;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty("计划结束时间")
-    private Date endDate;
-
-    @ApiModelProperty("工程单位")
-    private String engineeringUnit;
-
-    @ApiModelProperty("负责人")
-    private String responsiblePerson;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty("提醒时间")
-    private Date reminderTime;
-
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("创建时间")
     private Date createTime;

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

@@ -44,6 +44,7 @@ public class DfYhPlanService extends BaseService<DfYhPlanMapper, DfYhPlan> imple
         if (dto != null) {
             dto.setDoc(JSON.parseObject(dfPlan.getDoc(), DocDto.class));
             dto.setSupplements(JSON.parseArray(dfPlan.getSupplement(), SupplementDto.class));
+            dto.setResponsiblePerson(JSON.parseObject(dfPlan.getResponsiblePerson(), OperatorDto.class));
         }
         return dto;
     }
@@ -56,6 +57,7 @@ public class DfYhPlanService extends BaseService<DfYhPlanMapper, DfYhPlan> imple
             dfPlan.setId(null);
             dfPlan.setDoc(JSON.toJSONString(dto.getDoc()));
             dfPlan.setSupplement(JSON.toJSONString(dto.getSupplements()));
+            dfPlan.setResponsiblePerson(JSON.toJSONString(dto.getResponsiblePerson()));
             dfPlan.setStatus(ApprovalStatusEnum.SUBMITTING.getValue());
             if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) {
                 getBaseMapper().insert(dfPlan);
@@ -78,6 +80,7 @@ public class DfYhPlanService extends BaseService<DfYhPlanMapper, DfYhPlan> imple
                 if (dfPlan != null) {
                     dfPlan.setDoc(JSON.toJSONString(dto.getDoc()));
                     dfPlan.setSupplement(JSON.toJSONString(dto.getSupplements()));
+                    dfPlan.setResponsiblePerson(JSON.toJSONString(dto.getResponsiblePerson()));
                     dfPlan.setStatus(oldPlan.getStatus());
                     if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) {
                         getBaseMapper().updateById(dfPlan);

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

@@ -236,7 +236,6 @@ CREATE TABLE `bs_sgc_df_yhjl` (
   `LEDGER_DOC` text COLLATE utf8mb4_general_ci COMMENT '维养台账',
   `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注',
   `STATUS` int NOT NULL COMMENT '状态',
-  `DOC` text COLLATE utf8mb4_general_ci 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 '最近修改人',