src/main/java/com/biutag/supervision/controller/datav/RiskDataController.java

@@ -34,8 +34,8 @@ public class RiskDataController {
     }
 
     @GetMapping("/area/risk/statistics")
-    public Result<List<RiskStatisticsVo>> areaRiskStatistics(Integer bisType) {
-        return Result.success(statisticsService.riskStatisticsBigOrg(17));
+    public Result<List<RiskStatisticsVo>> areaRiskStatistics() {
+        return Result.success(statisticsService.riskStatisticsBigOrg());
     }
 
     @GetMapping("/risk/org/statistics")

src/main/java/com/biutag/supervision/mapper/NegativeBlameMapper.java

@@ -51,6 +51,6 @@ public interface NegativeBlameMapper extends BaseMapper<NegativeBlame> {
     List<NegativeBlame> selectBlameListIvPerson();
 
     @Select(" select blameName, blameIdCode, blameDepartId from `negative_blame` where crtTime > '2024-01-01 00:00:00' " +
-            " and blameIdCode is not null and blameDepartId is not null and length(blameIdCode) > 0 and length(blameDepartId) > 0 and length(blameName) > 0 and ivPersonTypeCode != '1'")
+            " and blameIdCode is not null and blameDepartId is not null and length(blameIdCode) > 0 and length(blameDepartId) > 0 and ivPersonTypeCode != '1'")
     List<NegativeBlame> selectBlameListNotIvPerson();
 }

src/main/java/com/biutag/supervision/mapper/StatisticsGroupMapper.java

@@ -1,7 +1,6 @@
 package com.biutag.supervision.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.biutag.supervision.pojo.domain.GroupMembers;
 import com.biutag.supervision.pojo.entity.StatisticsGroup;
 import org.apache.ibatis.annotations.Select;
 
@@ -16,12 +15,4 @@ public interface StatisticsGroupMapper extends BaseMapper<StatisticsGroup> {
             + "</foreach>"
             + "</script>")
     List<Map<Long, Object>> getNameByGroupIds(List<Long> groupIds);
-
-    /**
-     * 没时间写negative_group了
-     */
-    @Select(" select b.groupId,a.groupName,b.membersName,b.membersCode from negative_group a inner JOIN negative_group_members b " +
-            " on a.groupId = b.groupId " +
-            " where a.type = '1' order by b.membersCode")
-    List<GroupMembers> selectGroupMembers();
 }

src/main/java/com/biutag/supervision/pojo/domain/GroupMembers.java

@@ -1,23 +0,0 @@
-package com.biutag.supervision.pojo.domain;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author kami on 2024-11-17 10:53:37
- * @version 0.0.1
- * @since 1.8
- */
-
-@Data
-public class GroupMembers implements Serializable {
-
-    String groupId;
-
-    String groupName;
-
-    String membersName;
-
-    String membersCode;
-}

src/main/java/com/biutag/supervision/service/RiskStatisticsService.java

@@ -2,7 +2,6 @@ package com.biutag.supervision.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.biutag.supervision.mapper.*;
-import com.biutag.supervision.pojo.domain.GroupMembers;
 import com.biutag.supervision.pojo.entity.NegativeBlame;
 import com.biutag.supervision.pojo.entity.StatisticsGroup;
 import com.biutag.supervision.pojo.entity.SupDepart;
@@ -60,16 +59,11 @@ public class RiskStatisticsService {
     }
 
     /**
-     * 派出所
-     * @param bisType 高业务 17 中业务18低业务19
+     * 分县统计风险分
+     *
      * @return 列表
      */
-    public List<RiskStatisticsVo> riskStatisticsBigOrg(Integer bisType) {
-        List<GroupMembers> members = statisticsGroupMapper.selectGroupMembers();
-        Map<String, List<GroupMembers>> memberMap = members.stream().collect(Collectors.groupingBy(GroupMembers::getGroupId));
-        List<GroupMembers> membersList = memberMap.get(bisType);
-        Map<String, GroupMembers> groupMembersMap = membersList.stream().collect(Collectors.toMap(GroupMembers::getMembersCode, Function.identity(), (oldValue, newValue) -> newValue));
-
+    public List<RiskStatisticsVo> riskStatisticsBigOrg() {
         StatisticsGroup group = statisticsGroupMapper.selectOne(new LambdaQueryWrapper<StatisticsGroup>()
                 .eq(StatisticsGroup::getName, "派出所").last("limit 1"));
         List<RiskStatisticsVo> vo = negativeScoreDepartMapper.statistics(group.getGroupId());