ljf
/
shuili
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix: 维修养护记录dikecode失效问题

master_tdsql
hxh 1 year ago
parent
89a09fc7ca
commit
2195e93055
4 changed files with 42 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordSearchDto.java
  2. 3
      shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java
  3. 29
      sql/sy/v1.2.0/全量脚本/v1.2.0-all.sql
  4. 32
      sql/sy/v1.2.0/增量脚本/v1.2.0-update.sql

2
shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordSearchDto.java
View File

@ -19,6 +19,8 @@ import java.util.Date;
@ApiModel("堤防养护记录查询")
public class DfYhRecordSearchDto {
@ApiModelProperty("堤防编号")
private String dikeCode;
@ApiModelProperty("创建起始时间")
private Date startCreatedTime;
@ApiModelProperty("创建结束时间")

3
shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java
View File

@ -27,6 +27,9 @@ public interface DfYhRecordMapper extends BaseMapper<DfYhRecord> {
"FROM bs_sgc_df_yhjl yhjl " +
"LEFT JOIN bs_sgc_df_gcda df ON yhjl.dike_code = df.dike_code " +
"WHERE 1=1 " +
"<if test='searchDto.dikeCode != null '>" +
"AND yhjl.dike_code = #{searchDto.dikeCode} " +
"</if>" +
"<if test='searchDto.startCreatedTime != null'>" +
"AND yhjl.create_time &gt;= #{searchDto.startCreatedTime} " +
"</if>" +

29
sql/sy/v1.2.0/全量脚本/v1.2.0-all.sql
View File

@ -147,6 +147,7 @@ CREATE TABLE `bs_sgc_df_yhjh` (
CREATE TABLE `bs_sgc_df_yhjl` (
`ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防维修养护记录编号',
`DIKE_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码',
`PLAN_ID` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '计划代码',
`NAME` varchar(100) COLLATE utf8mb4_general_ci COMMENT '名称',
`BEFORE` varchar(100) COLLATE utf8mb4_general_ci COMMENT '维护前',
@ -156,6 +157,7 @@ CREATE TABLE `bs_sgc_df_yhjl` (
`IMPLEMENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '落实情况',
`REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注',
`STATUS` int NOT NULL COMMENT '状态',
`DOC` text COLLATE utf8mb4_general_ci NOT 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 '最近修改人',
@ -276,6 +278,7 @@ CREATE TABLE `bs_sgc_df_syq` (
`WEATHER_CONDITION` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '天气情况',
`WATER_LEVEL` float CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '水位高度',
`RAIN_FALL` float CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '雨量监测',
`DOC` text COLLATE utf8mb4_general_ci NOT 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 '最近修改人',
@ -430,6 +433,7 @@ CREATE TABLE `bs_sgc_sz_yhjh` (
CREATE TABLE `bs_sgc_sz_yhjl` (
`ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸维修养护记录编号',
`WAGA_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '水闸代码',
`PLAN_ID` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '计划代码',
`NAME` varchar(100) COLLATE utf8mb4_general_ci COMMENT '名称',
`BEFORE` varchar(100) COLLATE utf8mb4_general_ci COMMENT '维护前',
@ -439,6 +443,7 @@ CREATE TABLE `bs_sgc_sz_yhjl` (
`IMPLEMENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '落实情况',
`REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注',
`STATUS` int NOT NULL COMMENT '状态',
`DOC` text COLLATE utf8mb4_general_ci NOT 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 '最近修改人',
@ -459,23 +464,23 @@ CREATE TABLE `bs_sgc_sz_yhjlzx` (
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸维修养护执行人表';
CREATE TABLE `bs_sgc_df_syq` (
`ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防水雨情监测编号',
`DIKE_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '堤防名称',
`ADCD_START` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '起点行政区划',
`DIKE_CODE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '堤防编码',
`ADCD_END` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '终点行政区划',
`DIKE_TYPE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '堤防类型',
`DIKE_PATT` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '堤防型式',
`ENG_TASK` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '工程任务',
CREATE TABLE `bs_sgc_sz_syq` (
`ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸水雨情监测编号',
`WAGA_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '堤防名称',
`ADCD` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '行政区划',
`WAGA_CODE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '堤防编码',
`REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注',
`STATUS` int NOT NULL COMMENT '状态',
`DOOR_STATUS` int NOT NULL COMMENT '闸门状态',
`WEATHER_CONDITION` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '天气情况',
`WATER_LEVEL` float CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '水位高度',
`RAIN_FALL` float CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '雨量监测',
`RAIN_FALL` float CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '降雨量',
`GATE_FLOW` float CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '过闸流量'
`DOC` text COLLATE utf8mb4_general_ci NOT 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 '最近修改人',
`UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间',
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防水雨情检测表';
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸水雨情检测表';

32
sql/sy/v1.2.0/增量脚本/v1.2.0-update.sql
View File

@ -6,6 +6,16 @@ ALTER TABLE `bs_sgc_df_hdjl` ADD `DIKE_CODE` varchar(18) COLLATE utf8mb4_genera
ALTER TABLE `bs_sgc_df_xsjhjlz` ADD `DOC` text COLLATE utf8mb4_general_ci NOT NULL COMMENT '文档';
ALTER TABLE `bs_sgc_sz_xsjhjlz` ADD `DOC` text COLLATE utf8mb4_general_ci NOT NULL COMMENT '文档';
ALTER TABLE `bs_sgc_df_yhjl` ADD `DIKE_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码';
ALTER TABLE `bs_sgc_df_yhjl` ADD `DOC` text COLLATE utf8mb4_general_ci NOT NULL COMMENT '文档';
ALTER TABLE `bs_sgc_sz_yhjl` ADD `WAGA_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '水闸代码';
ALTER TABLE `bs_sgc_sz_yhjl` ADD `DOC` text COLLATE utf8mb4_general_ci NOT NULL COMMENT '文档';
ALTER TABLE `bs_sgc_sz_xsjhjl` ADD `WAGA_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '水闸代码';
ALTER TABLE `bs_sgc_sz_xsjh` ADD `WAGA_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '水闸代码';
CREATE TABLE `bs_sgc_df_xspj` (
`ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防巡视检查与堤防绑定编号',
`XC_ID` int NOT NULL COMMENT '巡查ID',
@ -18,10 +28,6 @@ CREATE TABLE `bs_sgc_df_xspj` (
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防巡视检查与堤防绑定编号';
ALTER TABLE `bs_sgc_sz_xsjhjl` ADD `WAGA_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '水闸代码';
ALTER TABLE `bs_sgc_sz_xsjh` ADD `WAGA_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '水闸代码';
CREATE TABLE `bs_sgc_sz_xspj` (
`ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸巡视检查与水闸绑定编号',
`XC_ID` int NOT NULL COMMENT '巡查ID',
@ -47,6 +53,7 @@ CREATE TABLE `bs_sgc_df_syq` (
`WEATHER_CONDITION` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '天气情况',
`WATER_LEVEL` float CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '水位高度',
`RAIN_FALL` float CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '雨量监测',
`DOC` text COLLATE utf8mb4_general_ci NOT 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 '最近修改人',
@ -56,16 +63,17 @@ CREATE TABLE `bs_sgc_df_syq` (
CREATE TABLE `bs_sgc_sz_syq` (
`ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸水雨情监测编号',
`DIKE_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '堤防名称',
`ADCD_START` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '起点行政区划',
`DIKE_CODE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '堤防编码',
`ADCD_END` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '终点行政区划',
`DIKE_TYPE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '堤防类型',
`DIKE_PATT` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '堤防型式',
`ENG_TASK` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '工程任务',
`WAGA_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '堤防名称',
`ADCD` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '行政区划',
`WAGA_CODE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '堤防编码',
`REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注',
`STATUS` int NOT NULL COMMENT '状态',
`DOOR_STATUS` int NOT NULL COMMENT '闸门状态',
`WEATHER_CONDITION` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '天气情况',
`WATER_LEVEL` float CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '水位高度',
`RAIN_FALL` float CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '雨量监测',
`RAIN_FALL` float CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '降雨量',
`GATE_FLOW` float CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '过闸流量'
`DOC` text COLLATE utf8mb4_general_ci NOT 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 '最近修改人',

Write Preview
Loading…
Cancel
Save