bug 修复

linwei

2024-01-26 04a0b7a7cae7bee8808bbc3587dddc4f955d204f

 src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java

@@ -46,6 +46,7 @@
import org.springblade.modules.house.vo.HouseVO;
import org.springblade.modules.label.entity.LabelEntity;
import org.springblade.modules.label.service.ILabelService;
import org.springblade.modules.label.vo.LabelVO;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IRegionService;
@@ -328,8 +329,8 @@
         if (!Strings.isBlank(houseAndHoldExcel.getPartyEmber())) {
            householdEntity.setPartyEmber(Integer.parseInt(houseAndHoldExcel.getPartyEmber()));
         }
         householdEntity.setHkmtPass(houseAndHoldExcel.getHkmtPass());
         householdEntity.setPassport(houseAndHoldExcel.getPassport());
         // householdEntity.setHkmtPass(houseAndHoldExcel.getHkmtPass());
         // householdEntity.setPassport(houseAndHoldExcel.getPassport());
         // 民族
         if (!Strings.isBlank(houseAndHoldExcel.getEthnicity())) {
            householdEntity.setEthnicity(Integer.parseInt(houseAndHoldExcel.getEthnicity()));
@@ -460,8 +461,8 @@
         if (!Strings.isBlank(houseAndHoldExcel.getPartyEmber())) {
            one.setPartyEmber(Integer.parseInt(houseAndHoldExcel.getPartyEmber()));
         }
         one.setHkmtPass(houseAndHoldExcel.getHkmtPass());
         one.setPassport(houseAndHoldExcel.getPassport());
         // one.setHkmtPass(houseAndHoldExcel.getHkmtPass());
         // one.setPassport(houseAndHoldExcel.getPassport());
         // 民族
         if (!Strings.isBlank(houseAndHoldExcel.getEthnicity())) {
            one.setEthnicity(Integer.parseInt(houseAndHoldExcel.getEthnicity()));
@@ -688,16 +689,21 @@
   }

   @Override
   public List<Map<String, Object>>  labelStatistics(HouseVO house) {
   public List<Map<String, Object>> labelStatistics(HouseVO house) {
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
      return baseMapper.labelStatistics(house,regionChildCodesList,isAdministrator);
      return baseMapper.labelStatistics(house, regionChildCodesList, isAdministrator);
   }

   @Override
   public List<Map<String, Object>> labelCommunityStatistics(HouseVO house) {
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
      return baseMapper.labelCommunityStatistics(house,regionChildCodesList,isAdministrator);
      List<Map<String, Object>> list = baseMapper.labelCommunityStatistics(house, regionChildCodesList);
      for (Map<String, Object> map : list) {
         List<LabelVO> code = baseMapper.getlabelCount(house, regionChildCodesList, isAdministrator, map.get("code").toString());
         map.put("child",code);
      }
      return list;
   }
}