From 7e81eaa176a2bd3ddb1b39a629266ea0ab8f9d39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Thu, 6 Mar 2025 17:15:33 +0800 Subject: [PATCH] =?UTF-8?q?fox:=E6=B0=B4=E9=97=B8=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/yxgh/df/mapper/DfRecordMapper.java | 5 ++-- .../kms/yxgh/df/service/DfRecordService.java | 22 +++++++++------- .../kms/yxgh/sz/mapper/SzRecordMapper.java | 5 ++-- .../kms/yxgh/sz/service/SzRecordService.java | 25 ++++++++++--------- 4 files changed, 32 insertions(+), 25 deletions(-) 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 86074c7c..a7e974a1 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 @@ -36,11 +36,12 @@ public interface DfRecordMapper extends BaseMapper { "WHERE jl.id IN ( "+ "SELECT RECORD_ID "+ "FROM bs_sgc_df_xsjhjlz "+ + "where 1=1 "+ " "+ - "where (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.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')) "+ " " + - "and base.adcd is not null "+ + "AND base.adcd is not null "+ "group by RECORD_ID "+ ") "+ "") 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 9c6ea203..6e840fea 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 @@ -2,6 +2,7 @@ package com.kms.yxgh.df.service; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -91,18 +92,18 @@ public class DfRecordService extends BaseService { .filter(s -> !StringUtils.isEmpty(s.getAdcd())) // 过滤掉空字符串 .collect(Collectors.groupingBy(DfYhHiddenDangerModel::getAdcd)); - - - if (!CollectionUtil.isEmpty(groupingByList)) { List xList =new ArrayList<>(); ListyAxisList=new ArrayList<>(); // 是否查询区级 - boolean flag = org.springframework.util.StringUtils.isEmpty(dto.getDistrictLevelFlag()) - || Objects.equals("0", dto.getDistrictLevelFlag()); - if (!flag) { - SysXzqh xzqhdm = sysXzqhService.getOne(new QueryWrapper().eq("XZQHDM", dto.getAdcd()).last(" limit 1")); + boolean flag = ( StringUtils.isNotEmpty(dto.getDistrictLevelFlag()) + && Objects.equals("1", dto.getDistrictLevelFlag())); + if (flag) { + SysXzqh xzqhdm = sysXzqhService.getOne(new LambdaQueryWrapper() + .eq(SysXzqh::getXzqhdm, dto.getAdcd()) + .orderByDesc(SysXzqh::getCreateTime) + .last(" limit 1")); if (null != xzqhdm) { xList.add(xzqhdm.getName()); } @@ -111,8 +112,11 @@ public class DfRecordService extends BaseService { for (Map.Entry> entry : groupingByList.entrySet()) { // 设置 x轴 // 转换名称 - if (flag) { - SysXzqh xzqhdm = sysXzqhService.getOne(new QueryWrapper().likeRight("XZQHDM", entry.getKey())); + if (!flag) { + SysXzqh xzqhdm = sysXzqhService.getOne(new LambdaQueryWrapper() + .likeRight(SysXzqh::getXzqhdm, entry.getKey()) + .orderByDesc(SysXzqh::getCreateTime) + .last("limit 1")); if (null!=xzqhdm) { xList.add(xzqhdm.getName()); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java index 067a51cb..096837ba 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzRecordMapper.java @@ -57,11 +57,12 @@ public interface SzRecordMapper extends BaseMapper { "WHERE jl.id IN ( "+ "SELECT RECORD_ID "+ "FROM bs_sgc_sz_xsjhjlz "+ + "where 1=1 "+ " "+ - "where (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.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')) "+ " " + - "and base.adcd is not null "+ + "AND base.adcd is not null "+ "group by RECORD_ID "+ ") "+ "") diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java index 48027bdb..cf48f2d7 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java @@ -2,6 +2,7 @@ package com.kms.yxgh.sz.service; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -133,10 +134,13 @@ public class SzRecordService extends BaseService { List xList =new ArrayList<>(); ListyAxisList=new ArrayList<>(); // 是否查询区级 - boolean flag = org.springframework.util.StringUtils.isEmpty(dto.getDistrictLevelFlag()) - || Objects.equals("0", dto.getDistrictLevelFlag()); - if (!flag) { - SysXzqh xzqhdm = sysXzqhService.getOne(new QueryWrapper().eq("XZQHDM", dto.getAdcd()).last(" limit 1")); + boolean flag = (null!=dto.getDistrictLevelFlag() + && Objects.equals("1", dto.getDistrictLevelFlag())); + if (flag) { + SysXzqh xzqhdm = sysXzqhService.getOne(new LambdaQueryWrapper() + .eq(SysXzqh::getXzqhdm, dto.getAdcd()) + .orderByDesc(SysXzqh::getCreateTime) + .last(" limit 1")); if (null != xzqhdm) { xList.add(xzqhdm.getName()); } @@ -144,8 +148,11 @@ public class SzRecordService extends BaseService { for (Map.Entry> entry : groupingByList.entrySet()) { // 设置 x轴 // 转换名称 - if (flag) { - SysXzqh xzqhdm = sysXzqhService.getOne(new QueryWrapper().likeRight("XZQHDM", entry.getKey())); + if (!flag) { + SysXzqh xzqhdm = sysXzqhService.getOne(new LambdaQueryWrapper() + .likeRight(SysXzqh::getXzqhdm, entry.getKey()) + .orderByDesc(SysXzqh::getCreateTime) + .last("limit 1")); if (null!=xzqhdm) { xList.add(xzqhdm.getName()); } @@ -159,12 +166,6 @@ public class SzRecordService extends BaseService { return dfYhCharHiddenDangerDto; } - public static String getXZQHName(String code) { - - return ""; - } - - private void numberHandle (SzCharInfoItemQueDto dto,SzCharItemDto itemDto) { // 堤防数量 int dfNumber = this.baseMapper.paragraphCountNumber(dto);