小区用户支持栋，单元+名字查询

lin

2024-03-25 6b239bc3f277611786408c74f30ae7b338ac06a8

小区用户支持栋，单元+名字查询

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -44,6 +44,7 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.excel.PoliceUserExcel;
import org.springblade.modules.system.excel.PoliceUserImporter;
@@ -415,13 +416,13 @@
     */
    @GetMapping("/getUserInfoByDistrictIds")
    @ApiOperation(value = "通过小区id查询用户")
    public  R<IPage<UserVO>> getUserInfoByDistrictIds(@RequestParam("districtIds") String districtIds
    public  R<IPage<HouseholdVO>> getUserInfoByDistrictIds(@RequestParam("districtIds") String districtIds
        , @RequestParam(value = "building", required = false) String building
        , @RequestParam(value = "unit", required = false) String unit
        , @RequestParam(value = "name", required = false) String name
        , Query query) {
        IPage<User> pages = userService.getUserInfoByDistrictIds(districtIds, building, unit, name, Condition.getPage(query));
        return R.data(UserWrapper.build().pageVO(pages));
        IPage<HouseholdVO> pages = userService.getUserInfoByDistrictIds(districtIds, building, unit, name, Condition.getPage(query));
        return R.data(pages);
    }



 src/main/java/org/springblade/modules/system/mapper/UserMapper.java

@@ -21,6 +21,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.vo.UserDetailVO;
@@ -121,7 +122,7 @@
     * @param list
     * @return
     */
    List<User> getUserInfoByDistrictIds(@Param("list") List<String> list, String building, String unit, String name, IPage<User> page);
    List<HouseholdVO> getUserInfoByDistrictIds(@Param("list") List<String> list, String building, String unit, String name, IPage<HouseholdVO> page);

    /**
     * 通过机构查询用户

 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -233,10 +233,11 @@
            )

    </select>
    <select id="getUserInfoByDistrictIds" resultType="org.springblade.modules.system.entity.User">
    <select id="getUserInfoByDistrictIds" resultType="org.springblade.modules.house.vo.HouseholdVO">

        SELECT
        bu.id,
        jh.*,
        bu.id userId,
        bu.tenant_id,
        bu.code,
        bu.user_type,
@@ -246,7 +247,9 @@
        bu.avatar,
        bu.email,
        bu.phone,
        bu.birthday
        bu.birthday,
        jhe.building,
        jhe.unit
        FROM
        blade_user bu
        LEFT JOIN jczz_household jh ON bu.id = jh.associated_user_id and jh.is_deleted=0

 src/main/java/org/springblade/modules/system/service/IUserService.java

@@ -23,6 +23,7 @@
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.mp.support.Query;
import org.springblade.modules.auth.enums.UserEnum;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.entity.UserInfo;
import org.springblade.modules.system.entity.UserOauth;
@@ -276,7 +277,7 @@
     * @param name
     * @return
     */
    IPage<User> getUserInfoByDistrictIds(String districtIds,String building,String unit,String name,IPage<User> page);
    IPage<HouseholdVO> getUserInfoByDistrictIds(String districtIds,String building,String unit,String name,IPage<HouseholdVO> page);

    /**
     * 查询500M内的民警

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -50,6 +50,7 @@
import org.springblade.modules.grid.service.IGridmanService;
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
@@ -632,9 +633,10 @@
     * @return
     */
    @Override
    public IPage<User> getUserInfoByDistrictIds(String districtIds, String building, String unit, String name, IPage<User> page) {
    public IPage<HouseholdVO> getUserInfoByDistrictIds(String districtIds, String building, String unit, String name, IPage<HouseholdVO> page) {
        List<String> list = JSON.parseArray(districtIds).toJavaList(String.class);
        return page.setRecords(baseMapper.getUserInfoByDistrictIds(list, building, unit, name, page));
        List<HouseholdVO> userInfoByDistrictIds = baseMapper.getUserInfoByDistrictIds(list, building, unit, name, page);
        return page.setRecords(userInfoByDistrictIds);
    }

    /**