bug修复

linwe

2023-12-26 eb55b4133ae6b3df80d8d14fbc5b32928f296fd7

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

@@ -18,29 +18,28 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.node.TreeStringNode;
import org.springblade.core.mp.support.Condition;
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;
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.HouseholdOtherVO;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.DictBiz;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IDictBizService;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StopWatch;

import java.util.*;

@@ -62,18 +61,31 @@
   @Autowired
   private IUserService userService;

   @Autowired
   private IDeptService deptService;

   @Override
   public IPage<HouseholdVO> selectHouseholdPage(IPage<HouseholdVO> page, HouseholdVO household) {
      StopWatch stopWatch = new StopWatch();
      stopWatch.start();
// doInsert();
// 执行业务等
      Dept dept = deptService.getById(AuthUtil.getDeptId());
      if (null!=dept){
         household.setRegionCode(dept.getRegionCode());
      }
      List<HouseholdVO> householdVOS = baseMapper.selectHouseholdPage(page, household);
      // 遍历
      for (HouseholdVO householdVO : householdVOS) {
         // 设置对应的网格名称
         GridVO gridVO = gridService.getGridDetailByHouseCode(householdVO.getHouseCode());
         if (null!= gridVO){
            householdVO.setGridName(gridVO.getGridName());
         }
      }
      // for (HouseholdVO householdVO : householdVOS) {
      //    // 设置对应的网格名称
      //    GridVO gridVO = gridService.getGridDetailByHouseCode(householdVO.getHouseCode());
      //    if (null!= gridVO){
      //       householdVO.setGridName(gridVO.getGridName());
      //    }
      // }
      // 返回
      stopWatch.stop();
      System.out.println("selectHouseholdPage:" + stopWatch.getTotalTimeMillis());
      return page.setRecords(householdVOS);
   }

@@ -265,8 +277,8 @@
    * @return
    */
   @Override
   public Integer statistics(Long userId) {
      return baseMapper.statistics(userId);
   public Integer statistics(Long userId,String neiCode) {
      return baseMapper.statistics(userId,neiCode);
   }

   /**