bug修复

linwe

2023-12-23 55d677758efadb6d42e6d4e595cecc2c50c20d5a

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

@@ -23,6 +23,8 @@
import org.springblade.common.node.TreeStringNode;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.vo.GridVO;
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.excel.HouseHoldExcel;
import org.springblade.modules.house.mapper.HouseholdMapper;
@@ -47,11 +49,24 @@
public class HouseholdServiceImpl extends ServiceImpl<HouseholdMapper, HouseholdEntity> implements IHouseholdService {

   @Autowired
   private IGridService gridService;

   @Autowired
   private IDictBizService dictBizService;

   @Override
   public IPage<HouseholdVO> selectHouseholdPage(IPage<HouseholdVO> page, HouseholdVO household) {
      return page.setRecords(baseMapper.selectHouseholdPage(page, household));
      List<HouseholdVO> householdVOS = baseMapper.selectHouseholdPage(page, household);
      // 遍历
      for (HouseholdVO householdVO : householdVOS) {
         // 设置对应的网格名称
         GridVO gridVO = gridService.getGridDetailByHouseCode(householdVO.getHouseCode());
         if (null!= gridVO){
            householdVO.setGridName(gridVO.getGridName());
         }
      }
      // 返回
      return page.setRecords(householdVOS);
   }

   /**
@@ -197,15 +212,15 @@
   @Override
   public Object getHouseHoldStatistics(String code, String roleType) {
      Map<String, Object> objectObjectHashMap = new HashMap<>();
      if (roleType.equals("1")) {
         List<Map<String, Object>> result = baseMapper.getHouseHoldStatistics(code, AuthUtil.getUserId());
         List<Map<String, Object>> result1 = baseMapper.getHouseHoldStatisticsAge(code, AuthUtil.getUserId());
      if (roleType.equals("2")) {
         List<Map<String, Object>> result = baseMapper.getHouseHoldStatistics(code, null, roleType);
         List<Map<String, Object>> result1 = baseMapper.getHouseHoldStatisticsAge(code, null, roleType);
         objectObjectHashMap.put("gender", result);
         objectObjectHashMap.put("age", result1);
         return objectObjectHashMap;
      } else {
         List<Map<String, Object>> result = baseMapper.getHouseHoldStatistics(code, null);
         List<Map<String, Object>> result1 = baseMapper.getHouseHoldStatisticsAge(code, null);
         List<Map<String, Object>> result = baseMapper.getHouseHoldStatistics(code, AuthUtil.getUserId(), roleType);
         List<Map<String, Object>> result1 = baseMapper.getHouseHoldStatisticsAge(code, AuthUtil.getUserId(), roleType);
         objectObjectHashMap.put("gender", result);
         objectObjectHashMap.put("age", result1);
         return objectObjectHashMap;