From f4299fc1464d47b7f071d3ff07ac979e5786e872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Mon, 17 Mar 2025 20:39:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/df/mapper/DfCheckingProblemV2Mapper.java | 4 ++-- .../src/main/java/com/kms/yxgh/dw/dto/DwProblemV2Dto.java | 5 +++++ .../src/main/java/com/kms/yxgh/dw/dto/DwYhDetailV2Dto.java | 4 ++-- .../src/main/java/com/kms/yxgh/dw/dto/DwYhListV2Dto.java | 7 +++++++ .../com/kms/yxgh/dw/mapper/DwCheckingProblemV2Mapper.java | 4 ++-- .../com/kms/yxgh/sz/mapper/SzCheckingProblemV2Mapper.java | 4 ++-- 6 files changed, 20 insertions(+), 8 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingProblemV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingProblemV2Mapper.java index 626bbf32..6b8e3533 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingProblemV2Mapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingProblemV2Mapper.java @@ -66,8 +66,8 @@ public interface DfCheckingProblemV2Mapper extends BaseMapper " + "select DATE_FORMAT(create_time, '%Y-%m-%d') as myDate,count(*) as mySum from bs_sgc_df_xcqx where 1=1 " + - " and xm.create_time >= #{data.startTime} " + - " and xm.create_time <= #{data.endTime} " + + " and create_time >= #{data.startTime} " + + " and create_time <= #{data.endTime} " + "" + "and dike_code = #{data.code} " + "" + diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwProblemV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwProblemV2Dto.java index 85bddbd8..c8ad4aae 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwProblemV2Dto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwProblemV2Dto.java @@ -14,6 +14,11 @@ import java.util.Date; @ApiModel("工程巡查问题v2") public class DwProblemV2Dto { + @ApiModelProperty("工程编码") + private String dikeCode; + @ApiModelProperty("工程名称") + private String dikeName; + /** * 是否可以领单 1是 0否 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwYhDetailV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwYhDetailV2Dto.java index 3cdd2565..81f439ec 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwYhDetailV2Dto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwYhDetailV2Dto.java @@ -75,14 +75,14 @@ public class DwYhDetailV2Dto { * 工程代码 */ @ApiModelProperty("工程代码") - private String projectCode; + private String dikeCode; /** * 工程代码名称 */ @ApiModelProperty("工程代码名称") - private String projectName; + private String dikeName; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwYhListV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwYhListV2Dto.java index d3dc7d79..4cb3392a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwYhListV2Dto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/dw/dto/DwYhListV2Dto.java @@ -23,6 +23,13 @@ public class DwYhListV2Dto { @ApiModelProperty("巡查项目ID") private String checkingId; + @ApiModelProperty("堤防code") + private String dikeCode; + + @ApiModelProperty("堤防名称") + private String dikeName; + + @ApiModelProperty("记录id") private String recordId; diff --git a/shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwCheckingProblemV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwCheckingProblemV2Mapper.java index d042fff1..802974e1 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwCheckingProblemV2Mapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/dw/mapper/DwCheckingProblemV2Mapper.java @@ -68,8 +68,8 @@ public interface DwCheckingProblemV2Mapper extends BaseMapper " + "select DATE_FORMAT(create_time, '%Y-%m-%d') as myDate,count(*) as mySum from bs_sgc_dw_xcqx where 1=1 " + - " and xm.create_time >= #{data.startTime} " + - " and xm.create_time <= #{data.endTime} " + + " and create_time >= #{data.startTime} " + + " and create_time <= #{data.endTime} " + "" + "and dike_code = #{data.code} " + "" + diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingProblemV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingProblemV2Mapper.java index 49af9b32..abe0b910 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingProblemV2Mapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingProblemV2Mapper.java @@ -68,8 +68,8 @@ public interface SzCheckingProblemV2Mapper extends BaseMapper " + "select DATE_FORMAT(create_time, '%Y-%m-%d') as myDate,count(*) as mySum from bs_sgc_sz_xcqx where 1=1 " + - " and xm.create_time >= #{data.startTime} " + - " and xm.create_time <= #{data.endTime} " + + " and create_time >= #{data.startTime} " + + " and create_time <= #{data.endTime} " + "" + "and waga_code = #{data.code} " + "" +