房屋查询过滤

lin

2024-03-02 861e9b1eb145094dff6d1caf3dba30d7ce0e11d7

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

@@ -21,9 +21,9 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.SysCache;
import org.springblade.common.node.TreeIntegerNode;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
@@ -40,10 +40,8 @@
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.service.IPlaceService;
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;
@@ -79,16 +77,21 @@
   public IPage<HouseholdVO> selectHouseholdPage(IPage<HouseholdVO> page, HouseholdVO household) {
      StopWatch stopWatch = new StopWatch();
      stopWatch.start();
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
      List<HouseholdVO> householdVOS = baseMapper.selectHouseholdPage(page, household,regionChildCodesList,isAdministrator);
      CommonParamSet commonParamSet = new CommonParamSet().invoke(HouseholdVO.class, household);

//      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
//      Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;

      List<HouseholdVO> householdVOS = baseMapper.selectHouseholdPage(page, household, commonParamSet.getIsAdministrator(),
         commonParamSet.getRegionChildCodesList(), commonParamSet.getGridCodeList());
      stopWatch.stop();
      System.out.println("selectHouseholdPage:" + stopWatch.getTotalTimeMillis());
//      System.out.println("selectHouseholdPage:" + stopWatch.getTotalTimeMillis());
      return page.setRecords(householdVOS);
   }

   /**
    * 查询房屋集合信息
    *
    * @param userId
    * @return
    */
@@ -99,6 +102,7 @@

   /**
    * 查询房屋人员情况
    *
    * @param code
    * @return
    */
@@ -114,6 +118,7 @@

   /**
    * 处理字典
    *
    * @param householdList
    */
   private void handleDictBiz(List<HouseholdVO> householdList) {
@@ -137,6 +142,7 @@

   /**
    * 住户 自定义新增或修改
    *
    * @param household
    * @return
    */
@@ -172,6 +178,7 @@

   /**
    * 更新用户标签信息
    *
    * @param household
    */
   public void updateUserLabelInfo(HouseholdVO household) {
@@ -190,6 +197,7 @@

   /**
    * 更新用户信息
    *
    * @param household
    */
   public void updateUserInfo(HouseholdEntity household) {
@@ -203,6 +211,7 @@

   /**
    * 业主和用户绑定
    *
    * @param
    */
   public User bindUserHandle(HouseholdEntity householdEntity) {
@@ -256,6 +265,7 @@

   /**
    * 住户 自定义查询详情
    *
    * @param household
    * @return
    */
@@ -282,16 +292,24 @@

   /**
    * 住户审核统计
    *
    * @param userId
    * @return
    */
   @Override
   public Integer statistics(Long userId,String neiCode) {
      return baseMapper.statistics(userId,neiCode);
   public Integer statistics(Long userId, String neiCode,Integer confirmFlag) {
      HouseholdVO householdVO = new HouseholdVO();
      householdVO.setConfirmFlag(confirmFlag);
      householdVO.setNeiCode(neiCode);
      CommonParamSet commonParamSet = new CommonParamSet().invoke(HouseholdVO.class, householdVO);

      return baseMapper.statistics(householdVO,commonParamSet.getIsAdministrator(),
         commonParamSet.getRegionChildCodesList(), commonParamSet.getGridCodeList());
   }

   /**
    * 住户对应物业，网格，公安负责人查询
    *
    * @param household
    * @return
    */
@@ -332,6 +350,7 @@

   /**
    * 住户业主信息处理，将业主人员插入到用户表
    *
    * @return
    */
   @Override
@@ -398,6 +417,7 @@

   /**
    * 同时删除对应的用户信息
    *
    * @param idList
    */
   public void removeHouseholdUser(List<Long> idList) {
@@ -446,6 +466,7 @@

   /**
    * 删除住户标签信息
    *
    * @param idList
    */
   public void removeHouseholdLabel(List<Long> idList) {
@@ -463,6 +484,7 @@

   /**
    * 住户列表查询
    *
    * @param household
    * @return
    */
@@ -497,6 +519,7 @@

   /**
    * 根据人员标签编号集合查询对应的住户（按颜色区分近多少天没有发过任务的住户）
    *
    * @param list
    * @return
    */