From 7c261daa9155747bf2d8c0bd1b4ea63cba6e1ee2 Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Sat, 28 Feb 2026 12:02:12 +0800 Subject: [PATCH] =?UTF-8?q?fix--=E7=BB=B4=E6=9D=83=E6=8A=9A=E6=85=B0?= =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8A=9A=E6=85=B0=E9=87=91=E9=A2=9D=E6=80=BB?= =?UTF-8?q?=E6=95=B0=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/datav/DataVRightsComfortController.java | 8 +++++--- .../com/biutag/supervision/mapper/RpcApplyMapper.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java index 5e60f6e..229ef5a 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java @@ -21,6 +21,7 @@ import com.biutag.supervision.pojo.vo.ComfortMapIconVo; import com.biutag.supervision.pojo.vo.EchartsVo; import com.biutag.supervision.service.DataRightsComfortService; import com.biutag.supervision.service.RpcApplyService; +import com.biutag.supervision.service.SupDepartService; import com.biutag.supervision.service.SupDictDataService; import com.biutag.supervision.service.datav.DatavService; import com.biutag.supervision.util.CompletableUtils.CompletableFutureUtil; @@ -57,6 +58,7 @@ public class DataVRightsComfortController { private final SupDictDataService supDictDataService; private final SupDepartMapper supDepartMapper; private final DatavService datavService; + private final SupDepartService supDepartService; /** @@ -237,11 +239,11 @@ public class DataVRightsComfortController { } for (ComfortMapIconVo re : res) { String departId = re.getDepartId(); - + List allNodeIds = supDepartService.getAllNodeIds(departId); List list = rpcApplyService.list(new LambdaQueryWrapper() .between(RpcApply::getCrtTime, beginTime, finalEndTime) - .eq(RpcApply::getDepartId,departId) - .eq(RpcApply::getVerified,"0") + .in(RpcApply::getDepartId,allNodeIds) +// .eq(RpcApply::getVerified,"0") .eq(RpcApply::getType, RpcApplyTypeEnum.RIGHTS_PROTECTION.getValue())); Set caseNumbers = list.stream() diff --git a/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java b/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java index 694707b..6221bdf 100644 --- a/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java @@ -19,7 +19,7 @@ import java.util.List; public interface RpcApplyMapper extends BaseMapper { @Select("SELECT COALESCE(SUM(a.provide_relief), 0.0) FROM rpc_apply_person a LEFT JOIN rpc_apply b ON a.rpc_id = b.rpc_id " + - "WHERE b.apply_date BETWEEN #{beginTime} AND #{endTime} AND b.type = 2") + "WHERE b.apply_date BETWEEN #{beginTime} AND #{endTime} AND b.type = 2 AND b.rpc_status='completed' ") Double countComfortMoney(Date beginTime, Date endTime); @Select("SELECT c.job name, COUNT(c.job) value FROM sup_police c JOIN " +