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

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

@@ -41,6 +41,19 @@ public class DfSuperviseProblemListDto {
     @ApiModelProperty(value = "行政区划")
     private String adcd;
 
+    /**
+     * 起点行政区划
+     */
+    @ApiModelProperty("起点行政区划")
+    private String adcdStart;
+
+    /**
+     * 终点行政区划
+     */
+    @ApiModelProperty("终点行政区划")
+    private String adcdEnd;
+
+
     /**
      * 工程
      */

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

@@ -90,7 +90,7 @@ public class DfSuperviseTaskDto {
      * 状态（巡查、报告）
      */
     @ApiModelProperty(value = "状态（巡查、报告）")
-    private String STATE;
+    private String state;
 
     /**
      * 巡查人员ID

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

@@ -55,14 +55,15 @@ public interface DfSuperviseProblemMapper extends BaseMapper<DfSuperviseProblem>
     class DfSuperviseProblemProvider {
         public String selectPage(final Map<String, Object> param) {
             return new SQL() {{
-                SELECT("wt.id,xm.name as projectName,rw.name,nr.content,xx.adcd,xx.dikeName,xx.engineeringManagementUnit,wt.level, wt.status");
+                SELECT("wt.id,xm.name as projectName,rw.name,nr.content,xx.adcd,xx.DIKE_CODE as dikeCode, xx.DIKE_NAME as dikeName," +
+                        "xx.engineering_management_unit as engineeringManagementUnit,xx.ADCD_START as adcdStart, xx.ADCD_END as adcdEnd,wt.level, wt.status");
                 FROM("bs_sgc_df_jdjcgcwt wt");
                 LEFT_OUTER_JOIN("bs_sgc_df_jdjcbfxm xm on wt.project_id = xm.id");
                 LEFT_OUTER_JOIN("bs_sgc_df_jdjcbfxmnr nr on wt.project_item_id = nr.id");
                 LEFT_OUTER_JOIN("bs_sgc_df_jdjcrw rw on wt.TASK_ID = rw.id");
-                LEFT_OUTER_JOIN("(SELECT DISTINCT xx.ID,xx.DIKE_CODE AS dikeCode,xx.DIKE_NAME AS dikeName,xx.adcd,gl.engineering_management_unit  as engineeringManagementUnit\n" +
+                LEFT_OUTER_JOIN("(SELECT DISTINCT xx.ID,xx.DIKE_CODE,xx.DIKE_NAME,xx.ADCD_START,xx.ADCD_END,xx.adcd,gl.engineering_management_unit " +
                         " FROM bs_sgc_df_gcda xx 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) xx ON rw.dike_code = xx.dikeCode");
+                        " WHERE xx.EXPR_DATE IS NULL AND gl.EXPR_DATE IS NULL) xx ON rw.dike_code = xx.DIKE_CODE");
                 WHERE("1=1");
                 WHERE("rw.state =1");
 
@@ -74,7 +75,7 @@ public interface DfSuperviseProblemMapper extends BaseMapper<DfSuperviseProblem>
                     }
                     // 管理单位
                     if (StringUtils.isNotBlank(dto.getEngineeringManagementUnit())) {
-                        WHERE("gl.engineering_management_unit LIKE CONCAT('%', #{dto.engineeringManagementUnit}, '%')");
+                        WHERE("xx.engineering_management_unit LIKE CONCAT('%', #{dto.engineeringManagementUnit}, '%')");
                     }
                     // 工程对象
                     if (StringUtils.isNotBlank(dto.getDikeName())) {
@@ -111,7 +112,7 @@ public interface DfSuperviseProblemMapper extends BaseMapper<DfSuperviseProblem>
             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 ");
+                        "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");

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

@@ -38,10 +38,10 @@ public interface DfSuperviseTaskMapper extends BaseMapper<DfSuperviseTask> {
         public String selectPage(final Map<String, Object> param) {
             return new SQL() {{
                 SELECT("rw.id, rw.name, rw.CREATE_TIME as createTime, rw.UPDATE_TIME as updateTime,xx.DIKE_NAME as dikeName,gl.ENGINEERING_MANAGEMENT_UNIT as engineeringManagementUnit," +
-                        "rw.dike_code as dikeCode, rw.TASK_TIME as taskTime, rw.INSPECTORS as inspectors, rw.WAY_ID as wayId, rw.START_TIME as startTime, rw.DONE_TIME as doneTime");
+                        "rw.dike_code as dikeCode, rw.TASK_TIME as taskTime, rw.INSPECTORS as inspectors, rw.WAY_ID as wayId, rw.START_TIME as startTime, rw.DONE_TIME as doneTime, rw.state ");
                 FROM("bs_sgc_df_jdjcrw rw");
                 LEFT_OUTER_JOIN("bs_sgc_df_gcda xx ON xx.dike_code = rw.dike_code");
-                LEFT_OUTER_JOIN("bs_sgc_df_gcgl gl on pj.dike_code = df.dike_code ");
+                LEFT_OUTER_JOIN("bs_sgc_df_gcgl gl on xx.dike_code = gl.dike_code ");
                 WHERE("gl.EXPR_DATE is null");
                 WHERE("xx.EXPR_DATE is null");
                 if (param.get("dto") != null) {

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

@@ -89,13 +89,10 @@ public class DfSuperviseWayService extends BaseService<DfSuperviseWayMapper, DfS
     public Boolean copyInfo(String id) {
         // 1.1 查询监督检查办法对象
         DfSuperviseWay superviseWay = this.getById(id);
-        // 1.2 复制文件
-        if (StringUtils.isNotBlank(superviseWay.getSuperviseCheckWay())) {
-            copyFile(superviseWay.getSuperviseCheckWay(), superviseWay);
-        }
         superviseWay.setName("新建管理办法");
         superviseWay.setId(null);
-        superviseWay.setStatus("1");
+        superviseWay.setStatus(SuperviseWayStatus.STOP.getValue());
+        superviseWay.setSuperviseCheckWay(superviseWay.getSuperviseCheckWay());
         this.saveOrUpdate(superviseWay);
 
         // 1.3 查询堤防监督检查办法项目

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

@@ -90,7 +90,7 @@ public class SzSuperviseTaskDto {
      * 状态（巡查、报告）
      */
     @ApiModelProperty(value = "状态（0:巡查、1:报告）")
-    private String STATE;
+    private String state;
 
     /**
      * 巡查人员ID

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

@@ -55,14 +55,14 @@ public interface SzSuperviseProblemMapper extends BaseMapper<SzSuperviseProblem>
     class SzSuperviseProblemProvider {
         public String selectPage(final Map<String, Object> param) {
             return new SQL() {{
-                SELECT("wt.id,xm.name as projectName,rw.name,nr.content,xx.adcd,xx.wagaName,xx.engineeringManagementUnit,wt.level, wt.status");
+                SELECT("wt.id,xm.name as projectName,rw.name,nr.content,xx.adcd,xx.WAGA_NAME AS wagaName,xx.WAGA_CODE as wagaCode,xx.engineering_management_unit as engineeringManagementUnit,wt.level, wt.status");
                 FROM("bs_sgc_sz_jdjcgcwt wt");
                 LEFT_OUTER_JOIN("bs_sgc_sz_jdjcbfxm xm on wt.project_id = xm.id");
                 LEFT_OUTER_JOIN("bs_sgc_sz_jdjcbfxmnr nr on wt.project_item_id = nr.id");
                 LEFT_OUTER_JOIN("bs_sgc_sz_jdjcrw rw on wt.TASK_ID = rw.id");
-                LEFT_OUTER_JOIN("(SELECT DISTINCT xx.ID,xx.WAGA_CODE as wagaCode,xx.WAGA_NAME AS wagaName,xx.adcd,gl.engineering_management_unit  as engineeringManagementUnit " +
+                LEFT_OUTER_JOIN("(SELECT DISTINCT xx.ID,xx.WAGA_CODE,xx.WAGA_NAME, xx.adcd,gl.engineering_management_unit " +
                         " FROM bs_sgc_sz_jbxx xx 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) xx ON rw.WAGA_CODE = xx.wagaCode");
+                        " WHERE xx.EXPR_DATE IS NULL AND gl.EXPR_DATE IS NULL) xx ON rw.WAGA_CODE = xx.WAGA_CODE");
                 WHERE("1=1");
                 WHERE("rw.state =1");
 
@@ -74,7 +74,7 @@ public interface SzSuperviseProblemMapper extends BaseMapper<SzSuperviseProblem>
                     }
                     // 管理单位
                     if (StringUtils.isNotBlank(dto.getEngineeringManagementUnit())) {
-                        WHERE("gl.engineering_management_unit LIKE CONCAT('%', #{dto.engineeringManagementUnit}, '%')");
+                        WHERE("xx.engineering_management_unit LIKE CONCAT('%', #{dto.engineeringManagementUnit}, '%')");
                     }
                     // 工程对象
                     if (StringUtils.isNotBlank(dto.getWagaName())) {

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

@@ -89,13 +89,10 @@ public class SzSuperviseWayService extends BaseService<SzSuperviseWayMapper, SzS
     public Boolean copyInfo(String id) {
         // 1.1 查询监督检查办法对象
         SzSuperviseWay superviseWay = this.getById(id);
-        // 1.2 复制文件
-        if (StringUtils.isNotBlank(superviseWay.getSuperviseCheckWay())) {
-            copyFile(superviseWay.getSuperviseCheckWay(), superviseWay);
-        }
         superviseWay.setName("新建管理办法");
         superviseWay.setId(null);
-        superviseWay.setStatus("1");
+        superviseWay.setStatus(SuperviseWayStatus.STOP.getValue());
+        superviseWay.setSuperviseCheckWay(superviseWay.getSuperviseCheckWay());
         this.saveOrUpdate(superviseWay);