Merge remote-tracking branch 'origin/master'

linwei

2024-01-10 f8d1143ef6cfbbaaebe3b25efa24ee19c9ea61c8

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

@@ -50,6 +50,7 @@
import org.springframework.util.StopWatch;

import java.util.*;
import java.util.stream.Collectors;

/**
 * 住户 服务实现类
@@ -148,6 +149,10 @@
      boolean flag = false;
      household.setUpdateTime(new Date());
      household.setUpdateUser(AuthUtil.getUserId());
      if (!Strings.isBlank(household.getRoleName()) && household.getRoleName().equals("居民")){
         // 待审核
         household.setConfirmFlag(0);
      }
      if (null != household.getId()) {
         // 更新
         flag = updateById(household);
@@ -447,4 +452,29 @@
         userHouseLabelService.remove(wrapper);
      }
   }

   @Override
   public List<HouseholdVO> getAllHouseHold(HouseholdVO household) {
      return  baseMapper.getAllHouseHold(household);
   }

   /**
    * 住户列表查询
    * @param household
    * @return
    */
   @Override
   public List<HouseholdVO> selectHouseholdList(HouseholdVO household) {
      List<HouseholdVO> householdVOS = baseMapper.selectHouseholdList(household);
      // 遍历
      for (HouseholdVO householdVO : householdVOS) {
         if (householdVO.getHouseholdLabelList().size()>0){
            List<String> labelNameList = householdVO.getHouseholdLabelList().stream().map(householdLabelVO -> householdLabelVO.getLabelName())
               .collect(Collectors.toList());
            householdVO.setLabelName(String.join(",",labelNameList));
         }
      }
      // 返回
      return  householdVOS;
   }
}