公安安全监管

linwei

2024-01-08 ad2ec97fe0c60eee4bb7c8cdacff7c876f280ea7

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

@@ -33,7 +33,9 @@
import org.springblade.modules.house.vo.HouseRentalTenantVO;
import org.springblade.modules.house.vo.HouseRentalVO;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -60,6 +62,9 @@
   @Autowired
   private IGridService gridService;

   @Autowired
   private IDeptService deptService;

   /**
    * 自定义分页查询
    * @param page
@@ -68,6 +73,10 @@
    */
   @Override
   public IPage<HouseRentalTenantVO> selectHouseRentalPage(IPage<HouseRentalTenantVO> page, HouseRentalTenantVO houseRental) {
      Dept dept = deptService.getById(AuthUtil.getDeptId());
      if (null!=dept){
         houseRental.setRegionCode(dept.getRegionCode());
      }
      List<String> list = new ArrayList<>();
      if (null!=houseRental.getRoleName() && !houseRental.getRoleName().equals("")){
         if (houseRental.getRoleName().equals("网格员")){
@@ -121,18 +130,20 @@
   @Override
   @Transactional(rollbackFor = Exception.class)
   public Boolean add(HouseRentalVO houseRentalVO) {
      // 判断添加人是否房屋业主
      Long count = iHouseholdService.count(Wrappers.<HouseholdEntity>lambdaQuery()
         .eq(HouseholdEntity::getHouseCode, houseRentalVO.getHouseCode())
         .eq(HouseholdEntity::getAssociatedUserId, AuthUtil.getUserId())
         .eq(HouseholdEntity::getRelationship, 1));
      if (count == 0) {
         return false;
      }
//      // 判断添加人是否房屋业主
//      Long count = iHouseholdService.count(Wrappers.<HouseholdEntity>lambdaQuery()
//         .eq(HouseholdEntity::getHouseCode, houseRentalVO.getHouseCode())
//         .eq(HouseholdEntity::getAssociatedUserId, AuthUtil.getUserId())
//         .eq(HouseholdEntity::getRelationship, 1));
//      if (count == 0) {
//         return false;
//      }
      houseRentalVO.setCreateUser(AuthUtil.getUserId());
      houseRentalVO.setCreateTime(new Date());
      houseRentalVO.setUpdateUser(AuthUtil.getUserId());
      houseRentalVO.setUpdateTime(new Date());
      // 网格员新增默认是审核通过
      houseRentalVO.setAuditStatus(1);
      //保存自身
      boolean save = save(houseRentalVO);
      List<String> phoneList = new ArrayList<>();
@@ -182,10 +193,8 @@
      boolean update = iHouseholdService.update(Wrappers.<HouseholdEntity>lambdaUpdate()
         .set(HouseholdEntity::getIsDeleted, 1)
         .eq(HouseholdEntity::getHousingRentalId, id));
      if (update) {
         return true && b;
      }
      return false;
      // 返回
      return b;
   }

   /**
@@ -320,6 +329,6 @@

   @Override
   public Integer getStatisticsCount(HouseRentalTenantVO houseRental) {
      return baseMapper.getStatisticsCount(AuthUtil.getUserId());
      return baseMapper.getStatisticsCount(houseRental.getUserId(), houseRental.getNeiCode());
   }
}