From 056f8bbc6c4c40b06ceef70f839902eb46fbeea6 Mon Sep 17 00:00:00 2001 From: hxh Date: Wed, 10 Jul 2024 10:51:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=85=BB=E6=8A=A4=E8=AE=B0=E5=BD=95=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/df/domain/DfYhRecord.java | 27 ------------------- .../kms/yxgh/df/dto/DfYhPlanDetailDto.java | 5 ++-- .../kms/yxgh/df/dto/DfYhRecordDetailDto.java | 24 ----------------- .../kms/yxgh/df/service/DfYhPlanService.java | 3 +++ sql/sy/v1.4.0/全量脚本/v1.4.0-all.sql | 1 - 5 files changed, 5 insertions(+), 55 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhRecord.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhRecord.java index 967f25d6..ddc7eff0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhRecord.java +++ b/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; } \ No newline at end of file diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanDetailDto.java index 04533895..97d9a556 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanDetailDto.java +++ b/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; - - } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java index 0786d3a6..959e4627 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java +++ b/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 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; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhPlanService.java index 8a2ec2cf..00d7e922 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhPlanService.java @@ -44,6 +44,7 @@ public class DfYhPlanService extends BaseService 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 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 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); diff --git a/sql/sy/v1.4.0/全量脚本/v1.4.0-all.sql b/sql/sy/v1.4.0/全量脚本/v1.4.0-all.sql index 3edae6ff..d6358c99 100644 --- a/sql/sy/v1.4.0/全量脚本/v1.4.0-all.sql +++ b/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 '最近修改人',