From f0dd72aec1bdb09a55fd61fb38b5119b068fa21f Mon Sep 17 00:00:00 2001 From: pengwei Date: Thu, 29 May 2025 10:50:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201=E3=80=81=E7=BB=B4=E6=9D=83=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=E4=BC=98=E5=8C=96=EF=BC=88=E5=8F=97=E4=BE=B5=E5=AE=B3?= =?UTF-8?q?=E4=BA=BA=E6=95=B0=EF=BC=89;2=E3=80=81=E6=A1=88=E4=BB=B6?= =?UTF-8?q?=E6=A0=B8=E6=9F=A5=E5=A4=A7=E5=B1=8F=EF=BC=88=E6=9F=A5=E5=AE=9E?= =?UTF-8?q?=E7=8E=87=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datav/DataVCaseVerifController.java | 4 ++-- .../datav/DataVRightsComfortController.java | 4 ++-- .../supervision/mapper/RpcApplyMapper.java | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java b/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java index 82eb207..0d69530 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVCaseVerifController.java @@ -135,7 +135,7 @@ public class DataVCaseVerifController { long total =dataCaseVerifMapper.selectCount(new LambdaQueryWrapper().between(DataCaseVerif::getCreateTime,beginTime,endTime)); overview.setTotal((int) total); // overview.setRate((double) ((overview.getConfirmed() / total * 100) )); - overview.setRate(NumberUtil.div((Number) overview.getConfirmed(),total * 100).doubleValue()); + overview.setRate(NumberUtil.div((Number) (overview.getConfirmed() * 100),total ).doubleValue()); JSONObject res = new JSONObject().fluentPut("overview", overview); return Result.success(res); } @@ -159,7 +159,7 @@ public class DataVCaseVerifController { long total =dataCaseVerifMapper.selectCount(new LambdaQueryWrapper().between(DataCaseVerif::getCreateTime,beginTime,finalEndTime)); s.setTotal((int) total); - s.setRate(NumberUtil.div((Number) s.getConfirmed(),total * 100).doubleValue()); + s.setRate(NumberUtil.div((Number)( s.getConfirmed() * 100),total ).doubleValue()); return s; }).toList(); JSONObject res = new JSONObject().fluentPut("caseVerificationMapList", caseVerificationMapList); 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 fec9a31..e2a46bd 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java @@ -74,7 +74,7 @@ public class DataVRightsComfortController { // 维权案件总数 result.setRightsNumber(caseNumbers.size()); // 受侵害人数 - result.setVictimNumber(list.size()); + result.setVictimNumber(rpcApplyMapper.selectVictimNumber(beginTime,finalEndTime)); // 打击处理人数 List tortNames = rpcInfringerResultMapper.selectNamesByTime(beginTime, finalEndTime); long initialListSize = tortNames.size(); @@ -197,7 +197,7 @@ public class DataVRightsComfortController { // 维权案件总数 re.setRightsNumber(caseNumbers.size()); // 受侵害人数 - re.setVictimNumber(list.size()); + re.setVictimNumber(rpcApplyMapper.selectVictimNumberByOrg(beginTime,finalEndTime,departId)); // 打击处理人数 List tortNames = rpcInfringerResultMapper.selectNamesByOrgTime(beginTime, finalEndTime,departId); long initialListSize = tortNames.size(); diff --git a/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java b/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java index 4d742fe..fe7c413 100644 --- a/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java @@ -37,6 +37,24 @@ public interface RpcApplyMapper extends BaseMapper { ) List selectCaseData(Date beginTime, Date endTime,String type); + /** + * 获取受侵害人数 + * */ + @Select(" SELECT COUNT(*) from rpc_apply_person a LEFT JOIN rpc_apply b " + + " on a.rpc_id = b.rpc_id and b.type =1 " + + " WHERE b.rpc_id is not null " + + " and b.crt_time BETWEEN #{beginTime} and ${endTime} ") + Integer selectVictimNumber(Date beginTime, Date endTime); + + /** + * 获取受侵害人数(根据分县) + * */ + @Select(" SELECT COUNT(*) from rpc_apply_person a LEFT JOIN rpc_apply b " + + " on a.rpc_id = b.rpc_id and b.type =1 " + + " WHERE b.rpc_id is not null " + + " and b.crt_time BETWEEN #{beginTime} and ${endTime} " + + " and b.second_depart_id = #{deptId} ") + Integer selectVictimNumberByOrg(Date beginTime, Date endTime,String deptId); @Select("SELECT " +