From 35c6d2f28e7e166ca6b9a8d8c7dbe6e674217a2f Mon Sep 17 00:00:00 2001 From: wany <13995595726@qq.com> Date: Wed, 11 Mar 2026 15:13:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/ss/common/model/page/JcskPageSo.java | 1 - .../ss/controller/ImpactZoneInfoController.java | 2 +- .../project/ss/service/DocCenterService.java | 14 ++++++++------ .../project/ss/service/ProjectSafetyService.java | 2 +- .../project/ss/service/WarningRuleInfoService.java | 2 +- src/main/resources/mapper/JcskMapper.xml | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/module-common/src/main/java/com/gunshi/project/ss/common/model/page/JcskPageSo.java b/module-common/src/main/java/com/gunshi/project/ss/common/model/page/JcskPageSo.java index f0bbfc5..cf0088e 100644 --- a/module-common/src/main/java/com/gunshi/project/ss/common/model/page/JcskPageSo.java +++ b/module-common/src/main/java/com/gunshi/project/ss/common/model/page/JcskPageSo.java @@ -1,6 +1,5 @@ package com.gunshi.project.ss.common.model.page; -import com.baomidou.mybatisplus.annotation.TableField; import com.gunshi.db.dto.PageSo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/gunshi/project/ss/controller/ImpactZoneInfoController.java b/src/main/java/com/gunshi/project/ss/controller/ImpactZoneInfoController.java index 0eae165..dc63493 100644 --- a/src/main/java/com/gunshi/project/ss/controller/ImpactZoneInfoController.java +++ b/src/main/java/com/gunshi/project/ss/controller/ImpactZoneInfoController.java @@ -66,7 +66,7 @@ public class ImpactZoneInfoController{ @Operation(summary = "列表") @PostMapping("/list") public R> list() { - return R.ok(service.lambdaQuery().list()); + return R.ok(service.lambdaQuery().eq(ImpactZoneInfo::getStatus,0).list()); } @Operation(summary = "分页") diff --git a/src/main/java/com/gunshi/project/ss/service/DocCenterService.java b/src/main/java/com/gunshi/project/ss/service/DocCenterService.java index 386e8e1..ba52e10 100644 --- a/src/main/java/com/gunshi/project/ss/service/DocCenterService.java +++ b/src/main/java/com/gunshi/project/ss/service/DocCenterService.java @@ -17,6 +17,7 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.mapper.SysDeptMapper; import com.ruoyi.system.mapper.SysUserMapper; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -213,17 +214,18 @@ public class DocCenterService extends ServiceImpl { .ge(DocCenter::getCreateTime, dateTimeRangeSo.getStart()) .le(DocCenter::getCreateTime, dateTimeRangeSo.getEnd()).list(); + if(CollectionUtils.isEmpty(list)){ + return res; + } //获取去重的所有资料分类ID - List categoryIds = list.stream().distinct().map(o -> { - return o.getDocCategoryId(); - }).collect(Collectors.toList()); + List categoryIds = list.stream().distinct().map(DocCenter::getDocCategoryId).collect(Collectors.toList()); List level3Category = docCategoryService.lambdaQuery().in(DocCategory::getId, categoryIds).list(); for (DocCategory docCategory : level3Category) { - long count = list.stream().filter(o -> { - return docCategory.getId().equals(o.getDocCategoryId()); - }).count(); + long count = list.stream().filter(o -> + docCategory.getId().equals(o.getDocCategoryId()) + ).count(); res.put(docCategory.getCategoryName(),count); } return res; diff --git a/src/main/java/com/gunshi/project/ss/service/ProjectSafetyService.java b/src/main/java/com/gunshi/project/ss/service/ProjectSafetyService.java index 58a665d..d77244a 100644 --- a/src/main/java/com/gunshi/project/ss/service/ProjectSafetyService.java +++ b/src/main/java/com/gunshi/project/ss/service/ProjectSafetyService.java @@ -77,7 +77,7 @@ public class ProjectSafetyService extends ServiceImpl().eq(ProjectSafety::getType, type.getName())); + Long cnt = getBaseMapper().selectCount(new LambdaQueryWrapper().eq(ProjectSafety::getType, id)); if (cnt > 0) { throw new IllegalArgumentException("请先删除关联数据"); } diff --git a/src/main/java/com/gunshi/project/ss/service/WarningRuleInfoService.java b/src/main/java/com/gunshi/project/ss/service/WarningRuleInfoService.java index 930f6f3..dbefa2b 100644 --- a/src/main/java/com/gunshi/project/ss/service/WarningRuleInfoService.java +++ b/src/main/java/com/gunshi/project/ss/service/WarningRuleInfoService.java @@ -73,7 +73,7 @@ public class WarningRuleInfoService extends ServiceImpl().eq("warning_info_id",warningRuleInfo.getId())); objService.saveOrUpdateBatch(warningRuleInfo.getObjs()); diff --git a/src/main/resources/mapper/JcskMapper.xml b/src/main/resources/mapper/JcskMapper.xml index 522ebe5..aa692d2 100644 --- a/src/main/resources/mapper/JcskMapper.xml +++ b/src/main/resources/mapper/JcskMapper.xml @@ -72,7 +72,7 @@ SELECT - cdnm as code, + cd_nm as code, ch as dm, lgtd, lttd,