Merge remote-tracking branch 'origin/dev_power_axis' into dev_power_axis

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java

@@ -230,58 +230,22 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
         form.setCustomerId(loginUserUtil.getLoginUserCustomerId());
 
         // 查网格党支部数 grid_party
-        String gridCateGoryCode = baseDao.getCateGoryCode(form.getCustomerId(),PowerTagLevelEnum.CHILD_FIRST.level(),PowerTagCategoryEnum.STRUCT.category());
-        int gridParty = baseDao.queryGridParty(form.getAgencyId(),form.getCustomerId(),gridCateGoryCode);
+        String gridCateGoryCode = baseDao.getCateGoryCode(form.getCustomerId(), PowerTagLevelEnum.CHILD_FIRST.level(), PowerTagCategoryEnum.STRUCT.category());
+        int gridParty = baseDao.queryGridParty(form.getAgencyId(), form.getCustomerId(), gridCateGoryCode);
 
         // 查楼院党小组数 group_party
-        String groupCateGoryCode = baseDao.getCateGoryCode(form.getCustomerId(),PowerTagLevelEnum.CHILD_SECOND.level(),PowerTagCategoryEnum.STRUCT.category());
-        int groupParty = baseDao.queryGroupParty(form.getAgencyId(),form.getCustomerId(),groupCateGoryCode);
-        // 查询党员数
-        int partyNum = 0;
+        String groupCateGoryCode = baseDao.getCateGoryCode(form.getCustomerId(), PowerTagLevelEnum.CHILD_SECOND.level(), PowerTagCategoryEnum.STRUCT.category());
+        int groupParty = baseDao.queryGroupParty(form.getAgencyId(), form.getCustomerId(), groupCateGoryCode);
         // 查询党员中心户数
         int kernelHouseHold = baseDao.getKernelHouseHold(form);
         // 查询服务站数
         int serviceStation = baseDao.getServiceStation(form);
-        // 查询志愿者队伍数
-        int volunteerTeamNum = 0;
 
         PowerAxisStructViewResultDTO result = new PowerAxisStructViewResultDTO();
         result.setGridNum(gridParty);
         result.setGroupNum(groupParty);
-        result.setPartyMemberNum(partyNum);
         result.setKernelHouseHoldNum(kernelHouseHold);
         result.setServiceStationNum(serviceStation);
-        result.setVolunteerTeamNum(volunteerTeamNum);
-
-
-        List<PowerAxisTagCategoryResultDTO> tagList = powerAxisTagService.listSimple(PowerTagCategoryEnum.PARAM.category(), loginUserUtil.getLoginUserCustomerId());
-        tagList.forEach(
-                item -> {
-                    int numTemp;
-                    switch (item.getCategoryCode()) {
-                        case "volunteerTeamNum":
-                            numTemp = Integer.parseInt(item.getCategoryName());
-                            if (numTemp > NumConstant.ZERO) {
-                                result.setVolunteerTeamNum(numTemp);
-                            }
-                            break;
-                        case "partyMemberNum":
-                            numTemp = Integer.parseInt(item.getCategoryName());
-                            if (numTemp > NumConstant.ZERO) {
-                                result.setPartyMemberNum(numTemp);
-                            }
-                            break;
-                        case "kernelHouseHoldNum":
-                            numTemp = Integer.parseInt(item.getCategoryName());
-                            if (numTemp > NumConstant.ZERO) {
-                                result.setKernelHouseHoldNum(numTemp);
-                            }
-                            break;
-                        default:
-                            break;
-                    }
-                }
-        );
 
         return result;
     }