fix 常用人员

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/controller/houseInfo/HouseInfoController.java

@@ -1,15 +1,12 @@
 package org.dromara.controller.houseInfo;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
-import org.dromara.common.core.domain.model.AjaxResult;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.excel.utils.ExcelUtils;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
@@ -24,7 +21,6 @@ import org.dromara.domain.residentInfo.ResidentInfo;
 import org.dromara.service.IHouseInfoService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -51,6 +47,15 @@ public class HouseInfoController extends BaseController {
         return houseInfoService.queryPageList(residentInfo, pageQuery);
     }
 
+    /**
+     * 查询房屋信息列表 物业查询 不带人员返回
+     */
+    @SaCheckPermission("wuYe:houseInfo:listManage")
+    @GetMapping("/listManage")
+    public TableDataInfo<HouseInfoVo> listManage(HouseInfoBo bo, PageQuery pageQuery) {
+        return houseInfoService.queryPageListManage(bo, pageQuery);
+    }
+
     /**
      * 查询房屋信息列表不分页
      */
@@ -74,9 +79,9 @@ public class HouseInfoController extends BaseController {
         return R.ok(list);
     }
 
-    /**
+/*    *//**
      * 导出房屋信息列表
-     */
+     *//*
     @SaCheckPermission("wuYe:houseInfo:export")
     @Log(title = "房屋信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
@@ -85,22 +90,22 @@ public class HouseInfoController extends BaseController {
         list = houseInfoService.queryResidentInfo(list);
         ExcelUtils<HouseInfoVo> util = new ExcelUtils<HouseInfoVo>(HouseInfoVo.class);
         util.exportExcel(response, list, "房屋信息数据");
-    }
+    }*/
 
-    /**
+/*    *//**
      * 导入房屋信息列表
      *
      * @param file
      * @return
      * @throws Exception
-     */
+     *//*
     @SaCheckPermission("wuYe:houseInfo:importData")
     @PostMapping("/importData")
     public AjaxResult importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
         ExcelUtils<HouseInfoVo> util = new ExcelUtils<HouseInfoVo>(HouseInfoVo.class);
         List<HouseInfoVo> houseInfoList = util.importExcel(file.getInputStream());
         return houseInfoService.importHouseInfo(houseInfoList);
-    }
+    }*/
 
     /**
      * 获取房屋信息详细信息

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/IHouseInfoService.java

@@ -37,6 +37,11 @@ public interface IHouseInfoService {
      */
     TableDataInfo<HouseInfo> queryPageList(ResidentInfo residentInfo, PageQuery pageQuery);
 
+    /**
+     * 查询房屋信息列表 物业查询 不带人员返回
+     */
+    TableDataInfo<HouseInfoVo> queryPageListManage(HouseInfoBo bo, PageQuery pageQuery);
+
     /**
      * 查询符合条件的房屋信息列表
      *

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/HouseInfoServiceImpl.java

@@ -72,6 +72,16 @@ public class HouseInfoServiceImpl implements IHouseInfoService {
         return TableDataInfo.build(result);
     }
 
+    /**
+     * 查询房屋信息列表 物业查询 不带人员返回
+     */
+    @Override
+    public TableDataInfo<HouseInfoVo> queryPageListManage(HouseInfoBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<HouseInfo> lqw = buildQueryWrapper(bo);
+        Page<HouseInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
     /**
      * 查询符合条件的房屋信息列表
      *

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/ResidentInfoServiceImpl.java

@@ -412,6 +412,10 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
     @Override
     public Boolean updateByBo(ResidentInfoBo bo) {
         ResidentInfo update = MapstructUtils.convert(bo, ResidentInfo.class);
+        //如果未通过,改为待审核
+        if (THR.equals(update.getExamine())){
+            update.setExamine(ONE);
+        }
         validEntityBeforeSave(update);
 /*        //根据租户id houseId 手机号查询该居住人员是否存在
         if (checkIdCardUnique(update)) {
@@ -685,6 +689,10 @@ public class ResidentInfoServiceImpl implements IResidentInfoService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean editAuthentication(ResidentInfoBo bo) {
         ResidentInfo residentInfo = MapstructUtils.convert(bo, ResidentInfo.class);
+        //如果未通过,改为待审核
+        if (THR.equals(residentInfo.getExamine())){
+            residentInfo.setExamine(ONE);
+        }
         //判断是否修改了租户
         ResidentInfoVo residentInfoVo = baseMapper.selectVoById(residentInfo.getResidentId());
         //String tenantIdOld = residentInfoVo.getTenantId();

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/StaffManageServiceImpl.java

@@ -305,6 +305,9 @@ public class StaffManageServiceImpl implements IStaffManageService {
     @Override
     public Boolean updateByBo(StaffManageBo bo) {
         StaffManage update = MapstructUtils.convert(bo, StaffManage.class);
+       if (THR.equals(update.getExamine())){
+           update.setExamine(ONE);
+       }
         if (bo.getIsFilter()) {
             return TenantHelper.ignore(() -> {
                 return baseMapper.updateById(update) > 0;
@@ -322,6 +325,9 @@ public class StaffManageServiceImpl implements IStaffManageService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean editAuthentication(StaffManageBo bo) {
         StaffManage examineStaffManage = MapstructUtils.convert(bo, StaffManage.class);
+        if (THR.equals(examineStaffManage.getExamine())){
+            examineStaffManage.setExamine(ONE);
+        }
         //判断是否修改了租户
         StaffManageVo staffManageVo = baseMapper.selectVoById(bo.getStaffId());
         //原始的tenantId