Merge remote-tracking branch 'origin/release-sy-v1.0.0' into release-sy-v1.0.0

# Conflicts:
#	sql/sy/v1.2.0/全量脚本/v1.2.0-all.sql
#	sql/sy/v1.2.0/增量脚本/v1.2.0-update.sql

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

@@ -43,6 +43,17 @@ public class DfDangerousTaskItemRel extends SyBaseEntity {
     @ApiModelProperty("问题等级")
     private String level;
 
+    /**
+     * 问题描述
+     */
+    @ApiModelProperty(value = "问题描述")
+    private String problemDescribe;
+
+    /**
+     * 现场记录情况
+     */
+    @ApiModelProperty(value = "现场记录情况")
+    private String siteSituationRecords;
 
     @TableField(exist = false)
     private String remark;

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

@@ -1,50 +0,0 @@
-package com.kms.yxgh.df.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.kms.yxgh.base.SyBaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 堤防病险工程任务项目关联对象 bs_sgc_df_jdjcgc
- * @author hry
- * @date 2024/2/29 13:57
- */
-@TableName("bs_sgc_df_bxgcxmgl")
-@Data
-@ApiModel("堤防病险工程任务项目关联")
-public class DfDangerousTaskProjectRel extends SyBaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 任务ID
-     */
-    @ApiModelProperty(value = "任务ID")
-    private String taskId;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    private String projectId;
-
-    /**
-     * 问题描述
-     */
-    @ApiModelProperty(value = "问题描述")
-    private String problemDescribe;
-
-    /**
-     * 现场记录情况
-     */
-    @ApiModelProperty(value = "现场记录情况")
-    private String siteSituationRecords;
-
-
-    @TableField(exist = false)
-    private String remark;
-
-}

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

@@ -1,47 +0,0 @@
-package com.kms.yxgh.df.domain;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.kms.yxgh.base.SyBaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 堤防监督检查工程管理对象 bs_sgc_df_jdjcgc
- * @author hry
- * @date 2024/2/29 13:57
- */
-@TableName("bs_sgc_df_jdjcgc")
-@Data
-@ApiModel("堤防监督检查工程管理")
-public class DfSuperviseEngineering extends SyBaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 监督检查任务ID
-     */
-    @ApiModelProperty(value = "监督检查任务ID")
-    private String taskId;
-
-
-    /**
-     * 监督检查办法项目ID
-     */
-    @ApiModelProperty(value = "监督检查办法项目ID")
-    private String projectId;
-
-    /**
-     * 问题描述
-     */
-    @ApiModelProperty(value = "问题描述")
-    private String problemDescribe;
-
-    /**
-     * 现场记录情况
-     */
-    @ApiModelProperty(value = "现场记录情况")
-    private String siteSituationRecords;
-
-
-}

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

@@ -45,6 +45,18 @@ public class DfSuperviseProblem extends SyBaseEntity {
     @ApiModelProperty("问题等级")
     private String level;
 
+    /**
+     * 问题描述
+     */
+    @ApiModelProperty(value = "问题描述")
+    private String problemDescribe;
+
+    /**
+     * 现场记录情况
+     */
+    @ApiModelProperty(value = "现场记录情况")
+    private String siteSituationRecords;
+
     /**
      * 状态（下发、处理、确认、完成）
      */

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

@@ -1,45 +0,0 @@
-package com.kms.yxgh.df.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 堤防监督检查工程管理DTO对象
- * @author hry
- * @date 2024/2/29 13:57
- */
-@Data
-@ApiModel("堤防监督检查工程管理")
-public class DfSuperviseEngineeringDto {
-
-    @ApiModelProperty("主键")
-    private String id;
-
-    /**
-     * 监督检查任务ID
-     */
-    @ApiModelProperty(value = "监督检查任务ID")
-    private String taskId;
-
-
-    /**
-     * 监督检查办法项目ID
-     */
-    @ApiModelProperty(value = "监督检查办法项目ID")
-    private String projectId;
-
-    /**
-     * 问题描述
-     */
-    @ApiModelProperty(value = "问题描述")
-    private String problemDescribe;
-
-    /**
-     * 现场记录情况
-     */
-    @ApiModelProperty(value = "现场记录情况")
-    private String siteSituationRecords;
-
-
-}

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

@@ -56,11 +56,23 @@ public class DfSuperviseEngineeringParamDto {
         private String id;
 
         /**
-         * 监督检查办法项目ID
+         * 项目ID
          */
-        @ApiModelProperty("监督检查办法项目ID")
+        @ApiModelProperty("项目ID")
         private String projectId;
 
+        /**
+         * 项目内容ID
+         */
+        @ApiModelProperty("项目内容ID")
+        private String projectItemId;
+
+        /**
+         * 问题等级
+         */
+        @ApiModelProperty("等级")
+        private String level;
+
         /**
          * 问题描述
          */
@@ -72,30 +84,6 @@ public class DfSuperviseEngineeringParamDto {
          */
         @ApiModelProperty(value = "现场记录情况")
         private String siteSituationRecords;
-
-        /**
-         * 问题填报列表
-         */
-        private List<ProblemLevelParam> levelList;
     }
 
-    @Data
-    public static class ProblemLevelParam {
-
-        @ApiModelProperty("主键")
-        private String id;
-
-        /**
-         * 监督检查办法项目ID
-         */
-        @ApiModelProperty("监督检查办法项目ID")
-        private String projectItemId;
-
-        /**
-         * 问题等级
-         */
-        @ApiModelProperty("等级")
-        private String level;
-
-    }
 }

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

@@ -11,7 +11,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel("堤防监督检查问题详情")
-public class DfSuperviseProblemDetailDto extends SzSuperviseTaskCommonDto {
+public class DfSuperviseProblemDetailDto extends DfSuperviseTaskCommonDto {
 
     /**
      * 检查项目名称

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

@@ -56,6 +56,19 @@ public class DfSuperviseProblemDto {
     @ApiModelProperty("问题等级")
     private String level;
 
+
+    /**
+     * 问题描述
+     */
+    @ApiModelProperty(value = "问题描述")
+    private String problemDescribe;
+
+    /**
+     * 现场记录情况
+     */
+    @ApiModelProperty(value = "现场记录情况")
+    private String siteSituationRecords;
+
     /**
      * 状态（下发、处理、确认、完成）
      */

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

@@ -14,12 +14,6 @@ import java.util.List;
 @ApiModel("堤防监督检查任务管理")
 public class DfSuperviseTaskDetailDto extends DfSuperviseTaskCommonDto {
 
-    /**
-     * 问题描述列表
-     */
-    @ApiModelProperty(value = "问题描述列表")
-    private List<DfSuperviseEngineeringDto> engineeringList;
-
     /**
      * 问题列表
      */

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskItemRelMapper.java

@@ -26,7 +26,7 @@ public interface DfDangerousTaskItemRelMapper extends BaseMapper<DfDangerousTask
 
     @Select("<script>" +
             "SELECT xm.name as projectName, nr.project_id as projectId, nr.content, " +
-            "wt.id, wt.task_id as taskId, wt.PROJECT_ITEM_ID as projectItemId, wt.level "+
+            "wt.id, wt.task_id as taskId, wt.PROJECT_ITEM_ID as projectItemId, wt.level, wt.PROBLEM_DESCRIBE as problemDescribe, wt.SITE_SITUATION_RECORDS  as siteSituationRecords  "+
             "FROM bs_sgc_df_bxgcglxm wt " +
             "LEFT JOIN bs_sgc_df_bxgcxm xm on wt.project_id = xm.id " +
             "LEFT JOIN bs_sgc_df_bxgcxmnr nr on wt.project_item_id = nr.id " +

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskProjectRelMapper.java

@@ -1,9 +0,0 @@
-package com.kms.yxgh.df.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.kms.yxgh.df.domain.DfDangerousTaskProjectRel;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface DfDangerousTaskProjectRelMapper extends BaseMapper<DfDangerousTaskProjectRel> {
-}

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseEngineeringMapper.java

@@ -1,15 +0,0 @@
-package com.kms.yxgh.df.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.kms.yxgh.df.domain.DfSuperviseEngineering;
-import org.springframework.stereotype.Repository;
-
-/**
- * 堤防监督检查工程Mapper接口
- *
- * @author hry
- * @date 2024/2/29 14:44
- */
-@Repository
-public interface DfSuperviseEngineeringMapper extends BaseMapper<DfSuperviseEngineering> {
-}

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfSuperviseProblemMapper.java

@@ -34,9 +34,9 @@ public interface DfSuperviseProblemMapper extends BaseMapper<DfSuperviseProblem>
      */
     @Insert({
             "<script>",
-            "insert into bs_sgc_df_jdjcgcwt(task_id, project_id, project_item_id, level, status) values ",
+            "insert into bs_sgc_df_jdjcgcwt(task_id, project_id, project_item_id, level, status, PROBLEM_DESCRIBE, SITE_SITUATION_RECORDS ) values ",
             "<foreach collection='problemList' item='item' index='index' separator=','>",
-            "(#{item.taskId}, #{item.projectId}, #{item.projectItemId}, #{item.level}, #{item.status} )",
+            "(#{item.taskId}, #{item.projectId}, #{item.projectItemId}, #{item.level}, #{item.status}, #{item.problemDescribe}, #{item.siteSituationRecords} )",
             "</foreach>",
             "</script>"
     })
@@ -98,52 +98,50 @@ public interface DfSuperviseProblemMapper extends BaseMapper<DfSuperviseProblem>
         }
     }
 
+    // 判断bs_sgc_df_gcda的adcdStart是否等于sys_xzqh的xzqhdm，或者是否等于xzqhdm的parentid，以及根据parentId获取xzqhdm查询是否等于adcdStart
+
+
+
+
+
 
     /**
      * 监督检查任务统计分析
      * @param dto
      * @return
      */
-    @SelectProvider(type = DfSuperviseProblemTotalProvider.class, method = "countProblemTotal")
+    @Select("<script>" +
+            "SELECT sum(IF(wt.status is not null, 1, 0)) as problemDispose,sum(IF(wt.status='0', 1, 0)) as distributeCount,sum(IF(wt.status='1', 1, 0)) as handleCount," +
+            "sum(IF(wt.status='2', 1, 0)) as confirmCount,sum(IF(wt.status='3', 1, 0)) as finishCount,sum(IF(wt.level is not null, 1, 0)) as problemTotal," +
+            "sum(IF(wt.level='1', 1, 0)) as same,sum(IF(wt.level='2', 1, 0)) as heavy,sum(IF(wt.level='3', 1, 0)) as serious "+
+            "FROM bs_sgc_df_jdjcgcwt wt " +
+            "LEFT JOIN bs_sgc_df_jdjcrw rw on wt.TASK_ID = rw.id " +
+            "LEFT JOIN bs_sgc_df_gcda xx on xx.dike_code = rw.dike_code " +
+            "<if test='dto.adcdStart != null and dto.adcdStart != \"\"'>" +
+            "LEFT JOIN sys_xzqh xzqh on xzqh.xzqhdm=#{dto.adcdStart} " +
+            "</if>" +
+            "WHERE xx.EXPR_DATE IS NULL   " +
+            "<if test='dto.dikeType != null and dto.dikeType != \"\"'>" +
+            "AND  FIND_IN_SET(#{dto.dikeType} , REPLACE(REPLACE(REPLACE(xx.dike_type, '[', ''), ']', ''), '\"', '')) " +
+            "</if>" +
+            "<if test='dto.riverLocation != null and dto.riverLocation != \"\"'>" +
+            "AND xx.river_location = #{dto.riverLocation} " +
+            "</if>" +
+            "<if test='dto.taskId != null and dto.taskId != \"\"'>" +
+            "AND wt.task_id = #{dto.taskId}  " +
+            "</if>" +
+            "<if test='dto.adcdStart != null and dto.adcdStart != \"\"'>" +
+            "AND (xx.ADCD_START = #{dto.adcdStart}  OR xx.ADCD_START in (SELECT xzqhdm from sys_xzqh where parentid =#{dto.adcdStart}) " +
+            " or xx.ADCD_START in (select xzqhdm from sys_xzqh where parentid in(SELECT xzqhdm from sys_xzqh where parentid = #{dto.adcdStart}))) " +
+            "</if>" +
+            "</script>")
     DfSuperviseProblemTotalDto countProblemTotal(@Param("dto") DfSuperviseProblemListDto dto);
 
-    class DfSuperviseProblemTotalProvider {
-        public String countProblemTotal(final Map<String, Object> param) {
-            return new SQL() {{
-                SELECT("sum(IF(wt.status is not null, 1, 0)) as problemDispose,sum(IF(wt.status='0', 1, 0)) as distributeCount,sum(IF(wt.status='1', 1, 0)) as handleCount," +
-                        "sum(IF(wt.status='2', 1, 0)) as confirmCount,sum(IF(wt.status='3', 1, 0)) as finishCount,sum(IF(wt.level is not null, 1, 0)) as problemTotal," +
-                        "sum(IF(wt.level='1', 1, 0)) as same,sum(IF(wt.level='2', 1, 0)) as heavy,sum(IF(wt.level='3', 1, 0)) as serious ");
-                FROM("bs_sgc_df_jdjcgcwt wt");
-                LEFT_OUTER_JOIN("bs_sgc_df_jdjcrw rw on wt.TASK_ID = rw.id");
-                LEFT_OUTER_JOIN("bs_sgc_df_gcda xx on xx.dike_code = rw.dike_code");
-                LEFT_OUTER_JOIN("bs_sgc_df_gcgl gl on xx.dike_code = gl.dike_code");
-                WHERE("xx.EXPR_DATE IS NULL AND gl.EXPR_DATE IS NULL");
-
-                DfSuperviseProblemListDto dto = (DfSuperviseProblemListDto) param.get("dto");
-                if (dto != null) {
-                    if (StringUtils.isNotBlank(dto.getRiverLocation())) {
-                        WHERE("xx.river_location = #{dto.riverLocation}");
-                    }
-                    if (StringUtils.isNotBlank(dto.getDikeType())) {
-                        WHERE("FIND_IN_SET(#{dto.dikeType} , REPLACE(REPLACE(REPLACE(xx.dike_type, '[', ''), ']', ''), '\"', ''))");
-                    }
-                    // 行政区划
-                    if (StringUtils.isNotBlank(dto.getAdcd())) {
-                        WHERE("xx.adcd = #{dto.adcd}");
-                    }
-                    // 监督检查任务
-                    if (StringUtils.isNotBlank(dto.getTaskId())) {
-                        WHERE("rw.id = #{dto.taskId}");
-                    }
-                }
-            }}.toString();
-        }
-    }
 
     @Select("<script>" +
             "SELECT xm.name as projectName, nr.project_id as projectId, nr.content, " +
             "wt.id, wt.task_id as taskId, wt.PROJECT_ITEM_ID as projectItemId, wt.level, wt.status, wt.HANDLE_RECORD as handleRecord, wt.HANDLE_SITUATION_RECORDS as handleSituationRecords, wt.HANDLE_UID as handleUid, " +
-            "wt.HANDLE_NAME as handleName, wt.HANDLE_TIME as handleTime, wt.CONFIRM_UID as confirmUid, wt.CONFIRM_NAME as confirmName, wt.CONFIRM_TIME as confirmTime "+
+            "wt.HANDLE_NAME as handleName, wt.HANDLE_TIME as handleTime, wt.CONFIRM_UID as confirmUid, wt.CONFIRM_NAME as confirmName, wt.CONFIRM_TIME as confirmTime, wt.PROBLEM_DESCRIBE as problemDescribe, wt.SITE_SITUATION_RECORDS as  siteSituationRecords  "+
             "FROM bs_sgc_df_jdjcgcwt wt " +
             "LEFT JOIN bs_sgc_df_jdjcbfxm xm on wt.project_id = xm.id " +
             "LEFT JOIN bs_sgc_df_jdjcbfxmnr nr on wt.project_item_id = nr.id " +

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

@@ -2,16 +2,13 @@ package com.kms.yxgh.df.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yxgh.base.SzException;
 import com.kms.yxgh.df.domain.DfDangerousTask;
 import com.kms.yxgh.df.domain.DfDangerousTaskItemRel;
-import com.kms.yxgh.df.domain.DfDangerousTaskProjectRel;
 import com.kms.yxgh.df.dto.*;
 import com.kms.yxgh.df.mapper.DfDangerousTaskItemRelMapper;
 import com.kms.yxgh.df.mapper.DfDangerousTaskMapper;
-import com.kms.yxgh.df.mapper.DfDangerousTaskProjectRelMapper;
 import com.kms.yxgh.util.BeanCopyUtils;
 import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.core.service.BaseService;
@@ -33,7 +30,6 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class DfDangerousTaskService extends BaseService<DfDangerousTaskMapper, DfDangerousTask> {
 
-    private final DfDangerousTaskProjectRelMapper projectRelMapper;
     private final DfDangerousTaskItemRelMapper taskItemRelMapper;
 
     public IPage<DfDangerousTaskDto> getListByPage(SearchParam<DfDangerousTaskSearchDto> sp) {
@@ -86,12 +82,6 @@ public class DfDangerousTaskService extends BaseService<DfDangerousTaskMapper, D
         if (CollectionUtil.isEmpty(dto.getProblemList())) {
             return dto;
         }
-        // 批量删除
-        List<String> ids = dto.getProblemList().stream().filter(level -> StringUtils.isNotBlank(level.getId())).map(DfDangerousParamDto.ProblemParam::getId).collect(Collectors.toList());
-        if(!ids.isEmpty()){
-            projectRelMapper.deleteBatchIds(ids);
-        }
-
         // 2. 新增填报内容
         List<DfDangerousTaskItemRel> itemRel = dto.getProblemList().stream().flatMap(v -> {
             // 2.1 删除关联数据
@@ -99,12 +89,6 @@ public class DfDangerousTaskService extends BaseService<DfDangerousTaskMapper, D
             if (!problemIds.isEmpty()) {
                 taskItemRelMapper.deleteBatchIds(problemIds);
             }
-            DfDangerousTaskProjectRel engineering = new DfDangerousTaskProjectRel();
-            BeanCopyUtils.copy(v, engineering);
-            engineering.setId(null);
-            engineering.setTaskId(task.getId());
-            projectRelMapper.insert(engineering);
-
             return v.getLevelList().stream().map(level -> {
                 DfDangerousTaskItemRel problem = new DfDangerousTaskItemRel();
                 BeanCopyUtils.copy(level, problem);
@@ -128,12 +112,6 @@ public class DfDangerousTaskService extends BaseService<DfDangerousTaskMapper, D
 
     public DfDangerousTaskDetailDto getDetailByTaskId(String  taskId){
         DfDangerousTaskDetailDto dto = BeanCopyUtils.copy(getDetailById(taskId), DfDangerousTaskDetailDto.class);
-
-      // 1.1 获取堤防任务问题描述列表
-        List<DfDangerousTaskProjectRel> relList = projectRelMapper.selectList(Wrappers.<DfDangerousTaskProjectRel>lambdaQuery()
-                .eq(DfDangerousTaskProjectRel::getTaskId, taskId));
-        dto.setEngineeringList(BeanCopyUtils.copyList(relList, DfDangerousTaskProjectRelDto.class));
-
         DfDangerousTaskItemRelDto relDto=  new DfDangerousTaskItemRelDto();
         relDto.setTaskId(taskId);
         dto.setProblemList(taskItemRelMapper.selectByListParam(relDto));

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

@@ -8,11 +8,9 @@ import com.kms.common.utils.UserUtils;
 import com.kms.yxgh.base.SzException;
 import com.kms.yxgh.base.enums.SuperviseEngineeringStatus;
 import com.kms.yxgh.base.enums.SuperviseProblemStatus;
-import com.kms.yxgh.df.domain.DfSuperviseEngineering;
 import com.kms.yxgh.df.domain.DfSuperviseProblem;
 import com.kms.yxgh.df.domain.DfSuperviseTask;
 import com.kms.yxgh.df.dto.*;
-import com.kms.yxgh.df.mapper.DfSuperviseEngineeringMapper;
 import com.kms.yxgh.df.mapper.DfSuperviseProblemMapper;
 import com.kms.yxgh.df.mapper.DfSuperviseTaskMapper;
 import com.kms.yxgh.df.mapper.DfSuperviseWayProjectItemMapper;
@@ -20,7 +18,6 @@ import com.kms.yxgh.util.BeanCopyUtils;
 import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.core.domain.entity.SysUser;
 import com.shuili.common.core.service.BaseService;
-import com.shuili.common.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -38,10 +35,9 @@ import java.util.stream.Collectors;
  */
 @Service
 @AllArgsConstructor
-public class DfSuperviseEngineeringService extends BaseService<DfSuperviseEngineeringMapper, DfSuperviseEngineering> {
+public class DfSuperviseEngineeringService extends BaseService<DfSuperviseProblemMapper, DfSuperviseProblem> {
 
     private final DfSuperviseTaskMapper taskMapper;
-    private final DfSuperviseProblemMapper problemMapper;
     private final DfSuperviseWayProjectItemMapper projectItemMapper;
 
     @Transactional(rollbackFor = Exception.class)
@@ -57,39 +53,32 @@ public class DfSuperviseEngineeringService extends BaseService<DfSuperviseEngine
         task.setWeather(dto.getWeather());
         task.setState(dto.getState());
 
+        // 1.2 新增工程问题
         // 1.2 新增工程问题
         if (CollectionUtil.isNotEmpty(dto.getProblemList())) {
             List<DfSuperviseProblem> problemList = new ArrayList<>();
-            dto.getProblemList().stream().forEach(v -> {
-
-                v.getLevelList().forEach(level -> {
-                    DfSuperviseProblem problem = new DfSuperviseProblem();
-                    problem.setId(null);
-                    problem.setProjectId(v.getProjectId());
-                    problem.setTaskId(task.getId());
-                    problem.setProjectItemId(level.getProjectItemId());
-                    problem.setLevel(level.getLevel());
-                    // 监督检查工程填报提交后更新问题为下发
-                    if (SuperviseEngineeringStatus.SUBMIT.getValue().equals(dto.getState())) {
-                        problem.setStatus(SuperviseProblemStatus.DISTRIBUTE.getValue());
-                    }
-                    problemList.add(problem);
-                });
-                List<String> problemIds = v.getLevelList().stream().map(DfSuperviseEngineeringParamDto.ProblemLevelParam::getId).collect(Collectors.toList());
-                if (problemIds.size() > 0) {
-                    problemMapper.deleteBatchIds(problemIds);
+            dto.getProblemList().stream().forEach(level -> {
+                DfSuperviseProblem problem = new DfSuperviseProblem();
+                problem.setId(null);
+                problem.setProjectId(level.getProjectId());
+                problem.setTaskId(task.getId());
+                problem.setProjectItemId(level.getProjectItemId());
+                problem.setLevel(level.getLevel());
+                problem.setProblemDescribe(level.getProblemDescribe());
+                problem.setSiteSituationRecords(level.getSiteSituationRecords());
+                // 监督检查工程填报提交后更新问题为下发
+                if (SuperviseEngineeringStatus.SUBMIT.getValue().equals(dto.getState())) {
+                    problem.setStatus(SuperviseProblemStatus.DISTRIBUTE.getValue());
                 }
-                DfSuperviseEngineering engineering = new DfSuperviseEngineering();
-                engineering.setId(StringUtils.isNotEmpty(v.getId()) ? v.getId() : null);
-                engineering.setTaskId(task.getId());
-                engineering.setProjectId(v.getProjectId());
-                engineering.setProblemDescribe(v.getProblemDescribe());
-                engineering.setSiteSituationRecords(v.getSiteSituationRecords());
-                this.saveOrUpdate(engineering);
+                problemList.add(problem);
             });
+            List<String> problemIds = dto.getProblemList().stream().map(DfSuperviseEngineeringParamDto.ProblemParam::getId).collect(Collectors.toList());
+            if (problemIds.size() > 0) {
+                this.getBaseMapper().deleteBatchIds(problemIds);
+            }
             // 批量新增
             if (problemList.size() > 0) {
-                problemMapper.insertProblem(problemList);
+                this.getBaseMapper().insertProblem(problemList);
             }
         }
         taskMapper.updateById(task);
@@ -100,15 +89,10 @@ public class DfSuperviseEngineeringService extends BaseService<DfSuperviseEngine
     public DfSuperviseTaskDetailDto getDetailByTaskId(String taskId) {
         DfSuperviseTaskDetailDto dto = BeanCopyUtils.copy(getTaskProblemInfo(taskId), DfSuperviseTaskDetailDto.class);
 
-        // 1.1 获取堤防任务问题描述列表
-        List<DfSuperviseEngineering> engineeringList = this.list(Wrappers.<DfSuperviseEngineering>lambdaQuery()
-                .eq(DfSuperviseEngineering::getTaskId, taskId));
-        dto.setEngineeringList(BeanCopyUtils.copyList(engineeringList, DfSuperviseEngineeringDto.class));
-
         // 1.4 获取堤防任务问题列表
         DfSuperviseProblemDto dtoProblem = new DfSuperviseProblemDto();
         dtoProblem.setTaskId(taskId);
-        List<DfSuperviseProblemDto> problemList = problemMapper.selectByListParam(dtoProblem);
+        List<DfSuperviseProblemDto> problemList = this.getBaseMapper().selectByListParam(dtoProblem);
         dto.setProblemList(problemList);
         return dto;
     }
@@ -137,19 +121,19 @@ public class DfSuperviseEngineeringService extends BaseService<DfSuperviseEngine
             problem.setConfirmTime(now);
         }
 
-        problemMapper.updateById(problem);
+        this.getBaseMapper().updateById(problem);
         return true;
     }
 
     public DfSuperviseProblem getProblemDetailById(String id) {
-        DfSuperviseProblem problem = problemMapper.selectOne(Wrappers.<DfSuperviseProblem>lambdaQuery()
+        DfSuperviseProblem problem = this.getBaseMapper().selectOne(Wrappers.<DfSuperviseProblem>lambdaQuery()
                 .eq(DfSuperviseProblem::getId, id));
         return problem;
     }
 
     public IPage<DfSuperviseProblemListDto> list(SearchParam<DfSuperviseProblemListDto> sp) {
         Page<DfSuperviseProblemListDto> page = new Page<>(sp.getPageNum(), sp.getPageSize());
-        return problemMapper.selectPage(page, sp.getData());
+        return this.getBaseMapper().selectPage(page, sp.getData());
     }
 
     /**
@@ -172,19 +156,13 @@ public class DfSuperviseEngineeringService extends BaseService<DfSuperviseEngine
         // 获取问题信息
         DfSuperviseProblemDto dtoProblem = new DfSuperviseProblemDto();
         dtoProblem.setId(id);
-        List<DfSuperviseProblemDto> problemList = problemMapper.selectByListParam(dtoProblem);
+        List<DfSuperviseProblemDto> problemList = this.getBaseMapper().selectByListParam(dtoProblem);
         if (problemList.size() == 0) {
             throw new SzException("问题信息不存在，请确认id值是否正确");
         }
         DfSuperviseProblemDto problem = problemList.get(0);
         dto.setProblemDto(problem);
 
-        // 获取问题描述
-        DfSuperviseEngineering engineering = this.getOne(Wrappers.<DfSuperviseEngineering>lambdaQuery().eq(DfSuperviseEngineering::getTaskId, problem.getTaskId())
-                .eq(DfSuperviseEngineering::getProjectId, problem.getProjectId()));
-        dto.setProblemDescribe(engineering.getProblemDescribe());
-        dto.setSiteSituationRecords(engineering.getSiteSituationRecords());
-
         // 获取堤防和堤防任务信息
         DfSuperviseTaskCommonDto commonDto = getTaskProblemInfo(problem.getTaskId());
         BeanCopyUtils.copy(commonDto, dto);
@@ -203,6 +181,6 @@ public class DfSuperviseEngineeringService extends BaseService<DfSuperviseEngine
 
 
     public DfSuperviseProblemTotalDto countTotal(DfSuperviseProblemListDto dto) {
-        return problemMapper.countProblemTotal(dto);
+        return this.getBaseMapper().countProblemTotal(dto);
     }
 }

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

@@ -62,12 +62,19 @@ public class DfSuperviseWayService extends BaseService<DfSuperviseWayMapper, DfS
         DfSuperviseWay enable = getEnableWay();
         if (ObjectUtil.isNotNull(id)) {
             // 修改校验是否启用一条
-            DfSuperviseWayDto wayDto = getDetailById(id);
+            DfSuperviseWay wayDto = this.getById(id);
             if (wayDto.getId().equals(enable.getId()) && updateStatus.equals(SuperviseWayStatus.STOP.getValue())) {
                 throw new DfException("需启用一项管理办法");
             } else {
-                enable.setStatus(SuperviseWayStatus.STOP.getValue());
-                this.updateById(enable);
+                // 如果当前启用的监督检查办法不是正在修改的办法
+                if (!wayDto.getId().equals(enable.getId())) {
+                    wayDto.setStatus(updateStatus);
+                    this.updateById(wayDto);
+                    if(updateStatus.equals(SuperviseWayStatus.ENABLE.getValue())){
+                        enable.setStatus(SuperviseWayStatus.STOP.getValue());
+                        this.updateById(enable);
+                    }
+                }
             }
         }else{
             // 若新增没有启用的则设为默认启用的，否则为禁用

shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousTaskController.java

@@ -2,10 +2,7 @@ package com.kms.yxgh.sz.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.kms.yxgh.base.Response;
-import com.kms.yxgh.sz.dto.SzDangerousParamDto;
-import com.kms.yxgh.sz.dto.SzDangerousTaskDetailDto;
-import com.kms.yxgh.sz.dto.SzDangerousTaskDto;
-import com.kms.yxgh.sz.dto.SzDangerousTaskSearchDto;
+import com.kms.yxgh.sz.dto.*;
 import com.kms.yxgh.sz.service.SzDangerousTaskService;
 import com.shuili.common.annotation.Log;
 import com.shuili.common.core.domain.SearchParam;
@@ -85,7 +82,7 @@ public class SzDangerousTaskController {
 
 
     /**
-     * 保存或提交 水闸工程核查
+     * 水闸工程核查填报保存或提交
      */
     @ApiOperation("水闸工程核查保存或提交")
     @Log(title = "水闸工程核查保存或提交", businessType = BusinessType.INSERT)

shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousTask.java

@@ -21,7 +21,6 @@ public class SzDangerousTask extends SyBaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-
     /**
      * 名称
      */

shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousTaskItemRel.java

@@ -43,6 +43,18 @@ public class SzDangerousTaskItemRel extends SyBaseEntity {
     @ApiModelProperty("问题等级")
     private String level;
 
+    /**
+     * 问题描述
+     */
+    @ApiModelProperty(value = "问题描述")
+    private String problemDescribe;
+
+    /**
+     * 现场记录情况
+     */
+    @ApiModelProperty(value = "现场记录情况")
+    private String siteSituationRecords;
+
 
     @TableField(exist = false)
     private String remark;

shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousTaskProjectRel.java

@@ -1,50 +0,0 @@
-package com.kms.yxgh.sz.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.kms.yxgh.base.SyBaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 水闸病险工程任务项目关联对象 bs_sgc_sz_jdjcgc
- * @author hry
- * @date 2024/2/29 13:57
- */
-@TableName("bs_sgc_sz_bxgcxmgl")
-@Data
-@ApiModel("水闸病险工程任务项目关联")
-public class SzDangerousTaskProjectRel extends SyBaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 监督检查任务ID
-     */
-    @ApiModelProperty(value = "任务ID")
-    private String taskId;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    private String projectId;
-
-    /**
-     * 问题描述
-     */
-    @ApiModelProperty(value = "问题描述")
-    private String problemDescribe;
-
-    /**
-     * 现场记录情况
-     */
-    @ApiModelProperty(value = "现场记录情况")
-    private String siteSituationRecords;
-
-
-    @TableField(exist = false)
-    private String remark;
-
-}

shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzSuperviseEngineering.java

@@ -1,47 +0,0 @@
-package com.kms.yxgh.sz.domain;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.kms.yxgh.base.SyBaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 水闸监督检查工程管理对象 bs_sgc_sz_jdjcgc
- * @author hry
- * @date 2024/2/29 13:57
- */
-@TableName("bs_sgc_sz_jdjcgc")
-@Data
-@ApiModel("水闸监督检查工程管理")
-public class SzSuperviseEngineering extends SyBaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 监督检查任务ID
-     */
-    @ApiModelProperty(value = "监督检查任务ID")
-    private String taskId;
-
-
-    /**
-     * 监督检查办法项目ID
-     */
-    @ApiModelProperty(value = "监督检查办法项目ID")
-    private String projectId;
-
-    /**
-     * 问题描述
-     */
-    @ApiModelProperty(value = "问题描述")
-    private String problemDescribe;
-
-    /**
-     * 现场记录情况
-     */
-    @ApiModelProperty(value = "现场记录情况")
-    private String siteSituationRecords;
-
-
-}

shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzSuperviseProblem.java

@@ -45,6 +45,19 @@ public class SzSuperviseProblem extends SyBaseEntity {
     @ApiModelProperty("问题等级")
     private String level;
 
+    /**
+     * 问题描述
+     */
+    @ApiModelProperty(value = "问题描述")
+    private String problemDescribe;
+
+    /**
+     * 现场记录情况
+     */
+    @ApiModelProperty(value = "现场记录情况")
+    private String siteSituationRecords;
+
+
     /**
      * 状态（下发、处理、确认、完成）
      */

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousFillingParamDto.java

@@ -0,0 +1,72 @@
+package com.kms.yxgh.sz.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author hry
+ * @date 2024/3/2 16:57
+ */
+@Data
+@ApiModel("水闸病险工程参数对象")
+public class SzDangerousFillingParamDto {
+    /**
+     * 任务ID
+     */
+    @ApiModelProperty(value = "任务ID")
+    private String taskId;
+
+    /**
+     * 状态（保存、提交）
+     */
+    @ApiModelProperty(value = "状态")
+    private String state;
+
+    /**
+     * 项目问题列表
+     */
+    private List<ProblemParam> problemList;
+
+
+    @Data
+    public static class ProblemParam {
+
+        @ApiModelProperty("主键")
+        private String id;
+
+        /**
+         * 项目ID
+         */
+        @ApiModelProperty("项目ID")
+        private String projectId;
+
+        /**
+         * 项目内容ID
+         */
+        @ApiModelProperty("项目内容ID")
+        private String projectItemId;
+
+        /**
+         * 问题等级
+         */
+        @ApiModelProperty("等级")
+        private String level;
+
+        /**
+         * 问题描述
+         */
+        @ApiModelProperty(value = "问题描述")
+        private String problemDescribe;
+
+        /**
+         * 现场记录情况
+         */
+        @ApiModelProperty(value = "现场记录情况")
+        private String siteSituationRecords;
+
+    }
+
+}

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskDetailDto.java

@@ -10,12 +10,6 @@ import java.util.List;
 @ApiModel("堤防病险工程任务详情")
 public class SzDangerousTaskDetailDto extends SzDangerousTaskDto {
 
-    /**
-     * 问题描述列表
-     */
-    @ApiModelProperty(value = "问题描述列表")
-    private List<SzDangerousTaskProjectRelDto> engineeringList;
-
     /**
      * 问题列表
      */

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskItemRelDto.java

@@ -39,6 +39,18 @@ public class SzDangerousTaskItemRelDto {
     @ApiModelProperty("问题等级")
     private String level;
 
+    /**
+     * 问题描述
+     */
+    @ApiModelProperty(value = "问题描述")
+    private String problemDescribe;
+
+    /**
+     * 现场记录情况
+     */
+    @ApiModelProperty(value = "现场记录情况")
+    private String siteSituationRecords;
+
     /**
      * 核查内容
      */

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskProjectRelDto.java

@@ -1,44 +0,0 @@
-package com.kms.yxgh.sz.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 水闸病险工程任务项目关联管理
- * @author hry
- * @date 2024/2/29 13:57
- */
-@Data
-@ApiModel("水闸病险工程任务项目关联管理")
-public class SzDangerousTaskProjectRelDto {
-
-    @ApiModelProperty(value = "id")
-    private String id;
-
-    /**
-     * 任务ID
-     */
-    @ApiModelProperty(value = "任务ID")
-    private String taskId;
-
-    /**
-     * 项目ID
-     */
-    @ApiModelProperty(value = "项目ID")
-    private String projectId;
-
-    /**
-     * 问题描述
-     */
-    @ApiModelProperty(value = "问题描述")
-    private String problemDescribe;
-
-    /**
-     * 现场记录情况
-     */
-    @ApiModelProperty(value = "现场记录情况")
-    private String siteSituationRecords;
-
-
-}

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseEngineeringDto.java

@@ -1,45 +0,0 @@
-package com.kms.yxgh.sz.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * 水闸监督检查工程管理DTO对象
- * @author hry
- * @date 2024/2/29 13:57
- */
-@Data
-@ApiModel("水闸监督检查工程管理")
-public class SzSuperviseEngineeringDto  {
-
-    @ApiModelProperty("主键")
-    private String id;
-
-    /**
-     * 监督检查任务ID
-     */
-    @ApiModelProperty(value = "监督检查任务ID")
-    private String taskId;
-
-
-    /**
-     * 监督检查办法项目ID
-     */
-    @ApiModelProperty(value = "监督检查办法项目ID")
-    private String projectId;
-
-    /**
-     * 问题描述
-     */
-    @ApiModelProperty(value = "问题描述")
-    private String problemDescribe;
-
-    /**
-     * 现场记录情况
-     */
-    @ApiModelProperty(value = "现场记录情况")
-    private String siteSituationRecords;
-
-
-}

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseEngineeringParamDto.java

@@ -57,11 +57,23 @@ public class SzSuperviseEngineeringParamDto{
         private String id;
 
         /**
-         * 监督检查办法项目ID
+         * 项目ID
          */
-        @ApiModelProperty("监督检查办法项目ID")
+        @ApiModelProperty("项目ID")
         private String projectId;
 
+        /**
+         * 项目内容ID
+         */
+        @ApiModelProperty("项目内容ID")
+        private String projectItemId;
+
+        /**
+         * 问题等级
+         */
+        @ApiModelProperty("等级")
+        private String level;
+
         /**
          * 问题描述
          */
@@ -74,29 +86,6 @@ public class SzSuperviseEngineeringParamDto{
         @ApiModelProperty(value = "现场记录情况")
         private String siteSituationRecords;
 
-        /**
-         * 问题填报列表
-         */
-        private List<ProblemLevelParam> levelList;
     }
 
-    @Data
-    public static class ProblemLevelParam {
-
-        @ApiModelProperty("主键")
-        private String id;
-
-        /**
-         * 监督检查办法项目ID
-         */
-        @ApiModelProperty("监督检查办法项目ID")
-        private String projectItemId;
-
-        /**
-         * 问题等级
-         */
-        @ApiModelProperty("等级")
-        private String level;
-
-    }
 }

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseProblemDetailDto.java

@@ -24,18 +24,6 @@ public class SzSuperviseProblemDetailDto extends SzSuperviseTaskCommonDto{
     @ApiModelProperty("检查内容")
     private String content;
 
-    /**
-     * 问题描述
-     */
-    @ApiModelProperty(value = "问题描述")
-    private String problemDescribe;
-
-    /**
-     * 现场记录情况
-     */
-    @ApiModelProperty(value = "现场记录情况")
-    private String siteSituationRecords;
-
     /**
      * 问题对象
      */

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseProblemDto.java

@@ -55,6 +55,20 @@ public class SzSuperviseProblemDto {
     @ApiModelProperty("问题等级")
     private String level;
 
+
+    /**
+     * 问题描述
+     */
+    @ApiModelProperty(value = "问题描述")
+    private String problemDescribe;
+
+    /**
+     * 现场记录情况
+     */
+    @ApiModelProperty(value = "现场记录情况")
+    private String siteSituationRecords;
+
+
     /**
      * 状态（下发、处理、确认、完成）
      */

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseTaskDetailDto.java

@@ -14,12 +14,6 @@ import java.util.List;
 @ApiModel("水闸监督检查任务管理")
 public class SzSuperviseTaskDetailDto extends SzSuperviseTaskCommonDto{
 
-    /**
-     * 问题描述列表
-     */
-    @ApiModelProperty(value = "问题描述列表")
-    private List<SzSuperviseEngineeringDto> engineeringList;
-
     /**
      * 问题列表
      */

shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskItemRelMapper.java

@@ -26,7 +26,7 @@ public interface SzDangerousTaskItemRelMapper extends BaseMapper<SzDangerousTask
 
     @Select("<script>" +
             "SELECT xm.name as projectName, nr.project_id as projectId, nr.content, " +
-            "wt.id, wt.task_id as taskId, wt.PROJECT_ITEM_ID as projectItemId, wt.level "+
+            "wt.id, wt.task_id as taskId, wt.PROJECT_ITEM_ID as projectItemId, wt.level, wt.PROBLEM_DESCRIBE as problemDescribe, wt.SITE_SITUATION_RECORDS  as siteSituationRecords "+
             "FROM bs_sgc_sz_bxgcglxm wt " +
             "LEFT JOIN bs_sgc_sz_bxgcxm xm on wt.project_id = xm.id " +
             "LEFT JOIN bs_sgc_sz_bxgcxmnr nr on wt.project_item_id = nr.id " +

shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskProjectRelMapper.java

@@ -1,9 +0,0 @@
-package com.kms.yxgh.sz.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.kms.yxgh.sz.domain.SzDangerousTaskProjectRel;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface SzDangerousTaskProjectRelMapper extends BaseMapper<SzDangerousTaskProjectRel> {
-}

shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzSuperviseEngineeringMapper.java

@@ -1,16 +0,0 @@
-package com.kms.yxgh.sz.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.kms.yxgh.sz.domain.SzSuperviseEngineering;
-import com.kms.yxgh.sz.domain.SzSuperviseTask;
-import org.springframework.stereotype.Repository;
-
-/**
- * 水闸监督检查工程Mapper接口
- *
- * @author hry
- * @date 2024/2/29 14:44
- */
-@Repository
-public interface SzSuperviseEngineeringMapper extends BaseMapper<SzSuperviseEngineering> {
-}

shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzSuperviseProblemMapper.java

@@ -34,9 +34,9 @@ public interface SzSuperviseProblemMapper extends BaseMapper<SzSuperviseProblem>
      */
     @Insert({
             "<script>",
-            "insert into bs_sgc_sz_jdjcgcwt(task_id, project_id, project_item_id, level, status) values ",
+            "insert into bs_sgc_sz_jdjcgcwt(task_id, project_id, project_item_id, level, status, PROBLEM_DESCRIBE, SITE_SITUATION_RECORDS ) values ",
             "<foreach collection='problemList' item='item' index='index' separator=','>",
-            "(#{item.taskId}, #{item.projectId}, #{item.projectItemId}, #{item.level}, #{item.status} )",
+            "(#{item.taskId}, #{item.projectId}, #{item.projectItemId}, #{item.level}, #{item.status}, #{item.problemDescribe}, #{item.siteSituationRecords}  )",
             "</foreach>",
             "</script>"
     })
@@ -97,52 +97,40 @@ public interface SzSuperviseProblemMapper extends BaseMapper<SzSuperviseProblem>
         }
     }
 
-
     /**
      * 监督检查任务统计分析
      * @param dto
      * @return
      */
-    @SelectProvider(type = SzSuperviseProblemTotalProvider.class, method = "countProblemTotal")
+    @Select("<script>" +
+            "SELECT sum(IF(wt.status is not null, 1, 0)) as problemDispose,sum(IF(wt.status='0', 1, 0)) as distributeCount,sum(IF(wt.status='1', 1, 0)) as handleCount," +
+            "sum(IF(wt.status='2', 1, 0)) as confirmCount,sum(IF(wt.status='3', 1, 0)) as finishCount,sum(IF(wt.level is not null, 1, 0)) as problemTotal," +
+            "sum(IF(wt.level='1', 1, 0)) as same,sum(IF(wt.level='2', 1, 0)) as heavy,sum(IF(wt.level='3', 1, 0)) as serious "+
+            "FROM bs_sgc_sz_jdjcgcwt wt " +
+            "LEFT JOIN bs_sgc_sz_jdjcrw rw on wt.TASK_ID = rw.id " +
+            "LEFT JOIN bs_sgc_sz_jbxx xx on xx.WAGA_CODE = rw.WAGA_CODE " +
+            "<if test='dto.adcd != null and dto.adcd != \"\"'>" +
+            "LEFT JOIN sys_xzqh xzqh on xzqh.xzqhdm=#{dto.adcd} " +
+            "</if>" +
+            "WHERE xx.EXPR_DATE IS NULL   " +
+            "<if test='dto.wagaType != null and dto.wagaType != \"\"'>" +
+            "AND FIND_IN_SET(#{dto.wagaType} , REPLACE(REPLACE(REPLACE(xx.WAGA_TYPE, '[', ''), ']', ''), '\"', '')) " +
+            "</if>" +
+            "<if test='dto.taskId != null and dto.taskId != \"\"'>" +
+            "AND wt.task_id = #{dto.taskId} " +
+            "</if>" +
+            "<if test='dto.adcd != null and dto.adcd != \"\"'>" +
+            "AND (xx.adcd = #{dto.adcd}  OR xx.adcd in (SELECT xzqhdm from sys_xzqh where parentid =#{dto.adcd}) " +
+            " or xx.adcd in (select xzqhdm from sys_xzqh where parentid in(SELECT xzqhdm from sys_xzqh where parentid = #{dto.adcd}))) " +
+            "</if>" +
+            "</script>")
     SzSuperviseProblemTotalDto countProblemTotal(@Param("dto") SzSuperviseProblemListDto dto);
 
-    class SzSuperviseProblemTotalProvider {
-        public String countProblemTotal(final Map<String, Object> param) {
-            return new SQL() {{
-                SELECT("sum(IF(wt.status is not null, 1, 0)) as problemDispose,sum(IF(wt.status='0', 1, 0)) as distributeCount,sum(IF(wt.status='1', 1, 0)) as handleCount," +
-                        "sum(IF(wt.status='2', 1, 0)) as confirmCount,sum(IF(wt.status='3', 1, 0)) as finishCount,sum(IF(wt.level is not null, 1, 0)) as problemTotal," +
-                        "sum(IF(wt.level='1', 1, 0)) as same,sum(IF(wt.level='2', 1, 0)) as heavy,sum(IF(wt.level='3', 1, 0)) as serious ");
-                FROM("bs_sgc_sz_jdjcgcwt wt");
-                LEFT_OUTER_JOIN("bs_sgc_sz_jdjcrw rw on wt.TASK_ID = rw.id");
-                LEFT_OUTER_JOIN("bs_sgc_sz_jbxx xx on xx.WAGA_CODE = rw.WAGA_CODE");
-                LEFT_OUTER_JOIN("bs_sgc_sz_gcgl gl on xx.WAGA_CODE = gl.WAGA_CODE");
-                WHERE("xx.EXPR_DATE IS NULL AND gl.EXPR_DATE IS NULL");
-
-                SzSuperviseProblemListDto dto = (SzSuperviseProblemListDto) param.get("dto");
-                if (dto != null) {
-                    // todo 所属流域
-                    // 工程类型
-                    if(StringUtils.isNotEmpty(dto.getWagaType())){
-                        WHERE("FIND_IN_SET(#{dto.wagaType} , REPLACE(REPLACE(REPLACE(xx.WAGA_TYPE, '[', ''), ']', ''), '\"', ''))");
-                    }
-                    // 行政区划
-                    if (StringUtils.isNotBlank(dto.getAdcd())) {
-                        WHERE("xx.adcd = #{dto.adcd}");
-                    }
-                    // 监督检查任务
-                    if (StringUtils.isNotBlank(dto.getTaskId())) {
-                        WHERE("rw.id = #{dto.taskId}");
-                    }
-                }
-            }}.toString();
-        }
-    }
-
 
     @Select("<script>" +
             "SELECT xm.name as projectName, nr.project_id as projectId, nr.content, " +
             "wt.id, wt.task_id as taskId, wt.PROJECT_ITEM_ID as projectItemId, wt.level, wt.status, wt.HANDLE_RECORD as handleRecord, wt.HANDLE_SITUATION_RECORDS as handleSituationRecords, wt.HANDLE_UID as handleUid, " +
-            "wt.HANDLE_NAME as handleName, wt.HANDLE_TIME as handleTime, wt.CONFIRM_UID as confirmUid, wt.CONFIRM_NAME as confirmName, wt.CONFIRM_TIME as confirmTime "+
+            "wt.HANDLE_NAME as handleName, wt.HANDLE_TIME as handleTime, wt.CONFIRM_UID as confirmUid, wt.CONFIRM_NAME as confirmName, wt.CONFIRM_TIME as confirmTime, wt.PROBLEM_DESCRIBE as problemDescribe, wt.SITE_SITUATION_RECORDS as  siteSituationRecords "+
             "FROM bs_sgc_sz_jdjcgcwt wt " +
             "LEFT JOIN bs_sgc_sz_jdjcbfxm xm on wt.project_id = xm.id " +
             "LEFT JOIN bs_sgc_sz_jdjcbfxmnr nr on wt.project_item_id = nr.id " +

shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDangerousTaskService.java

@@ -2,16 +2,13 @@ package com.kms.yxgh.sz.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yxgh.base.SzException;
 import com.kms.yxgh.sz.domain.SzDangerousTask;
 import com.kms.yxgh.sz.domain.SzDangerousTaskItemRel;
-import com.kms.yxgh.sz.domain.SzDangerousTaskProjectRel;
 import com.kms.yxgh.sz.dto.*;
 import com.kms.yxgh.sz.mapper.SzDangerousTaskItemRelMapper;
 import com.kms.yxgh.sz.mapper.SzDangerousTaskMapper;
-import com.kms.yxgh.sz.mapper.SzDangerousTaskProjectRelMapper;
 import com.kms.yxgh.util.BeanCopyUtils;
 import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.core.service.BaseService;
@@ -33,7 +30,6 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class SzDangerousTaskService extends BaseService<SzDangerousTaskMapper, SzDangerousTask> {
 
-    private final SzDangerousTaskProjectRelMapper projectRelMapper;
     private final SzDangerousTaskItemRelMapper taskItemRelMapper;
 
     public IPage<SzDangerousTaskDto> getListByPage(SearchParam<SzDangerousTaskSearchDto> sp) {
@@ -86,11 +82,6 @@ public class SzDangerousTaskService extends BaseService<SzDangerousTaskMapper, S
         if (CollectionUtil.isEmpty(dto.getProblemList())) {
             return dto;
         }
-        // 批量删除
-        List<String> ids = dto.getProblemList().stream().filter(level -> StringUtils.isNotBlank(level.getId())).map(SzDangerousParamDto.ProblemParam::getId).collect(Collectors.toList());
-        if(!ids.isEmpty()){
-            projectRelMapper.deleteBatchIds(ids);
-        }
 
         // 2. 新增填报内容
         List<SzDangerousTaskItemRel> itemRel = dto.getProblemList().stream().flatMap(v -> {
@@ -99,12 +90,6 @@ public class SzDangerousTaskService extends BaseService<SzDangerousTaskMapper, S
             if (!problemIds.isEmpty()) {
                 taskItemRelMapper.deleteBatchIds(problemIds);
             }
-            SzDangerousTaskProjectRel engineering = new SzDangerousTaskProjectRel();
-            BeanCopyUtils.copy(v, engineering);
-            engineering.setId(null);
-            engineering.setTaskId(task.getId());
-            projectRelMapper.insert(engineering);
-
             return v.getLevelList().stream().map(level -> {
                 SzDangerousTaskItemRel problem = new SzDangerousTaskItemRel();
                 BeanCopyUtils.copy(level, problem);
@@ -128,16 +113,11 @@ public class SzDangerousTaskService extends BaseService<SzDangerousTaskMapper, S
 
     public SzDangerousTaskDetailDto getDetailByTaskId(String  taskId){
         SzDangerousTaskDetailDto dto = BeanCopyUtils.copy(getDetailById(taskId), SzDangerousTaskDetailDto.class);
-
-      // 1.1 获取水闸任务问题描述列表
-        List<SzDangerousTaskProjectRel> relList = projectRelMapper.selectList(Wrappers.<SzDangerousTaskProjectRel>lambdaQuery()
-                .eq(SzDangerousTaskProjectRel::getTaskId, taskId));
-        dto.setEngineeringList(BeanCopyUtils.copyList(relList, SzDangerousTaskProjectRelDto.class));
-
         SzDangerousTaskItemRelDto relDto=  new SzDangerousTaskItemRelDto();
         relDto.setTaskId(taskId);
         dto.setProblemList(taskItemRelMapper.selectByListParam(relDto));
-
         return dto;
     }
+
+
 }

shuili-system/src/main/java/com/kms/yxgh/sz/service/SzSuperviseEngineeringService.java

@@ -8,11 +8,9 @@ import com.kms.common.utils.UserUtils;
 import com.kms.yxgh.base.SzException;
 import com.kms.yxgh.base.enums.SuperviseEngineeringStatus;
 import com.kms.yxgh.base.enums.SuperviseProblemStatus;
-import com.kms.yxgh.sz.domain.SzSuperviseEngineering;
 import com.kms.yxgh.sz.domain.SzSuperviseProblem;
 import com.kms.yxgh.sz.domain.SzSuperviseTask;
 import com.kms.yxgh.sz.dto.*;
-import com.kms.yxgh.sz.mapper.SzSuperviseEngineeringMapper;
 import com.kms.yxgh.sz.mapper.SzSuperviseProblemMapper;
 import com.kms.yxgh.sz.mapper.SzSuperviseTaskMapper;
 import com.kms.yxgh.sz.mapper.SzSuperviseWayProjectItemMapper;
@@ -20,7 +18,6 @@ import com.kms.yxgh.util.BeanCopyUtils;
 import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.core.domain.entity.SysUser;
 import com.shuili.common.core.service.BaseService;
-import com.shuili.common.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -38,10 +35,9 @@ import java.util.stream.Collectors;
  */
 @Service
 @AllArgsConstructor
-public class SzSuperviseEngineeringService extends BaseService<SzSuperviseEngineeringMapper, SzSuperviseEngineering> {
+public class SzSuperviseEngineeringService extends BaseService<SzSuperviseProblemMapper, SzSuperviseProblem> {
 
     private final SzSuperviseTaskMapper taskMapper;
-    private final SzSuperviseProblemMapper problemMapper;
     private final SzSuperviseWayProjectItemMapper projectItemMapper;
 
     @Transactional(rollbackFor = Exception.class)
@@ -60,36 +56,28 @@ public class SzSuperviseEngineeringService extends BaseService<SzSuperviseEngine
         // 1.2 新增工程问题
         if (CollectionUtil.isNotEmpty(dto.getProblemList())) {
             List<SzSuperviseProblem> problemList = new ArrayList<>();
-            dto.getProblemList().stream().forEach(v -> {
-
-                v.getLevelList().forEach(level -> {
-                    SzSuperviseProblem problem = new SzSuperviseProblem();
-                    problem.setId(null);
-                    problem.setProjectId(v.getProjectId());
-                    problem.setTaskId(task.getId());
-                    problem.setProjectItemId(level.getProjectItemId());
-                    problem.setLevel(level.getLevel());
-                    // 监督检查工程填报提交后更新问题为下发
-                    if (SuperviseEngineeringStatus.SUBMIT.getValue().equals(dto.getState())) {
-                        problem.setStatus(SuperviseProblemStatus.DISTRIBUTE.getValue());
-                    }
-                    problemList.add(problem);
-                });
-                List<String> problemIds = v.getLevelList().stream().map(SzSuperviseEngineeringParamDto.ProblemLevelParam::getId).collect(Collectors.toList());
-                if (problemIds.size() > 0) {
-                    problemMapper.deleteBatchIds(problemIds);
+            dto.getProblemList().stream().forEach(level -> {
+                SzSuperviseProblem problem = new SzSuperviseProblem();
+                problem.setId(null);
+                problem.setProjectId(level.getProjectId());
+                problem.setTaskId(task.getId());
+                problem.setProjectItemId(level.getProjectItemId());
+                problem.setLevel(level.getLevel());
+                problem.setProblemDescribe(level.getProblemDescribe());
+                problem.setSiteSituationRecords(level.getSiteSituationRecords());
+                // 监督检查工程填报提交后更新问题为下发
+                if (SuperviseEngineeringStatus.SUBMIT.getValue().equals(dto.getState())) {
+                    problem.setStatus(SuperviseProblemStatus.DISTRIBUTE.getValue());
                 }
-                SzSuperviseEngineering engineering = new SzSuperviseEngineering();
-                engineering.setId(StringUtils.isNotEmpty(v.getId()) ? v.getId() : null);
-                engineering.setTaskId(task.getId());
-                engineering.setProjectId(v.getProjectId());
-                engineering.setProblemDescribe(v.getProblemDescribe());
-                engineering.setSiteSituationRecords(v.getSiteSituationRecords());
-                this.saveOrUpdate(engineering);
+                problemList.add(problem);
             });
+            List<String> problemIds = dto.getProblemList().stream().map(SzSuperviseEngineeringParamDto.ProblemParam::getId).collect(Collectors.toList());
+            if (problemIds.size() > 0) {
+                this.getBaseMapper().deleteBatchIds(problemIds);
+            }
             // 批量新增
             if (problemList.size() > 0) {
-                problemMapper.insertProblem(problemList);
+                this.getBaseMapper().insertProblem(problemList);
             }
         }
         taskMapper.updateById(task);
@@ -99,16 +87,10 @@ public class SzSuperviseEngineeringService extends BaseService<SzSuperviseEngine
 
     public SzSuperviseTaskDetailDto getDetailByTaskId(String taskId) {
         SzSuperviseTaskDetailDto dto = BeanCopyUtils.copy(getTaskProblemInfo(taskId), SzSuperviseTaskDetailDto.class);
-
-        // 1.1 获取水闸任务问题描述列表
-        List<SzSuperviseEngineering> engineeringList = this.list(Wrappers.<SzSuperviseEngineering>lambdaQuery()
-                .eq(SzSuperviseEngineering::getTaskId, taskId));
-        dto.setEngineeringList(BeanCopyUtils.copyList(engineeringList, SzSuperviseEngineeringDto.class));
-
-        // 1.4 获取水闸任务问题列表
+        // 获取水闸任务问题列表
         SzSuperviseProblemDto dtoProblem = new SzSuperviseProblemDto();
         dtoProblem.setTaskId(taskId);
-        List<SzSuperviseProblemDto> problemList = problemMapper.selectByListParam(dtoProblem);
+        List<SzSuperviseProblemDto> problemList = this.getBaseMapper().selectByListParam(dtoProblem);
         dto.setProblemList(problemList);
         return dto;
     }
@@ -136,24 +118,24 @@ public class SzSuperviseEngineeringService extends BaseService<SzSuperviseEngine
             problem.setConfirmUid(user.getId());
             problem.setConfirmTime(now);
         }
-
-        problemMapper.updateById(problem);
+        this.getBaseMapper().updateById(problem);
         return true;
     }
 
     public SzSuperviseProblem getProblemDetailById(String id) {
-        SzSuperviseProblem problem = problemMapper.selectOne(Wrappers.<SzSuperviseProblem>lambdaQuery()
+        SzSuperviseProblem problem = this.getBaseMapper().selectOne(Wrappers.<SzSuperviseProblem>lambdaQuery()
                 .eq(SzSuperviseProblem::getId, id));
         return problem;
     }
 
     public IPage<SzSuperviseProblemListDto> list(SearchParam<SzSuperviseProblemListDto> sp) {
         Page<SzSuperviseProblemListDto> page = new Page<>(sp.getPageNum(), sp.getPageSize());
-        return problemMapper.selectPage(page, sp.getData());
+        return this.getBaseMapper().selectPage(page, sp.getData());
     }
 
     /**
      * 获取水闸任务和水闸基本信息
+     *
      * @param taskId
      * @return
      */
@@ -172,19 +154,13 @@ public class SzSuperviseEngineeringService extends BaseService<SzSuperviseEngine
         // 获取问题信息
         SzSuperviseProblemDto dtoProblem = new SzSuperviseProblemDto();
         dtoProblem.setId(id);
-        List<SzSuperviseProblemDto> problemList = problemMapper.selectByListParam(dtoProblem);
+        List<SzSuperviseProblemDto> problemList = this.getBaseMapper().selectByListParam(dtoProblem);
         if (problemList.size() == 0) {
             throw new SzException("问题信息不存在，请确认id值是否正确");
         }
         SzSuperviseProblemDto problem = problemList.get(0);
         dto.setProblemDto(problem);
 
-        // 获取问题描述
-        SzSuperviseEngineering engineering = this.getOne(Wrappers.<SzSuperviseEngineering>lambdaQuery().eq(SzSuperviseEngineering::getTaskId, problem.getTaskId()).
-                eq(SzSuperviseEngineering::getProjectId, problem.getProjectId()));
-        dto.setProblemDescribe(engineering.getProblemDescribe());
-        dto.setSiteSituationRecords(engineering.getSiteSituationRecords());
-
         // 获取水闸和水闸任务信息
         SzSuperviseTaskCommonDto commonDto = getTaskProblemInfo(problem.getTaskId());
         BeanCopyUtils.copy(commonDto, dto);
@@ -203,6 +179,6 @@ public class SzSuperviseEngineeringService extends BaseService<SzSuperviseEngine
 
 
     public SzSuperviseProblemTotalDto countTotal(SzSuperviseProblemListDto dto) {
-        return problemMapper.countProblemTotal(dto);
+        return this.getBaseMapper().countProblemTotal(dto);
     }
 }

shuili-system/src/main/java/com/kms/yxgh/sz/service/SzSuperviseWayService.java

@@ -55,19 +55,24 @@ public class SzSuperviseWayService extends BaseService<SzSuperviseWayMapper, SzS
         return BeanCopyUtils.copy(superviseWay, SzSuperviseWayDto.class);
     }
 
-    /**
-     * 校验状态
-     */
+
     private void checkWayStatus(SzSuperviseWay way, String id, String updateStatus){
         SzSuperviseWay enable = getEnableWay();
         if (ObjectUtil.isNotNull(id)) {
             // 修改校验是否启用一条
-            SzSuperviseWayDto wayDto = getDetailById(id);
+            SzSuperviseWay wayDto = this.getById(id);
             if (wayDto.getId().equals(enable.getId()) && updateStatus.equals(SuperviseWayStatus.STOP.getValue())) {
                 throw new DfException("需启用一项管理办法");
             } else {
-                enable.setStatus(SuperviseWayStatus.STOP.getValue());
-                this.updateById(enable);
+                // 如果当前启用的监督检查办法不是正在修改的办法
+                if (!wayDto.getId().equals(enable.getId())) {
+                    wayDto.setStatus(updateStatus);
+                    this.updateById(wayDto);
+                    if(updateStatus.equals(SuperviseWayStatus.ENABLE.getValue())){
+                        enable.setStatus(SuperviseWayStatus.STOP.getValue());
+                        this.updateById(enable);
+                    }
+                }
             }
         }else{
             // 若新增没有启用的则设为默认启用的，否则为禁用

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

@@ -357,8 +357,6 @@ CREATE TABLE `bs_sgc_df_jdjcgc` (
     `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防监督检查工程编号',
     `TASK_ID` int NOT NULL COMMENT '监督检查任务ID',
     `PROJECT_ID` int NOT NULL COMMENT '监督检查办法项目ID',
-    `PROBLEM_DESCRIBE` text COLLATE utf8mb4_general_ci COMMENT '问题描述',
-    `SITE_SITUATION_RECORDS` text CHARACTER SET utf8mb4 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 '创建时间',
@@ -373,6 +371,8 @@ CREATE TABLE `bs_sgc_df_jdjcgcwt` (
     `PROJECT_ID` int NOT NULL COMMENT '监督检查办法项目ID',
     `PROJECT_ITEM_ID` int NOT NULL COMMENT '监督检查办法项目内容ID',
     `LEVEL` varchar(100) DEFAULT NULL COMMENT '问题等级',
+     `PROBLEM_DESCRIBE` text COLLATE utf8mb4_general_ci COMMENT '问题描述',
+     `SITE_SITUATION_RECORDS` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '现场记录情况',
     `STATUS` varchar(32) DEFAULT NULL COMMENT '状态',
     `HANDLE_RECORD` text COLLATE utf8mb4_general_ci COMMENT '处理记录',
     `HANDLE_SITUATION_RECORDS` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '处理记录情况',
@@ -417,7 +417,6 @@ CREATE TABLE `bs_sgc_df_dtsbr` (
     `WARNING_LEVEL` varchar(32) DEFAULT NULL COMMENT '预警等级',
     `WARNING_TIME` datetime DEFAULT NULL COMMENT '预警时间',
     `WARNING_DATA` varchar(100) COLLATE utf8mb4_general_ci COMMENT '预警数据',
-    `STATUS` int DEFAULT 0 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 '最近修改人',
@@ -425,6 +424,87 @@ CREATE TABLE `bs_sgc_df_dtsbr` (
     PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防动态检测记录表';
 
+CREATE TABLE `bs_sgc_df_bxgcxm` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '病险工程核查项目编号',
+    `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL 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 '创建时间',
+    `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='堤防病险工程核查项目表';
+
+CREATE TABLE `bs_sgc_df_bxgcxmnr` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防病险工程核查项目内容编号',
+    `PROJECT_ID` int NOT NULL COMMENT '病险工程核查项目ID',
+    `CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '检查内容',
+    `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注',
+    `CREATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+    `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间',
+    `UPDATE_UID` varchar(16) 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='堤防病险工程核查项目内容表';
+
+CREATE TABLE `bs_sgc_df_bxgcfz` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防病险工程核查分组编号',
+    `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '小组名称',
+		`DEPT_ID` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '单位id',
+    `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注',
+    `CREATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+    `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间',
+    `UPDATE_UID` varchar(16) 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='堤防病险工程核查分组表';
+
+CREATE TABLE `bs_sgc_df_bxgcfzcy` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防病险工程核查分组成员编号',
+		`GROUP_ID` int NOT NULL COMMENT '病险工程核查分组ID',
+		`GROUP_UID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '小组成员ID',
+		`GROUP_NAME` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '小组成员名称',
+		`DEPT_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '所属单位ID',
+    `CREATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+    `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间',
+    `UPDATE_UID` varchar(16) 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='堤防病险工程核查分组成员关系表';
+
+CREATE TABLE `bs_sgc_df_bxgcrw` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '病险工程核查任务编号',
+    `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '任务名称',
+	`GROUP_ID` int NOT NULL COMMENT '病险工程核查分组ID',
+    `DIKE_CODE` varchar(255)  COLLATE utf8mb4_general_ci COMMENT '堤防编码',
+    `START_TIME` datetime DEFAULT NULL COMMENT '开始时间',
+    `DONE_TIME` datetime DEFAULT NULL COMMENT '结束时间',
+    `CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '检查任务背景',
+    `STATE` varchar(50) DEFAULT NULL 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 '创建时间',
+    `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='堤防病险工程核查任务表';
+
+CREATE TABLE `bs_sgc_df_bxgcnrgl` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '病险工程项目任务关联编号',
+    `TASK_ID` int NOT NULL COMMENT '任务ID',
+    `PROJECT_ID` int NOT NULL COMMENT '项目ID',
+    `PROJECT_ITEM_ID` int NOT NULL COMMENT '项目内容ID',
+    `LEVEL` varchar(100) DEFAULT NULL COMMENT '问题等级',
+    `PROBLEM_DESCRIBE` text COLLATE utf8mb4_general_ci COMMENT '问题描述',
+    `SITE_SITUATION_RECORDS` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '现场记录情况',
+    `STATUS` varchar(32) DEFAULT 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='堤防病险工程项目任务关联表';
+
 
 
 CREATE TABLE `bs_sgc_sz_xs` (
@@ -688,19 +768,6 @@ CREATE TABLE `bs_sgc_sz_jdjcrw` (
     PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸监督检查任务管理表';
 
-CREATE TABLE `bs_sgc_sz_jdjcgc` (
-    `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸监督检查工程编号',
-    `TASK_ID` int NOT NULL COMMENT '监督检查任务ID',
-    `PROJECT_ID` int NOT NULL COMMENT '监督检查办法项目ID',
-    `PROBLEM_DESCRIBE` text COLLATE utf8mb4_general_ci COMMENT '问题描述',
-    `SITE_SITUATION_RECORDS` text CHARACTER SET utf8mb4 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 '创建时间',
-    `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='水闸监督检查工程管理表';
 
 CREATE TABLE `bs_sgc_sz_jdjcgcwt` (
     `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸监督检查工程内容编号',
@@ -708,6 +775,8 @@ CREATE TABLE `bs_sgc_sz_jdjcgcwt` (
     `PROJECT_ID` int NOT NULL COMMENT '监督检查办法项目ID',
     `PROJECT_ITEM_ID` int NOT NULL COMMENT '监督检查办法项目内容ID',
     `LEVEL` varchar(100) DEFAULT NULL COMMENT '问题等级',
+    `PROBLEM_DESCRIBE` text COLLATE utf8mb4_general_ci COMMENT '问题描述',
+    `SITE_SITUATION_RECORDS` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '现场记录情况',
     `STATUS` varchar(32) DEFAULT NULL COMMENT '状态',
     `HANDLE_RECORD` text COLLATE utf8mb4_general_ci COMMENT '处理记录',
     `HANDLE_SITUATION_RECORDS` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '处理记录情况',
@@ -792,6 +861,90 @@ CREATE TABLE `bs_sgc_sz_czjl` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸操作记录表';
 
 
+CREATE TABLE `bs_sgc_sz_bxgcxm` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '病险工程核查项目编号',
+    `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL 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 '创建时间',
+    `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='水闸病险工程核查项目表';
+
+CREATE TABLE `bs_sgc_sz_bxgcxmnr` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '病险工程核查项目内容编号',
+    `PROJECT_ID` int NOT NULL COMMENT '病险工程核查项目ID',
+    `CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '检查内容',
+    `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注',
+    `CREATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+    `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间',
+    `UPDATE_UID` varchar(16) 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='水闸病险工程核查项目内容表';
+
+
+CREATE TABLE `bs_sgc_sz_bxgcfz` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '病险工程核查分组编号',
+    `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '小组名称',
+		`DEPT_ID` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '单位id',
+    `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注',
+    `CREATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+    `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间',
+    `UPDATE_UID` varchar(16) 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='水闸病险工程核查分组表';
+
+
+CREATE TABLE `bs_sgc_sz_bxgcfzcy` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '病险工程核查分组成员编号',
+	`GROUP_ID` int NOT NULL COMMENT '病险工程核查分组ID',
+	`GROUP_UID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '小组成员ID',
+	`GROUP_NAME` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '小组成员名称',
+	`DEPT_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '所属单位ID',
+    `CREATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+    `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间',
+    `UPDATE_UID` varchar(16) 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='水闸病险工程核查分组成员关系表';
+
+CREATE TABLE `bs_sgc_sz_bxgcrw` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '病险工程核查任务编号',
+    `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '任务名称',
+	`GROUP_ID` int NOT NULL COMMENT '病险工程核查分组ID',
+    `WAGA_CODE` varchar(255)  COLLATE utf8mb4_general_ci COMMENT '水闸编码',
+    `START_TIME` datetime DEFAULT NULL COMMENT '开始时间',
+    `DONE_TIME` datetime DEFAULT NULL COMMENT '结束时间',
+    `CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '检查任务背景',
+    `STATE` varchar(50) DEFAULT NULL 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 '创建时间',
+    `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='水闸病险工程核查任务表';
+
+CREATE TABLE `bs_sgc_sz_bxgcnrgl` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '病险工程项目任务关联编号',
+    `TASK_ID` int NOT NULL COMMENT '任务ID',
+    `PROJECT_ID` int NOT NULL COMMENT '项目ID',
+    `PROJECT_ITEM_ID` int NOT NULL COMMENT '项目内容ID',
+    `LEVEL` varchar(100) DEFAULT NULL COMMENT '问题等级',
+    `PROBLEM_DESCRIBE` text COLLATE utf8mb4_general_ci COMMENT '问题描述',
+    `SITE_SITUATION_RECORDS` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '现场记录情况',
+    `STATUS` varchar(32) DEFAULT 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='水闸病险工程项目任务关联表';
+
+
 CREATE OR REPLACE VIEW `v_bs_sgc_dtsbr` AS
 SELECT df.`DIKE_CODE` AS `CODE`,gc.`DIKE_NAME` AS `NAME`,'1' AS `TYPE`,df.`STATUS` AS `STATUS`,gc.`ADCD` AS ADCD, df.`WARNING_TYPE` AS `WARNING_TYPE`, df.`WARNING_LEVEL` AS `WARNING_LEVEL`, df.`WARNING_TIME` AS `WARNING_TIME`
 FROM `bs_sgc_df_dtsbr` AS df

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

@@ -161,19 +161,6 @@ CREATE TABLE `bs_sgc_df_jdjcrw` (
     PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防监督检查任务管理表';
 
-CREATE TABLE `bs_sgc_df_jdjcgc` (
-    `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防监督检查工程编号',
-    `TASK_ID` int NOT NULL COMMENT '监督检查任务ID',
-    `PROJECT_ID` int NOT NULL COMMENT '监督检查办法项目ID',
-    `PROBLEM_DESCRIBE` text COLLATE utf8mb4_general_ci COMMENT '问题描述',
-    `SITE_SITUATION_RECORDS` text CHARACTER SET utf8mb4 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 '创建时间',
-    `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='堤防监督检查工程管理表';
 
 CREATE TABLE `bs_sgc_df_jdjcgcwt` (
     `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防监督检查工程内容编号',
@@ -181,6 +168,8 @@ CREATE TABLE `bs_sgc_df_jdjcgcwt` (
     `PROJECT_ID` int NOT NULL COMMENT '监督检查办法项目ID',
     `PROJECT_ITEM_ID` int NOT NULL COMMENT '监督检查办法项目内容ID',
     `LEVEL` varchar(100) DEFAULT NULL COMMENT '问题等级',
+    `PROBLEM_DESCRIBE` text COLLATE utf8mb4_general_ci COMMENT '问题描述',
+    `SITE_SITUATION_RECORDS` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '现场记录情况',
     `STATUS` varchar(32) DEFAULT NULL COMMENT '状态',
     `HANDLE_RECORD` text COLLATE utf8mb4_general_ci COMMENT '处理记录',
     `HANDLE_SITUATION_RECORDS` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '处理记录情况',
@@ -198,6 +187,89 @@ CREATE TABLE `bs_sgc_df_jdjcgcwt` (
     PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='堤防监督检查工程问题表';
 
+CREATE TABLE `bs_sgc_df_bxgcxm` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '病险工程核查项目编号',
+    `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL 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 '创建时间',
+    `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='堤防病险工程核查项目表';
+
+CREATE TABLE `bs_sgc_df_bxgcxmnr` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防病险工程核查项目内容编号',
+    `PROJECT_ID` int NOT NULL COMMENT '病险工程核查项目ID',
+    `CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '检查内容',
+    `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注',
+    `CREATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+    `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间',
+    `UPDATE_UID` varchar(16) 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='堤防病险工程核查项目内容表';
+
+CREATE TABLE `bs_sgc_df_bxgcfz` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防病险工程核查分组编号',
+    `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '小组名称',
+	`DEPT_ID` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '单位id',
+    `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注',
+    `CREATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+    `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间',
+    `UPDATE_UID` varchar(16) 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='堤防病险工程核查分组表';
+
+CREATE TABLE `bs_sgc_df_bxgcfzcy` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '堤防病险工程核查分组成员编号',
+		`GROUP_ID` int NOT NULL COMMENT '病险工程核查分组ID',
+		`GROUP_UID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '小组成员ID',
+		`GROUP_NAME` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '小组成员名称',
+		`DEPT_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '所属单位ID',
+    `CREATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+    `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间',
+    `UPDATE_UID` varchar(16) 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='堤防病险工程核查分组成员关系表';
+
+CREATE TABLE `bs_sgc_df_bxgcrw` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '病险工程核查任务编号',
+    `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '任务名称',
+	`GROUP_ID` int NOT NULL COMMENT '病险工程核查分组ID',
+    `DIKE_CODE` varchar(255)  COLLATE utf8mb4_general_ci COMMENT '堤防编码',
+    `START_TIME` datetime DEFAULT NULL COMMENT '开始时间',
+    `DONE_TIME` datetime DEFAULT NULL COMMENT '结束时间',
+    `CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '检查任务背景',
+    `STATE` varchar(50) DEFAULT NULL 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 '创建时间',
+    `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='堤防病险工程核查任务表';
+
+CREATE TABLE `bs_sgc_df_bxgcnrgl` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '病险工程项目任务关联编号',
+    `TASK_ID` int NOT NULL COMMENT '任务ID',
+    `PROJECT_ID` int NOT NULL COMMENT '项目ID',
+    `PROJECT_ITEM_ID` int NOT NULL COMMENT '项目内容ID',
+    `LEVEL` varchar(100) DEFAULT NULL COMMENT '问题等级',
+    `PROBLEM_DESCRIBE` text COLLATE utf8mb4_general_ci COMMENT '问题描述',
+    `SITE_SITUATION_RECORDS` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '现场记录情况',
+    `STATUS` varchar(32) DEFAULT 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='堤防病险工程项目任务关联表';
+
+
+
 
 
 CREATE TABLE `bs_sgc_sz_jdjcbf` (
@@ -262,26 +334,14 @@ CREATE TABLE `bs_sgc_sz_jdjcrw` (
     PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸监督检查任务管理表';
 
-CREATE TABLE `bs_sgc_sz_jdjcgc` (
-    `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸监督检查工程编号',
-    `TASK_ID` int NOT NULL COMMENT '监督检查任务ID',
-    `PROJECT_ID` int NOT NULL COMMENT '监督检查办法项目ID',
-    `PROBLEM_DESCRIBE` text COLLATE utf8mb4_general_ci COMMENT '问题描述',
-    `SITE_SITUATION_RECORDS` text CHARACTER SET utf8mb4 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 '创建时间',
-    `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='水闸监督检查工程管理表';
-
 CREATE TABLE `bs_sgc_sz_jdjcgcwt` (
     `ID` int NOT NULL AUTO_INCREMENT COMMENT '水闸监督检查工程内容编号',
     `TASK_ID` int NOT NULL COMMENT '监督检查任务ID',
     `PROJECT_ID` int NOT NULL COMMENT '监督检查办法项目ID',
     `PROJECT_ITEM_ID` int NOT NULL COMMENT '监督检查办法项目内容ID',
     `LEVEL` varchar(100) DEFAULT NULL COMMENT '问题等级',
+     `PROBLEM_DESCRIBE` text COLLATE utf8mb4_general_ci COMMENT '问题描述',
+    `SITE_SITUATION_RECORDS` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '现场记录情况',
     `STATUS` varchar(32) DEFAULT NULL COMMENT '状态',
     `HANDLE_RECORD` text COLLATE utf8mb4_general_ci COMMENT '处理记录',
     `HANDLE_SITUATION_RECORDS` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '处理记录情况',
@@ -400,6 +460,88 @@ CREATE TABLE `bs_sgc_sz_czjl` (
     PRIMARY KEY (`ID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸操作记录表';
 
+CREATE TABLE `bs_sgc_sz_bxgcxm` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '病险工程核查项目编号',
+    `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL 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 '创建时间',
+    `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='水闸病险工程核查项目表';
+
+CREATE TABLE `bs_sgc_sz_bxgcxmnr` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '病险工程核查项目内容编号',
+    `PROJECT_ID` int NOT NULL COMMENT '病险工程核查项目ID',
+    `CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '检查内容',
+    `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注',
+    `CREATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+    `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间',
+    `UPDATE_UID` varchar(16) 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='水闸病险工程核查项目内容表';
+
+
+CREATE TABLE `bs_sgc_sz_bxgcfz` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '病险工程核查分组编号',
+    `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '小组名称',
+		`DEPT_ID` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '单位id',
+    `REMARK` text COLLATE utf8mb4_general_ci COMMENT '备注',
+    `CREATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+    `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间',
+    `UPDATE_UID` varchar(16) 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='水闸病险工程核查分组表';
+
+
+CREATE TABLE `bs_sgc_sz_bxgcfzcy` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '病险工程核查分组成员编号',
+	`GROUP_ID` int NOT NULL COMMENT '病险工程核查分组ID',
+	`GROUP_UID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '小组成员ID',
+	`GROUP_NAME` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '小组成员名称',
+	`DEPT_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '所属单位ID',
+    `CREATE_UID` varchar(16) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+    `CREATE_TIME` datetime DEFAULT NULL COMMENT '创建时间',
+    `UPDATE_UID` varchar(16) 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='水闸病险工程核查分组成员关系表';
+
+CREATE TABLE `bs_sgc_sz_bxgcrw` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '病险工程核查任务编号',
+    `NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '任务名称',
+	`GROUP_ID` int NOT NULL COMMENT '病险工程核查分组ID',
+    `WAGA_CODE` varchar(255)  COLLATE utf8mb4_general_ci COMMENT '水闸编码',
+    `START_TIME` datetime DEFAULT NULL COMMENT '开始时间',
+    `DONE_TIME` datetime DEFAULT NULL COMMENT '结束时间',
+    `CONTENT` varchar(500) COLLATE utf8mb4_general_ci COMMENT '检查任务背景',
+    `STATE` varchar(50) DEFAULT NULL 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 '创建时间',
+    `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='水闸病险工程核查任务表';
+
+CREATE TABLE `bs_sgc_sz_bxgcnrgl` (
+    `ID` int NOT NULL AUTO_INCREMENT COMMENT '病险工程项目任务关联编号',
+    `TASK_ID` int NOT NULL COMMENT '任务ID',
+    `PROJECT_ID` int NOT NULL COMMENT '项目ID',
+    `PROJECT_ITEM_ID` int NOT NULL COMMENT '项目内容ID',
+    `LEVEL` varchar(100) DEFAULT NULL COMMENT '问题等级',
+    `PROBLEM_DESCRIBE` text COLLATE utf8mb4_general_ci COMMENT '问题描述',
+    `SITE_SITUATION_RECORDS` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '现场记录情况',
+    `STATUS` varchar(32) DEFAULT 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='水闸病险工程项目任务关联表';
 
 CREATE OR REPLACE VIEW `v_bs_sgc_dtsbr` AS
 SELECT df.`DIKE_CODE` AS `CODE`,gc.`DIKE_NAME` AS `NAME`,'1' AS `TYPE`,df.`STATUS` AS `STATUS`,gc.`ADCD` AS ADCD, df.`WARNING_TYPE` AS `WARNING_TYPE`, df.`WARNING_LEVEL` AS `WARNING_LEVEL`, df.`WARNING_TIME` AS `WARNING_TIME`