fix:工程巡查概况统计

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

@@ -1,5 +1,6 @@
 package com.kms.yxgh.df.dto;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.kms.yxgh.common.dto.IAdcd;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,11 +15,13 @@ import lombok.Data;
 
 @Data
 @ApiModel("责任人巡查情况概览统计")
-public class DfYhStatisticsQueDto {
+public class DfYhStatisticsQueDto implements IAdcd {
-
+    private static final long serialVersionUID = 1L;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("查询开始时间 yyyy-MM-dd HH:mm:ss")
     private String patrolStart;
-
     @ApiModelProperty("查询结束时间 yyyy-MM-dd HH:mm:ss")
     private String patrolEnd;
+
+    @ApiModelProperty("地区code")
+    private String adcd;
 }

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

@@ -30,13 +30,13 @@ public interface DfRecordMapper extends BaseMapper<DfRecord> {
         "select count(*) from bs_sgc_df_xsjhjlz where RECORD_ID " +
         "in (   "+
         "select jl.id from bs_sgc_df_xsjhjl  as jl "+
-        "<if test='dto.adcdQx != null and searchDto.adcdQx != \"\"'> "+
+        "<if test='dto.adcdQx != null and dto.adcdQx != \"\"'> "+
         "left join att_dike_base base on base.dike_code=jl.dike_code and df.adcd like concat(#{dto.adcdQx}, '%')  "+
         "</if> "+
         "group by jl.DIKE_CODE,jl.id "+
         ") "+
         "where 1=1  "+
-        "<if test='dto.patrolStart != null and searchDto.patrolEnd != \"\"'> "+
+        "<if test='dto.patrolStart != null and dto.patrolEnd != \"\"'> "+
         "AND (DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{dto.patrolStart} , '%Y-%m-%d %H:%i:%s') "+
         "AND DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(#{dto.patrolEnd} , '%Y-%m-%d %H:%i:%s')) "+
         "</if> " +
@@ -53,11 +53,11 @@ public interface DfRecordMapper extends BaseMapper<DfRecord> {
     @Select("<script>" +
             "select adb.adcd,lz.problem,count(1) as count from bs_sgc_df_xsjhjlz as lz  "+
             "left join bs_sgc_df_xsjhjl  hj on hj.id=lz.RECORD_ID "+
-            "<if test='dto.adcdQx != null and searchDto.adcdQx != \"\"'> "+
+            "<if test='dto.adcdQx != null and dto.adcdQx != \"\"'> "+
             "left join att_dike_base base on base.dike_code=hj.dike_code and base.adcd like concat(#{dto.adcdQx}, '%')  "+
             "</if> "+
             "where 1=1  "+
-            "<if test='dto.patrolStart != null and searchDto.patrolEnd != \"\"'> "+
+            "<if test='dto.patrolStart != null and dto.patrolEnd != \"\"'> "+
             "AND (DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{dto.patrolStart} , '%Y-%m-%d %H:%i:%s') "+
             "AND DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(#{dto.patrolEnd} , '%Y-%m-%d %H:%i:%s')) "+
             "</if> " +
@@ -71,14 +71,14 @@ public interface DfRecordMapper extends BaseMapper<DfRecord> {
     @Select("<script>" +
             "select adb.adcd,lz.handle_status,count(1) as count from bs_sgc_df_xsjhjlz as lz  "+
             "left join bs_sgc_df_xsjhjl  hj on hj.id=lz.RECORD_ID "+
-            "<if test='dto.adcdQx != null and searchDto.adcdQx != \"\"'> "+
+            "<if test='dto.adcdQx != null and dto.adcdQx != \"\"'> "+
             "left join att_dike_base base on base.dike_code=hj.dike_code and base.adcd like concat(#{dto.adcdQx}, '%')  "+
             "</if>"+
             "<if test='dto.handleStatus != null  \"\"'> " +
             "AND hj.handle_status=#{dto.handleStatus} "+
             "</if> " +
             "where 1=1  "+
-            "<if test='dto.patrolStart != null and searchDto.patrolEnd != \"\"'> "+
+            "<if test='dto.patrolStart != null and dto.patrolEnd != \"\"'> "+
             "AND (DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{dto.patrolStart} , '%Y-%m-%d %H:%i:%s') "+
             "AND DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(#{dto.patrolEnd} , '%Y-%m-%d %H:%i:%s')) "+
             "</if> " +

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

@@ -90,8 +90,8 @@ public interface DfYhRecordMapper extends BaseMapper<DfYhRecord> {
             "AND (DATE_FORMAT(bsdx.create_time, '%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{dto.patrolStart} , '%Y-%m-%d %H:%i:%s') "+
             "AND DATE_FORMAT(bsdx.create_time, '%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(#{dto.patrolEnd} , '%Y-%m-%d %H:%i:%s')) "+
             "</if> " +
-            "<if test='dto.adcdQx != null and searchDto.adcdQx != \"\"'> "+
+            "<if test='dto.adcdQx != null and dto.adcdQx != \"\"'> "+
-            "adb.adcd like concat(#{dto.adcdQx}, '%')  "+
+            "AND adb.adcd like concat(#{dto.adcdQx}, '%')  "+
             "</if> "+
             "group by adb.adcd ,bsdx.duty_holder_type "+
             "</script>")

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

@@ -81,6 +81,11 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
         dto.setHandleStatus(2);
         DfYhHiddenDangerModel clModel = baseMapper.clfNumberData(dto);
 
+
+
+
+
+
         return dfYhCharHiddenDangerDto;
     }
 

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

@@ -60,10 +60,10 @@ public class DfYhRecordService extends DefaultApprovalBusinessService<DfYhRecord
 
         List<String> xList =new ArrayList<>();
         List<DfYhCharInfoDto.YAxis>yAxisList=new ArrayList<>();
+        List<DfYhCharInfoDto.Series> seriesList =new ArrayList<>();
         for (Map.Entry<String, List<DfYhStatisticsModelDto>> entry : groupingByList.entrySet()) {
             // 设置 x轴
             xList.add(entry.getKey());
-            List<DfYhCharInfoDto.Series> seriesList =new ArrayList<>();
             for (DfYhStatisticsModelDto it : entry.getValue()) {
                 DfYhCharInfoDto.Series series=new DfYhCharInfoDto.Series();
                 series.setCount(it.getCount());
@@ -75,6 +75,7 @@ public class DfYhRecordService extends DefaultApprovalBusinessService<DfYhRecord
             yAxisInfo.setName("次数");
             yAxisInfo.setUnit("个");
             yAxisInfo.setSeries(seriesList);
+            yAxisList.add(yAxisInfo);
         }
         dtoInfo.setYAxis(yAxisList);
         dtoInfo.setXAxis(xList);