From 6e8c8f74d4dc92e4d6f4bdade16fd5f708c935a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Tue, 11 Mar 2025 21:44:37 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E5=A0=A4=E9=98=B2=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/common/dto/CountDateDto.java | 10 ++ .../kms/yxgh/common/dto/CountLevelDto.java | 10 ++ .../com/kms/yxgh/common/dto/CountQxDto.java | 10 ++ .../com/kms/yxgh/common/dto/CountYhDto.java | 10 ++ .../enums/PatrolMaintenanceCategory.java | 9 +- .../yxgh/common/enums/ProjectCharEnum.java | 13 +-- .../yxgh/common/enums/StaticIndexEnum.java | 107 ++++++++++++++--- .../df/mapper/DfCheckingProblemV2Mapper.java | 47 +++++++- .../df/mapper/DfCheckingRecordV2Mapper.java | 29 +++++ .../yxgh/df/mapper/DfCheckingV2Mapper.java | 3 + .../com/kms/yxgh/df/mapper/DfYhV2Mapper.java | 20 +++- sql/sy/v1.0.0/v1.0.0.sql | 109 +++++++++++++++++ sql/zj/v5.0.0/增量更新/v1.sql | 110 +----------------- 13 files changed, 352 insertions(+), 135 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/dto/CountDateDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/dto/CountLevelDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/dto/CountQxDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/dto/CountYhDto.java diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountDateDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountDateDto.java new file mode 100644 index 00000000..3d2c46d2 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountDateDto.java @@ -0,0 +1,10 @@ +package com.kms.yxgh.common.dto; + +import lombok.Data; + +@Data +public class CountDateDto { + private String level; + private String myData; + private String mySum; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountLevelDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountLevelDto.java new file mode 100644 index 00000000..950de4c7 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountLevelDto.java @@ -0,0 +1,10 @@ +package com.kms.yxgh.common.dto; + +import lombok.Data; + +@Data +public class CountLevelDto { + + private String level; + private String sum; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountQxDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountQxDto.java new file mode 100644 index 00000000..c8ad862c --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountQxDto.java @@ -0,0 +1,10 @@ +package com.kms.yxgh.common.dto; + +import lombok.Data; + +@Data +public class CountQxDto { + + private String date; + private String sum; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountYhDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountYhDto.java new file mode 100644 index 00000000..5dbe04c4 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountYhDto.java @@ -0,0 +1,10 @@ +package com.kms.yxgh.common.dto; + +import lombok.Data; + +@Data +public class CountYhDto { + + private String date; + private String sum; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/PatrolMaintenanceCategory.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/PatrolMaintenanceCategory.java index 338b7456..a652d09d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/PatrolMaintenanceCategory.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/PatrolMaintenanceCategory.java @@ -5,7 +5,14 @@ import lombok.Getter; @Getter public enum PatrolMaintenanceCategory { PROJECT_PATROL("工程巡查", "1"), - JD_PATROL("机电巡查", "2"); + JD_PATROL("机电巡查", "2"), + + + DJ_LX("零星", "1"), + DJ_YB("一般", "2"), + DJ_JD("较大", "3"), + DJ_ZD("重大", "4") + ; private final String name; private final String value; diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java index e9afb157..516d4b73 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java @@ -13,17 +13,16 @@ import java.util.stream.Stream; @Getter public enum ProjectCharEnum { - C_14("缺陷记录分析", Arrays.asList(StaticIndexEnum.DF_YH_SUM, StaticIndexEnum.DF_QX_SUM), "数量", Collections.emptyList()), - C_15("巡查缺陷分析", Arrays.asList(StaticIndexEnum.DF_YH_SUM, StaticIndexEnum.DF_QX_SUM), "数量", Collections.emptyList()), - C_16("缺陷问题等级分析", Arrays.asList(StaticIndexEnum.DF_YH_SUM, StaticIndexEnum.DF_QX_SUM), "数量", Collections.emptyList()), - C_17("缺陷养护对比分析", Arrays.asList(StaticIndexEnum.DF_YH_SUM, StaticIndexEnum.DF_QX_SUM), "数量", Collections.emptyList()), + C_14("巡查记录分析", Arrays.asList(StaticIndexEnum.DF_JL_ONE_DATE_SUM, StaticIndexEnum.DF_JL_TWO_DATE_SUM), "数量", Collections.emptyList()), + C_15("巡查缺陷分析", Arrays.asList(StaticIndexEnum.DF_QX_ONE_DATE_SUM, StaticIndexEnum.DF_QX_TWO_DATE_SUM), "数量", Collections.emptyList()), + C_16("缺陷问题等级分析", Arrays.asList(StaticIndexEnum.DF_QX_DJ_LX_SUM, StaticIndexEnum.DF_QX_DJ_JD_SUM, StaticIndexEnum.DF_QX_DJ_ZD_SUM, StaticIndexEnum.DF_QX_DJ_YB_SUM), "数量", Collections.emptyList()), + C_17("缺陷养护对比分析", Arrays.asList(StaticIndexEnum.DF_BD_YH_SUM, StaticIndexEnum.DF_BD_QX_SUM), "数量", Collections.emptyList()), + C_18("巡查项目总数", Collections.singletonList(StaticIndexEnum.DF_XM_SUM), "数量", Collections.emptyList()), + C_1("工程分布", Collections.singletonList(StaticIndexEnum.DF_PROJECT_ADCD_SUM), "数量", Collections.emptyList()), C_2("巡查分析", Arrays.asList(StaticIndexEnum.DF_CHECKING_ADCD_SUM, StaticIndexEnum.DF_JD_ADCD_SUM), "数量", Collections.emptyList()), C_3("缺陷和养护对比", Arrays.asList(StaticIndexEnum.DF_QX_ADCD_SUM, StaticIndexEnum.DF_YH_ADCD_SUM), "数量", Collections.emptyList()), - - - ; diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java index f2ceee58..422808a0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java @@ -3,8 +3,7 @@ package com.kms.yxgh.common.enums; import cn.hutool.core.collection.CollectionUtil; import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysXzqhService; -import com.kms.yxgh.common.dto.CountDto; -import com.kms.yxgh.common.dto.ObjectStatisticQueDto; +import com.kms.yxgh.common.dto.*; import com.kms.yxgh.common.service.Statistic; import com.kms.yxgh.df.mapper.DfCheckingProblemV2Mapper; import com.kms.yxgh.df.mapper.DfCheckingRecordV2Mapper; @@ -19,21 +18,82 @@ import java.util.stream.Collectors; @Getter public enum StaticIndexEnum { - DF_YH_SUM("养护数量", sp -> { - Map map = new HashMap<>(); - map.put("2024/05/20", "12"); - map.put("2024/05/21", "15"); - map.put("2024/05/22", "17"); - return map; + DF_JL_ONE_DATE_SUM("机电巡查", sp -> { + DfCheckingRecordV2Mapper mapper = SpringUtils.getBean(DfCheckingRecordV2Mapper.class); + List list = mapper.countDateGroup(sp, PatrolMaintenanceCategory.JD_PATROL); + return dataGroup(list); + }, "个", "0"), + DF_JL_TWO_DATE_SUM("工程巡查", sp -> { + DfCheckingRecordV2Mapper mapper = SpringUtils.getBean(DfCheckingRecordV2Mapper.class); + List list = mapper.countDateGroup(sp, PatrolMaintenanceCategory.PROJECT_PATROL); + return dataGroup(list); + }, "个", "0"), + + + DF_QX_ONE_DATE_SUM("机电巡查", sp -> { + DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); + List list = mapper.countDate(sp,PatrolMaintenanceCategory.JD_PATROL); + return dataGroup(list); + }, "个", "0"), + DF_QX_TWO_DATE_SUM("工程巡查", sp -> { + DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); + List list = mapper.countDate(sp,PatrolMaintenanceCategory.PROJECT_PATROL); + return dataGroup(list); + }, "个", "0"), + + + + + DF_QX_DJ_LX_SUM("零星", sp -> { + DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); + List list = mapper.countLevel(sp,PatrolMaintenanceCategory.DJ_LX); + return levelGroup(list); + }, "个", "0"), + DF_QX_DJ_YB_SUM("一般", sp -> { + DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); + List list = mapper.countLevel(sp,PatrolMaintenanceCategory.DJ_YB); + return levelGroup(list); + }, "个", "0"), + DF_QX_DJ_JD_SUM("较大", sp -> { + DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); + List list = mapper.countLevel(sp,PatrolMaintenanceCategory.DJ_JD); + return levelGroup(list); + }, "个", "0"), + DF_QX_DJ_ZD_SUM("重大", sp -> { + DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); + List list = mapper.countLevel(sp,PatrolMaintenanceCategory.DJ_ZD); + return levelGroup(list); + }, "个", "0"), + + + + + DF_BD_YH_SUM("养护次数", sp -> { + DfYhV2Mapper mapper = SpringUtils.getBean(DfYhV2Mapper.class); + List list = mapper.countYhDto(sp); + return dataGroup(list); }, "个", "0"), - DF_QX_SUM("缺陷数量", sp -> { - Map map = new HashMap<>(); - map.put("2024/05/20", "12"); - map.put("2024/05/21", "15"); - map.put("2024/05/22", "17"); + + DF_BD_QX_SUM("缺陷次数", sp -> { + DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); + List list = mapper.countQx(sp); + return dataGroup(list); + }, "个", "0"), + + DF_XM_SUM("巡查项目数", sp -> { + DfCheckingRecordV2Mapper mapper = SpringUtils.getBean(DfCheckingRecordV2Mapper.class); + int list = mapper.countXm(sp); + Map map=new HashMap<>(); + map.put("sum",String.valueOf(list)); return map; }, "个", "0"), + + + + + + DF_QX_ADCD_SUM("缺陷数量", sp -> { DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); List list = mapper.count(sp); @@ -62,6 +122,8 @@ public enum StaticIndexEnum { ; + + private final String zhName; private final Statistic source; private final String unit; @@ -75,6 +137,25 @@ public enum StaticIndexEnum { } + + + private static Map levelGroup(List list) { + if (CollectionUtil.isEmpty(list) && list.isEmpty()) { + return Collections.emptyMap(); + } + return list.stream() + .collect(Collectors.toMap(CountDateDto::getLevel, CountDateDto::getMySum)); + } + + public static Map dataGroup(List list) { + if (CollectionUtil.isEmpty(list) && list.isEmpty()) { + return Collections.emptyMap(); + } + return list.stream() + .collect(Collectors.toMap(CountDateDto::getMyData, CountDateDto::getMySum)); + } + + public static Map adcdGroup(List list, ObjectStatisticQueDto sp) { if (CollectionUtil.isEmpty(list)) { return Collections.emptyMap(); diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingProblemV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingProblemV2Mapper.java index fa84119a..d3402f3b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingProblemV2Mapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingProblemV2Mapper.java @@ -1,8 +1,8 @@ package com.kms.yxgh.df.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yxgh.common.dto.CountDto; -import com.kms.yxgh.common.dto.ObjectStatisticQueDto; +import com.kms.yxgh.common.dto.*; +import com.kms.yxgh.common.enums.PatrolMaintenanceCategory; import com.kms.yxgh.df.domain.DfCheckingProblemV2; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -32,4 +32,47 @@ public interface DfCheckingProblemV2Mapper extends BaseMapper") List count(@Param("data") ObjectStatisticQueDto sp); + + + @Select("") + List countDate(@Param("data") ObjectStatisticQueDto sp,@Param("category") PatrolMaintenanceCategory category); + + + @Select("") + List countLevel(@Param("data") ObjectStatisticQueDto sp, @Param("category") PatrolMaintenanceCategory category); + + + @Select("") + List countQx(@Param("data") ObjectStatisticQueDto sp); + } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingRecordV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingRecordV2Mapper.java index 5aeb9531..d0d285fd 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingRecordV2Mapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingRecordV2Mapper.java @@ -1,6 +1,7 @@ package com.kms.yxgh.df.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.common.dto.CountDateDto; import com.kms.yxgh.common.dto.CountDto; import com.kms.yxgh.common.dto.ObjectStatisticQueDto; import com.kms.yxgh.common.enums.PatrolMaintenanceCategory; @@ -36,4 +37,32 @@ public interface DfCheckingRecordV2Mapper extends BaseMapper { "group by base.adcd " + "") List count(@Param("data") ObjectStatisticQueDto sp, @Param("category") PatrolMaintenanceCategory category); + + + + @Select("") + List countDateGroup(@Param("data") ObjectStatisticQueDto sp,@Param("category") PatrolMaintenanceCategory category); + + @Select("" + ) + int countXm(@Param("data") ObjectStatisticQueDto sp); + } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingV2Mapper.java index 0632c687..ec8e2f8b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingV2Mapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingV2Mapper.java @@ -32,4 +32,7 @@ public interface DfCheckingV2Mapper extends BaseMapper count(@Param("data") ObjectStatisticQueDto sp); + + + } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhV2Mapper.java index 63f7eab9..49ea076f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhV2Mapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhV2Mapper.java @@ -3,10 +3,7 @@ package com.kms.yxgh.df.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.yxgh.common.dto.ApprovalDetailDto; -import com.kms.yxgh.common.dto.ApprovalSearchDto; -import com.kms.yxgh.common.dto.CountDto; -import com.kms.yxgh.common.dto.ObjectStatisticQueDto; +import com.kms.yxgh.common.dto.*; import com.kms.yxgh.common.mapper.handler.DocHandler; import com.kms.yxgh.common.mapper.handler.OperatorHandler; import com.kms.yxgh.df.domain.DfYhV2; @@ -90,4 +87,19 @@ public interface DfYhV2Mapper extends BaseMapper { "group by base.adcd " + "") List count(@Param("data") ObjectStatisticQueDto sp); + + + @Select("") + List countYhDto(@Param("data") ObjectStatisticQueDto sp); } diff --git a/sql/sy/v1.0.0/v1.0.0.sql b/sql/sy/v1.0.0/v1.0.0.sql index a0bc459d..6d0f493d 100644 --- a/sql/sy/v1.0.0/v1.0.0.sql +++ b/sql/sy/v1.0.0/v1.0.0.sql @@ -316,3 +316,112 @@ CREATE TABLE `bs_sgc_sz_yhjlzx` ( `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', PRIMARY KEY (`ID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸维修养护执行人表'; + + +CREATE TABLE `bs_sgc_df_xmgl` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `name` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查项名称', + `dike_code` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防code', + `dike_name` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防名称', + `type` int NOT NULL DEFAULT '0' COMMENT '巡查类型 字典：patrol_maintenance_type', + `category` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查类别字典：key_jf_patrol_category', + `create_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人', + `create_name` varchar(50) NOT NULL DEFAULT '' COMMENT '责任人name', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_time` datetime DEFAULT NULL COMMENT '最近修改时间', + `update_uid` varchar(50) NOT NULL DEFAULT '0' COMMENT '修改人id', + `remark` text COMMENT '备注', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=24 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='堤防巡视项目管理表'; + +CREATE TABLE `bs_sgc_df_xcitem` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `checking_id` int NOT NULL DEFAULT '0' COMMENT '项目id', + `parts` varchar(100) NOT NULL DEFAULT '' COMMENT '检查部位', + `content` varchar(500) NOT NULL DEFAULT '' COMMENT '检查内容', + `remark` text COMMENT '备注', + `create_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '最近修改人', + `update_time` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=455 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='堤防巡视检查项表'; + + +CREATE TABLE `bs_sgc_df_xsxcjl` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `checking_id` int NOT NULL DEFAULT '0' COMMENT '巡查项目id', + `status` int NOT NULL DEFAULT '0' COMMENT '巡查状态字典:patrol_maintenance_status', + `checking_name` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查名称', + `type` int NOT NULL DEFAULT '0' COMMENT '巡查类型 字典：patrol_maintenance_type', + `category` int NOT NULL DEFAULT '0' COMMENT '巡查类别字典：patrol_maintenance_category', + `duty_holder_name` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查责任人name', + `duty_holder_id` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查责任人id', + `dike_code` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防code', + `dike_name` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防名称', + `start_date` datetime DEFAULT NULL COMMENT '巡查开始时间', + `end_date` datetime DEFAULT NULL COMMENT '巡查结束时间', + `scope` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查范围', + `create_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人id', + `create_name` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人名称', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_time` datetime DEFAULT NULL COMMENT '最近修改时间', + `update_uid` varchar(50) NOT NULL DEFAULT '0' COMMENT '修改人id', + `remark` text COMMENT '备注', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='堤防巡视记录管理表'; + +CREATE TABLE `bs_sgc_df_xcqx` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `checking_id` int NOT NULL DEFAULT '0' COMMENT '巡查项目id', + `record_id` int NOT NULL DEFAULT '0' COMMENT '记录id', + `parts` varchar(100) NOT NULL DEFAULT '' COMMENT '检查部位', + `status` int NOT NULL DEFAULT '0' COMMENT '巡查状态字典:patrol_maintenance_status', + `checking_name` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查名称', + `type` int NOT NULL DEFAULT '0' COMMENT '巡查类型 字典：patrol_maintenance_type', + `category` int NOT NULL DEFAULT '0' COMMENT '巡查类别 字典：patrol_maintenance_category', + `duty_holder_name` varchar(50) NOT NULL DEFAULT '' COMMENT '缺陷人name', + `duty_holder_id` varchar(50) NOT NULL DEFAULT '' COMMENT '缺陷人name', + `dike_code` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防code', + `dike_name` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防名称', + `start_date` datetime DEFAULT NULL COMMENT '缺陷开始时间', + `end_date` datetime DEFAULT NULL COMMENT '缺陷结束时间', + `content` varchar(200) NOT NULL DEFAULT '' COMMENT '描述', + `position` varchar(200) NOT NULL DEFAULT '' COMMENT '问题位置', + `problem_level` int NOT NULL DEFAULT '0' COMMENT '问题等级 字典 patrol_maintenance_level', + `doc` text COMMENT '文档', + `remark` text COMMENT '备注', + `create_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人', + `update_time` datetime DEFAULT NULL COMMENT '最近修改时间', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_uid` varchar(50) NOT NULL DEFAULT '0' COMMENT '修改人id', + `item_id` int DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=28 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='堤防巡视记录缺陷管理表'; + +CREATE TABLE `bs_sgc_df_xcyj` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `checking_id` int NOT NULL DEFAULT '0' COMMENT '巡查项目id', + `problem_id` int NOT NULL DEFAULT '0' COMMENT '缺陷id', + `status` int NOT NULL DEFAULT '0' COMMENT '巡查状态字典:patrol_maintenance_status', + `name` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查名称', + `type` int NOT NULL DEFAULT '0' COMMENT '巡查类型 字典：patrol_maintenance_type', + `category` int NOT NULL DEFAULT '0' COMMENT '巡查类别 字典：patrol_maintenance_category', + `dike_code` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防code', + `dike_name` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防名称', + `start_date` datetime DEFAULT NULL COMMENT '维养开始时间', + `end_date` datetime DEFAULT NULL COMMENT '维养结束时间', + `position` varchar(200) NOT NULL DEFAULT '' COMMENT '问题位置', + `content` varchar(200) NOT NULL DEFAULT '' COMMENT '描述', + `problem_level` int NOT NULL DEFAULT '0' COMMENT '问题等级 字典 patrol_maintenance_level', + `create_uid` varchar(50) NOT NULL DEFAULT '' COMMENT '数据创建人id', + `duty_holder_name` varchar(50) NOT NULL DEFAULT '' COMMENT '维养责任人名称', + `duty_holder_id` varchar(50) NOT NULL DEFAULT '' COMMENT '维养责任人id', + `doc` text COMMENT '文档', + `remark` text COMMENT '备注', + `update_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '最近修改人', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_time` datetime DEFAULT NULL COMMENT '最近修改时间', + `record_id` int DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='堤防巡视养护管理表'; diff --git a/sql/zj/v5.0.0/增量更新/v1.sql b/sql/zj/v5.0.0/增量更新/v1.sql index eaf044bc..e4234043 100644 --- a/sql/zj/v5.0.0/增量更新/v1.sql +++ b/sql/zj/v5.0.0/增量更新/v1.sql @@ -18,111 +18,5 @@ ALTER TABLE `sgc_yg`.`sys_user` ADD COLUMN `user_type` VARCHAR ( 255 ) NULL; ALTER TABLE `sgc_yg`.`att_dike_base` CHANGE COLUMN `ENG_GRAD` `dike_GRAD` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '堤防级别' AFTER `dike_USE`; - - - -CREATE TABLE `bs_sgc_df_xmgl` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', - `name` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查项名称', - `dike_code` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防code', - `dike_name` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防名称', - `type` int NOT NULL DEFAULT '0' COMMENT '巡查类型 字典：patrol_maintenance_type', - `category` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查类别字典：key_jf_patrol_category', - `create_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人', - `create_name` varchar(50) NOT NULL DEFAULT '' COMMENT '责任人name', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `update_time` datetime DEFAULT NULL COMMENT '最近修改时间', - `update_uid` varchar(50) NOT NULL DEFAULT '0'COMMENT '修改人id', - `remark` text COMMENT '备注', - PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='堤防巡视项目管理表'; - - -CREATE TABLE `bs_sgc_df_xcitem` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', - `checking_id` int NOT NULL DEFAULT '0' COMMENT '项目id', - `parts` varchar(100) NOT NULL DEFAULT '' COMMENT '检查部位', - `content` varchar(500) NOT NULL DEFAULT '' COMMENT '检查内容', - `remark` text COMMENT '备注', - `create_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `update_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '最近修改人', - `update_time` datetime DEFAULT NULL COMMENT '最近修改时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=443 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='堤防巡视检查项表'; - -CREATE TABLE `bs_sgc_df_xsxcjl` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', - `checking_id` int NOT NULL DEFAULT '0' COMMENT '巡查项目id', - `status` int NOT NULL DEFAULT '0' COMMENT '巡查状态字典:patrol_maintenance_status', - `checking_name` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查名称', - `type` int NOT NULL DEFAULT '0' COMMENT '巡查类型 字典：patrol_maintenance_type', - `category` int NOT NULL DEFAULT '0' COMMENT '巡查类别字典：patrol_maintenance_category', - `duty_holder_name` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查责任人name', - `duty_holder_id` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查责任人id', - `dike_code` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防code', - `dike_name` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防名称', - `start_date` datetime DEFAULT NULL COMMENT '巡查开始时间', - `end_date` datetime DEFAULT NULL COMMENT '巡查结束时间', - `scope` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查范围', - `create_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人id', - `create_name` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人名称', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `update_time` datetime DEFAULT NULL COMMENT '最近修改时间', - `update_uid` varchar(50) NOT NULL DEFAULT '0'COMMENT '修改人id', - `remark` text COMMENT '备注', - PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='堤防巡视记录管理表'; - -CREATE TABLE `bs_sgc_df_xcqx` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', - `checking_id` int NOT NULL DEFAULT '0' COMMENT '巡查项目id', - `record_id` int NOT NULL DEFAULT '0' COMMENT '记录id', - `status` int NOT NULL DEFAULT '0' COMMENT '巡查状态字典:patrol_maintenance_status', - `name` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查名称', - `type` int NOT NULL DEFAULT '0' COMMENT '巡查类型 字典：patrol_maintenance_type', - `category` int NOT NULL DEFAULT '0' COMMENT '巡查类别 字典：patrol_maintenance_category', - `duty_holder_name` varchar(50) NOT NULL DEFAULT '' COMMENT '缺陷人name', - `duty_holder_id` varchar(50) NOT NULL DEFAULT '' COMMENT '缺陷人name', - `dike_code` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防code', - `dike_name` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防名称', - `start_date` datetime DEFAULT NULL COMMENT '缺陷开始时间', - `end_date` datetime DEFAULT NULL COMMENT '缺陷结束时间', - `describe` varchar(200) NOT NULL DEFAULT '' COMMENT '描述', - `position` varchar(200) NOT NULL DEFAULT '' COMMENT '问题位置', - `problem_level` int NOT NULL DEFAULT '0' COMMENT '问题等级 字典 patrol_maintenance_level', - `doc` text COMMENT '文档', - `remark` text COMMENT '备注', - `create_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人', - `update_time` datetime DEFAULT NULL COMMENT '最近修改时间', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `update_uid` varchar(50) NOT NULL DEFAULT '0'COMMENT '修改人id', - PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='堤防巡视记录缺陷管理表'; - - -CREATE TABLE `bs_sgc_df_xcyj` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', - `checking_id` int NOT NULL DEFAULT '0' COMMENT '巡查项目id', - `defect_id` int NOT NULL DEFAULT '0' COMMENT '缺陷id', - `status` int NOT NULL DEFAULT '0' COMMENT '巡查状态字典:patrol_maintenance_status', - `name` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查名称', - `type` int NOT NULL DEFAULT '0' COMMENT '巡查类型 字典：patrol_maintenance_type', - `category` int NOT NULL DEFAULT '0' COMMENT '巡查类别 字典：patrol_maintenance_category', - `dike_code` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防code', - `dike_name` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防名称', - `start_date` datetime DEFAULT NULL COMMENT '维养开始时间', - `end_date` datetime DEFAULT NULL COMMENT '维养结束时间', - `location` varchar(200) NOT NULL DEFAULT '' COMMENT '问题位置', - `details` varchar(200) NOT NULL DEFAULT '' COMMENT '描述', - `problem_level` int NOT NULL DEFAULT '0' COMMENT '问题等级 字典 patrol_maintenance_level', - `create_uid` varchar(50) NOT NULL DEFAULT '' COMMENT '数据创建人id', - `duty_holder_name` varchar(50) NOT NULL DEFAULT '' COMMENT '维养责任人名称', - `duty_holder_id` varchar(50) NOT NULL DEFAULT '' COMMENT '维养责任人id', - `doc` text COMMENT '文档', - `remark` text COMMENT '备注', - `update_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '最近修改人', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `update_time` datetime DEFAULT NULL COMMENT '最近修改时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='堤防巡视养护管理表'; \ No newline at end of file +ALTER TABLE sgc_yg.bs_sgc_df_xcyj CHANGE defect_id problem_id int DEFAULT 0 NOT NULL COMMENT '缺陷id'; +ALTER TABLE sgc_yg.bs_sgc_df_xcyj ADD record_id INT NULL; \ No newline at end of file