From 2bc17a00f56758ba279cc0bae14cfbf921b5f3cb Mon Sep 17 00:00:00 2001 From: buaixuexideshitongxue <2936013465@qq.com> Date: Sat, 28 Feb 2026 15:42:05 +0800 Subject: [PATCH] =?UTF-8?q?fix--=E6=8A=9A=E6=85=B0=E5=B1=8F=E5=B9=95?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datav/DataVRightsComfortController.java | 41 +++--------- .../supervision/mapper/RpcApplyMapper.java | 65 +++++++++++++++++++ .../service/datav/DatavServiceImpl.java | 8 --- 3 files changed, 75 insertions(+), 39 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 229ef5a..6699e69 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataVRightsComfortController.java @@ -31,6 +31,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; +import java.math.BigDecimal; import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; @@ -239,24 +240,14 @@ 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) - .in(RpcApply::getDepartId,allNodeIds) -// .eq(RpcApply::getVerified,"0") - .eq(RpcApply::getType, RpcApplyTypeEnum.RIGHTS_PROTECTION.getValue())); - - Set caseNumbers = list.stream() - .filter(one->StrUtil.isNotBlank(one.getDepartId())) - .map(RpcApply::getCaseNumber) - .collect(Collectors.toSet()); - - // 维权案件总数 - re.setRightsNumber(caseNumbers.size()); - // 受侵害人数 - re.setVictimNumber(rpcApplyMapper.selectVictimNumberByOrg(beginTime,finalEndTime,departId)); - // 打击处理人数 - List tortNames = rpcInfringerResultMapper.selectNamesByOrgTime(beginTime, finalEndTime,departId); + Integer rightsNumber = rpcApplyMapper.selectMapRightsNumber(beginTime, finalEndTime, departId); + Integer victimNumber = rpcApplyMapper.selectMapVictimNumber(beginTime, finalEndTime, departId); + Long comfortPersonNumber = rpcApplyMapper.selectMapComfortPersonNumber(beginTime, finalEndTime, departId); + List tortNames = rpcApplyMapper.selectMaptHitPersonNumber(beginTime, finalEndTime, departId); + BigDecimal comfortMoney = rpcApplyMapper.selectMapComfortMoney(beginTime, finalEndTime, departId); + re.setRightsNumber(rightsNumber); + re.setVictimNumber(victimNumber); + re.setComfortPersonNumber(comfortPersonNumber); long initialListSize = tortNames.size(); long hitPersonNumber = tortNames.stream() .filter(s -> s.contains(",")).toList().size(); @@ -270,20 +261,8 @@ public class DataVRightsComfortController { }else{ re.setHitPersonNumber(initialListSize + nums - hitPersonNumber); } - //抚慰金额 - re.setComfortMoney(rpcApplyMapper.selectComfortMoneyBar(beginTime, finalEndTime, departId)); -// CompletableFutureUtil.runSyncObject(() -> { -// -// re.setComfortMoney(rpcApplyMapper.selectComfortMoneyBarByOrg(beginTime, finalEndTime, departId)); -// }).join(); - CompletableFutureUtil.runSyncObject(() -> { - // 抚慰人数 - re.setComfortPersonNumber(rpcApplyService.orgCount(beginTime, finalEndTime, RpcApplyTypeEnum.COMFORT.getValue(), departId)); - }).join(); + re.setComfortMoney(comfortMoney); } - - - JSONObject data = new JSONObject().fluentPut("comfortMapVoList", res); return Result.success(data); } diff --git a/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java b/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java index ce94ceb..fce6b93 100644 --- a/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/RpcApplyMapper.java @@ -346,4 +346,69 @@ public interface RpcApplyMapper extends BaseMapper { " AND (d.id = #{id} OR d.pid = #{id} OR d_parent.pid = #{id} )") List selectRightsList(String id, Date beginTime, Date endTime); + @Select("SELECT count(*) " + + "FROM rpc_apply b " + + "LEFT JOIN sup_depart sd on b.depart_id = sd.id\n" + + "LEFT JOIN sup_depart sdd on sd.pid = sdd.id\n" + + "LEFT JOIN sup_depart sddd on sdd.pid = sddd.id\n" + + "WHERE b.rpc_id is not null \n" + + "AND b.type =1 " + + "AND b.verified = 0\n" + + "AND b.crt_time >= #{beginTime} and b.crt_time <= #{finalEndTime} " + + "AND (sd.id =#{departId} OR sdd.id=#{departId} or sddd.id=#{departId})") + Integer selectMapRightsNumber(Date beginTime, Date finalEndTime, String departId); + + @Select("SELECT count(*) " + + "FROM rpc_apply_person a \n" + + "LEFT JOIN rpc_apply b on a.rpc_id = b.rpc_id \n" + + "LEFT JOIN sup_depart sd on b.depart_id = sd.id\n" + + "LEFT JOIN sup_depart sdd on sd.pid = sdd.id\n" + + "LEFT JOIN sup_depart sddd on sdd.pid = sddd.id\n" + + "WHERE b.rpc_id is not null \n" + + "AND b.type =1\n" + + "AND b.verified = 0\n" + + "AND b.crt_time >= #{beginTime} and b.crt_time <= #{finalEndTime} " + + "AND (sd.id =#{departId} OR sdd.id=#{departId} or sddd.id=#{departId})") + Integer selectMapVictimNumber(Date beginTime, Date finalEndTime, String departId); + + // 抚慰人数 + @Select("SELECT count(*) \n" + + "FROM rpc_apply rpa\n" + + "LEFT JOIN sup_depart sd on rpa.depart_id = sd.id\n" + + "LEFT JOIN sup_depart sdd on sd.pid = sdd.id\n" + + "LEFT JOIN sup_depart sddd on sdd.pid = sddd.id\n" + + "WHERE rpa.apply_date >= #{beginTime} and rpa.apply_date <= #{finalEndTime} " + + "AND rpa.type=2 \n" + + "and rpa.rpc_status = 'completed' \n" + + "AND rpa.verified=0\n" + + "AND (sd.id =#{departId} OR sdd.id=#{departId} or sddd.id=#{departId})") + Long selectMapComfortPersonNumber(Date beginTime, Date finalEndTime, String departId); + + // -- 打击处理人数 + @Select("SELECT rir.tort_name " + + "FROM rpc_infringer_result rir \n" + + "LEFT JOIN rpc_apply as rpa on rir.rpc_id = rpa.rpc_id\n" + + "LEFT JOIN sup_depart sd on rpa.depart_id = sd.id\n" + + "LEFT JOIN sup_depart sdd on sd.pid = sdd.id\n" + + "LEFT JOIN sup_depart sddd on sdd.pid = sddd.id\n" + + "WHERE rpa.crt_time >= #{beginTime} and rpa.crt_time <= #{finalEndTime} " + + "AND rpa.type=1 \n" + + "AND rpa.verified=0\n" + + "AND (sd.id =#{departId} OR sdd.id=#{departId} or sddd.id=#{departId})") + List selectMaptHitPersonNumber(Date beginTime, Date finalEndTime, String departId); + + // 抚慰金额 + @Select("SELECT round(sum(p.provide_relief)/10000, 2) " + + "FROM rpc_apply r \n" + + "LEFT JOIN rpc_apply_person p on r.rpc_id = p.rpc_id \n" + + "LEFT JOIN sup_depart sd on r.depart_id = sd.id\n" + + "LEFT JOIN sup_depart sdd on sd.pid = sdd.id\n" + + "LEFT JOIN sup_depart sddd on sdd.pid = sddd.id\n" + + " where r.type = 2 \n" + + "and r.rpc_status = 'completed' \n" + + "AND r.apply_date >= #{beginTime} and r.apply_date <= #{finalEndTime} " + + "AND (sd.id =#{departId} OR sdd.id=#{departId} or sddd.id=#{departId})") + BigDecimal selectMapComfortMoney(Date beginTime, Date finalEndTime, String departId); + + // } diff --git a/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java b/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java index b9c71ce..3f671f2 100644 --- a/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java +++ b/src/main/java/com/biutag/supervision/service/datav/DatavServiceImpl.java @@ -587,16 +587,8 @@ public class DatavServiceImpl implements DatavService { @Override public Result getComfortMoneyBarList(DataVRequest request) { - // 找到rpcId -// List rpcIds = rpcComfortPacksMapper.selectRpcIds(request.getBeginTime(), request.getEndTime()); - // 找人找单位 -// LambdaQueryWrapper rpcApplyPersonLambdaQueryWrapper = new LambdaQueryWrapper<>(); -// rpcApplyPersonLambdaQueryWrapper.in(RpcApplyPerson::getRpcId, rpcIds); -// rpcApplyPersonLambdaQueryWrapper.between(RpcApplyPerson::getCreatTime, request.getBeginTime(), request.getEndTime()); -// List rpcApplyPersonList = rpcApplyPersonService.list(rpcApplyPersonLambdaQueryWrapper); List countyComfortMoneyBarList = rpcComfortPacksMapper.getComfortMoneyBarList(request.getBeginTime(), request.getEndTime(), 3); List bureauComfortMoneyBarList = rpcComfortPacksMapper.getComfortMoneyBarList(request.getBeginTime(), request.getEndTime(), 4); - JSONObject object = new JSONObject(); object.fluentPut("countyComfortMoneyBarList", countyComfortMoneyBarList); object.fluentPut("bureauComfortMoneyBarList", bureauComfortMoneyBarList);