From f2ddd94e5e0c6f65c658fc84fb024cc81ba7db47 Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Tue, 29 Apr 2025 13:42:33 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=201=E3=80=81=E4=BF=AE=E5=A4=8D=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E7=BB=9F=E8=AE=A1=E5=9B=BE=E5=B1=95=E7=A4=BA=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E6=B2=A1=E6=9C=89=E4=B8=8B=E4=B8=80=E7=BA=A7=E5=88=99?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=BD=93=E5=89=8D=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/mapper/BusinessAlertMapper.java | 3 ++ .../BusinessAlertStatisticsServiceImpl.java | 42 ++++++++++++++++++- .../mapper/business/BusinessAlertMapper.xml | 31 ++++++++++++++ .../service/impl/AiCompareServiceImpl.java | 5 +-- 4 files changed, 77 insertions(+), 4 deletions(-) diff --git a/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java b/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java index 97540e7..255c006 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java +++ b/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java @@ -104,4 +104,7 @@ public interface BusinessAlertMapper extends BaseMapperPlus listHandleHistory(@Param("lng") String lng, @Param("lat") String lat,@Param("createTime") String createTime); + List> listOneDepartAlert(@Param("param") BusinessAlertBo businessAlertBo); + + List> listOneDepartAlertStatus(@Param("param") BusinessAlertBo businessAlertBo); } diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java index 6542690..dd924c0 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java @@ -100,8 +100,21 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist businessAlertBo.setDeptId(String.valueOf(LoginHelper.getDeptId())); businessAlertBo.setAiLabelEnList(getAiLabel(businessAlertBo.getPostCode()).stream().map(RemoteAiLabelPostVo::getLabelEn).collect(Collectors.toList())); - List> mapList = baseMapper.listDepartAlert(businessAlertBo); + //判断是否存在下级 + Long deptId = LoginHelper.getDeptId(); + List remoteDeptVoList = Optional.ofNullable(remoteDeptService.selectListByParentId(String.valueOf(deptId))) + .orElse(Collections.emptyList()) + .stream() + .filter(p -> !p.getDeptId().equals(deptId)) + .collect(Collectors.toList()); + //排除自己如果没有下级则默认使用下边的逻辑查询 + if (ObjectUtil.isEmpty(remoteDeptVoList)) { + List> mapList = baseMapper.listOneDepartAlert(businessAlertBo); + return mapList.stream().map(data -> new StatObj(data.get("deptName") + "", Long.parseLong(data.get("total") + ""),"deptId",data.get("deptId"))).collect(Collectors.toList()); + } + //如果有则使用这个查询 + List> mapList = baseMapper.listDepartAlert(businessAlertBo); return mapList.stream().map(data -> new StatObj(data.get("deptName") + "", Long.parseLong(data.get("total") + ""),"deptId",data.get("deptId"))).collect(Collectors.toList()); } @@ -134,6 +147,33 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist businessAlertBo.setDeptId(String.valueOf(LoginHelper.getDeptId())); businessAlertBo.setAiLabelEnList(getAiLabel(businessAlertBo.getPostCode()).stream().map(RemoteAiLabelPostVo::getLabelEn).collect(Collectors.toList())); + //判断是否存在下级 + Long deptId = LoginHelper.getDeptId(); + List remoteDeptVoList = Optional.ofNullable(remoteDeptService.selectListByParentId(String.valueOf(deptId))) + .orElse(Collections.emptyList()) + .stream() + .filter(p -> !p.getDeptId().equals(deptId)) + .collect(Collectors.toList()); + + //排除自己如果没有下级则默认使用下边的逻辑查询 + if (ObjectUtil.isEmpty(remoteDeptVoList)) { + List> mapList = baseMapper.listOneDepartAlertStatus(businessAlertBo); + + return mapList.stream() + .map(map -> new StatObj( + Objects.toString(map.get("deptName")), + List.of( + new StatObj("total", map.get("total")), + new StatObj("todoCount", map.get("todoCount")), + new StatObj("finishCount", map.get("finishCount")), + new StatObj("cancelCount", map.get("cancelCount")) + ),"deptId",map.get("deptId") + )) + .collect(Collectors.toList()); + + } + + //如果有下级则使用下方方法 List> mapList = baseMapper.listDepartAlertStatus(businessAlertBo); return mapList.stream() diff --git a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml index 507634d..91df2c6 100644 --- a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml +++ b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml @@ -844,4 +844,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY create_time desc + + + + + + diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java index 6b6f271..3a04257 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java @@ -189,12 +189,11 @@ public class AiCompareServiceImpl implements IAiCompareService { @Override public Boolean updateStatus(Long id) { AiCompareEntity aiCompareEntity = aiCompareMapper.selectById(id); - Boolean falg=false; if(aiCompareEntity!=null&& ObjectUtil.equals(aiCompareEntity.getStatus(),AiCompareStatusConstants.COMPARE_STATUS_2)){ aiCompareEntity.setStatus(AiCompareStatusConstants.COMPARE_STATUS_4); - falg= aiCompareMapper.updateById(aiCompareEntity)>0; + return aiCompareMapper.updateById(aiCompareEntity)>0; } - return falg; + return true; } @Override