diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhStatisticsQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhStatisticsQueDto.java index 5ca86d57..d79c6971 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhStatisticsQueDto.java +++ b/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 { - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") +public class DfYhStatisticsQueDto implements IAdcd { + private static final long serialVersionUID = 1L; + @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; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java index 17bdb612..6567da97 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java @@ -30,13 +30,13 @@ public interface DfRecordMapper extends BaseMapper { "select count(*) from bs_sgc_df_xsjhjlz where RECORD_ID " + "in ( "+ "select jl.id from bs_sgc_df_xsjhjl as jl "+ - " "+ + " "+ "left join att_dike_base base on base.dike_code=jl.dike_code and df.adcd like concat(#{dto.adcdQx}, '%') "+ " "+ "group by jl.DIKE_CODE,jl.id "+ ") "+ "where 1=1 "+ - " "+ + " "+ "AND (DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') >= DATE_FORMAT(#{dto.patrolStart} , '%Y-%m-%d %H:%i:%s') "+ "AND DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') <= DATE_FORMAT(#{dto.patrolEnd} , '%Y-%m-%d %H:%i:%s')) "+ " " + @@ -53,11 +53,11 @@ public interface DfRecordMapper extends BaseMapper { @Select("") diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java index cbf91bb3..264fd5e2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java @@ -81,6 +81,11 @@ public class DfRecordService extends BaseService { dto.setHandleStatus(2); DfYhHiddenDangerModel clModel = baseMapper.clfNumberData(dto); + + + + + return dfYhCharHiddenDangerDto; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java index 6ea57067..73951a99 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java @@ -60,10 +60,10 @@ public class DfYhRecordService extends DefaultApprovalBusinessService xList =new ArrayList<>(); ListyAxisList=new ArrayList<>(); + List seriesList =new ArrayList<>(); for (Map.Entry> entry : groupingByList.entrySet()) { // 设置 x轴 xList.add(entry.getKey()); - List 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