From 04a3dd7e2cc39c4c1565a8d032bf5b62d1961e67 Mon Sep 17 00:00:00 2001 From: hxh <762326930@qq.com> Date: Wed, 17 Jan 2024 09:31:21 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B7=A1=E6=9F=A5=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A1=E6=9F=A5=E4=BE=9D=E6=8D=AE=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yxgh/df/domain/DfPlan.java | 3 + .../com/kms/yxgh/df/dto/DfPlanDetailDto.java | 66 ++++++++++--------- .../kms/yxgh/df/service/DfPlanService.java | 3 + sql/sy/v1.1.0/全量脚本/v1.1.0-all.sql | 1 + sql/sy/v1.1.0/增量脚本/v1.1.0-update.sql | 1 + 5 files changed, 43 insertions(+), 31 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlan.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlan.java index 9479c34c..f7dc793d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlan.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPlan.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.kms.yxgh.base.SyBaseEntity; import com.shuili.common.annotation.Excel; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -80,4 +81,6 @@ public class DfPlan extends SyBaseEntity { @ApiModelProperty("附加配置") private String otherConfig; + private String files; + } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanDetailDto.java index 297f9845..5f821685 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanDetailDto.java @@ -4,9 +4,10 @@ import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + import java.util.Date; import java.util.List; -import lombok.Data; /** @@ -19,49 +20,52 @@ import lombok.Data; @ApiModel("堤防巡视检查计划详情") public class DfPlanDetailDto { - @ApiModelProperty("主键") - private String id; + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("名称") + private String name; - @ApiModelProperty("名称") - private String name; + @ApiModelProperty("巡查ID") + private String xcId; - @ApiModelProperty("巡查ID") - private String xcId; + @ApiModelProperty("巡查类型") + private Long type; - @ApiModelProperty("巡查类型") - private Long type; + @ApiModelProperty("检查次数") + private Long frequency; - @ApiModelProperty("检查次数") - private Long frequency; + @ApiModelProperty("周期") + private Long cycleType; - @ApiModelProperty("周期") - private Long cycleType; + @ApiModelProperty("是否提醒") + private Boolean isReminder; - @ApiModelProperty("是否提醒") - private Boolean isReminder; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("提醒时间") + private Date reminderTime; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("提醒时间") - private Date reminderTime; + @ApiModelProperty("附加配置") + private JSONObject otherConfig; - @ApiModelProperty("附加配置") - private JSONObject otherConfig; + @ApiModelProperty("执行人") + private List operators; - @ApiModelProperty("执行人") - private List operators; + @ApiModelProperty("检查依据文档") + private List files; - @Data - public static class OperatorDto { + @Data + public static class OperatorDto { - @ApiModelProperty("主键") - private String id; + @ApiModelProperty("主键") + private String id; - @ApiModelProperty("用户id") - private String uid; - @ApiModelProperty("用户名称") - private String name; + @ApiModelProperty("用户id") + private String uid; + @ApiModelProperty("用户名称") + private String name; - } + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java index 5c9322fb..d18a3456 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java @@ -43,6 +43,7 @@ public class DfPlanService extends BaseService { DfPlanDetailDto dto = BeanCopyUtils.copy(dfPlan, DfPlanDetailDto.class); if (dto != null) { dto.setOtherConfig(JSON.parseObject(dfPlan.getOtherConfig())); + dto.setFiles(JSON.parseArray(dfPlan.getFiles(), String.class)); Wrapper wp = Wrappers.lambdaQuery() .select(DfPlanOperator::getId, DfPlanOperator::getOperatorUid, DfPlanOperator::getOperatorName) @@ -66,6 +67,7 @@ public class DfPlanService extends BaseService { dfPlan.setId(null); if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) { dfPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig())); + dfPlan.setFiles(JSON.toJSONString(dto.getFiles())); getBaseMapper().insert(dfPlan); String id = dfPlan.getId(); if (CollectionUtil.isNotEmpty(dto.getOperators())) { @@ -97,6 +99,7 @@ public class DfPlanService extends BaseService { if (dfPlan != null) { if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) { dfPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig())); + dfPlan.setFiles(JSON.toJSONString(dto.getFiles())); getBaseMapper().updateById(dfPlan); String id = dfPlan.getId(); deleteItems(id); diff --git a/sql/sy/v1.1.0/全量脚本/v1.1.0-all.sql b/sql/sy/v1.1.0/全量脚本/v1.1.0-all.sql index 5857318b..c7c28e61 100644 --- a/sql/sy/v1.1.0/全量脚本/v1.1.0-all.sql +++ b/sql/sy/v1.1.0/全量脚本/v1.1.0-all.sql @@ -35,6 +35,7 @@ CREATE TABLE `bs_sgc_df_xsjh` ( `IS_REMINDER` int COLLATE utf8mb4_general_ci COMMENT '是否提醒', `REMINDER_TIME` datetime DEFAULT NULL COMMENT '提醒时间', `OTHER_CONFIG` text COLLATE utf8mb4_general_ci COMMENT '附加配置', + `FILES` text COLLATE utf8mb4_general_ci COMMENT '巡查依据附件文档', `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注', `CREATE_UID` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间', diff --git a/sql/sy/v1.1.0/增量脚本/v1.1.0-update.sql b/sql/sy/v1.1.0/增量脚本/v1.1.0-update.sql index 61e87725..18b1d1fa 100644 --- a/sql/sy/v1.1.0/增量脚本/v1.1.0-update.sql +++ b/sql/sy/v1.1.0/增量脚本/v1.1.0-update.sql @@ -1,6 +1,7 @@ SET NAMES utf8mb4; ALTER TABLE `bs_sgc_df_xsjh` ADD `IS_REMINDER` INT DEFAULT 0 COLLATE utf8mb4_general_ci COMMENT '是否提醒'; ALTER TABLE `bs_sgc_sz_xsjh` ADD `IS_REMINDER` INT DEFAULT 0 COLLATE utf8mb4_general_ci COMMENT '是否提醒'; +ALTER TABLE `bs_sgc_df_xsjh` ADD `FILES` text COLLATE utf8mb4_general_ci COMMENT '巡查依据附件文档'; CREATE TABLE `bs_sgc_df_hdjh` ( `ID` int NOT NULL AUTO_INCREMENT COMMENT '害堤动物防治计划编号',