From dd1bcad4899312ce904ebfe214b5e44cd98d3408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Sun, 16 Mar 2025 21:44:16 +0800 Subject: [PATCH] =?UTF-8?q?edit:=E4=B8=80=E5=BC=A0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/sz/mapper/SzCheckingProblemV2Mapper.java | 6 +++--- .../com/kms/yxgh/sz/mapper/SzCheckingRecordV2Mapper.java | 2 +- .../main/java/com/kms/yxgh/sz/mapper/SzYhV2Mapper.java | 8 ++++++-- 3 files changed, 10 insertions(+), 6 deletions(-) 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 a250d075..49af9b32 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 @@ -41,7 +41,7 @@ public interface SzCheckingProblemV2Mapper extends BaseMapper and create_time >= #{data.startTime} " + " and create_time <= #{data.endTime} " + "" + - "and dike_code = #{data.code} " + + "and waga_code = #{data.code} " + "" + "" + "and category = #{category.value} " + @@ -56,7 +56,7 @@ public interface SzCheckingProblemV2Mapper extends BaseMapper and create_time >= #{data.startTime} " + " and create_time <= #{data.endTime} " + "" + - "and dike_code = #{data.code} " + + "and waga_code = #{data.code} " + "" + "" + "and category = #{category.value} " + @@ -71,7 +71,7 @@ public interface SzCheckingProblemV2Mapper extends BaseMapper and xm.create_time >= #{data.startTime} " + " and xm.create_time <= #{data.endTime} " + "" + - "and dike_code = #{data.code} " + + "and waga_code = #{data.code} " + "" + "group by DATE_FORMAT(create_time, '%Y-%m-%d') " + "") diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingRecordV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingRecordV2Mapper.java index f46b7547..b55fe431 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingRecordV2Mapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzCheckingRecordV2Mapper.java @@ -44,7 +44,7 @@ public interface SzCheckingRecordV2Mapper extends BaseMapper { " and create_time >= #{data.startTime} " + " and create_time <= #{data.endTime} " + "" + - "and dike_code = #{data.code} " + + "and waga_code = #{data.code} " + "" + "" + "and category = #{category.value} " + diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhV2Mapper.java index fb26bda9..e9e504e1 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhV2Mapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhV2Mapper.java @@ -3,7 +3,11 @@ package com.kms.yxgh.sz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.yxgh.common.dto.*; +import com.kms.yxgh.common.dto.ApprovalDetailDto; +import com.kms.yxgh.common.dto.ApprovalSearchDto; +import com.kms.yxgh.common.dto.CountDateDto; +import com.kms.yxgh.common.dto.CountDto; +import com.kms.yxgh.common.dto.ObjectStatisticQueDto; import com.kms.yxgh.sz.domain.SzYhV2; import com.kms.yxgh.sz.dto.v2.SzRecordSearchV2Dto; import com.kms.yxgh.sz.dto.v2.SzYhApproveDto; @@ -45,7 +49,7 @@ public interface SzYhV2Mapper extends BaseMapper { " and create_time >= #{data.startTime} " + " and create_time <= #{data.endTime} " + "" + - "and dike_code = #{data.code} " + + "and waga_code = #{data.code} " + "" + "group by DATE_FORMAT(create_time, '%Y-%m-%d') " + "")