开栓搜索

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -69,6 +69,12 @@ public class SysUserController extends BaseController {
         return userService.selectPageUserList(user, pageQuery);
     }
 
+    @SaCheckPermission("system:user:list")
+    @GetMapping("/listAll")
+    public R list(SysUser user) {
+        return R.ok(userService.selectAll(user));
+    }
+
     /**
      * 导出用户列表
      */

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -23,6 +23,7 @@ public interface ISysUserService {
      * @return 用户信息集合信息
      */
     List<SysUser> selectUserList(SysUser user);
+    List<SysUser> selectAll(SysUser user);
 
     /**
      * 根据条件分页查询已分配用户角色列表

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -72,6 +72,13 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
         return baseMapper.selectUserList(this.buildQueryWrapper(user));
     }
 
+    @Override
+    public List<SysUser> selectAll(SysUser user) {
+        QueryWrapper<SysUser> wrapper = Wrappers.query();
+        wrapper.lambda().eq(SysUser::getStatus,user.getStatus());
+        return baseMapper.selectList(wrapper);
+    }
+
     private Wrapper<SysUser> buildQueryWrapper(SysUser user) {
         Map<String, Object> params = user.getParams();
         QueryWrapper<SysUser> wrapper = Wrappers.query();

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZComprehensive.java

@@ -43,6 +43,9 @@ public class ZComprehensive extends BaseEntity {
      * 房间id
      */
     private String houseId;
+
+    private String district;
+
     /**
      * 类型
      */

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZComprehensiveBo.java

@@ -51,6 +51,11 @@ public class ZComprehensiveBo extends BaseEntity {
      */
     @NotBlank(message = "单元id不能为空", groups = {AddGroup.class, EditGroup.class})
     private String unitId;
+    /**
+     * 行政区
+     */
+    @NotBlank(message = "行政区不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String district;
 
     /**
      * 房间id
@@ -96,6 +101,9 @@ public class ZComprehensiveBo extends BaseEntity {
     private String remark;
 
 
+    private String personBy;
+
+
     @JsonProperty(value = "picIds")
     private List<String> picIds;
 

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZComprehensiveVo.java

@@ -49,6 +49,10 @@ public class ZComprehensiveVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "单元id")
     private String unitId;
 
+    @ExcelProperty(value = "行政区", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "district")
+    private String district;
+
     /**
      * 房间id
      */

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZComprehensiveMapper.xml

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="buildingId" column="building_id"/>
         <result property="unitId" column="unit_id"/>
         <result property="houseId" column="house_id"/>
+        <result property="district" column="district"/>
         <result property="type" column="type"/>
         <result property="isQualified" column="is_qualified"/>
         <result property="isMaintenance" column="is_maintenance"/>
@@ -30,6 +31,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="p.buildingId != null and p.buildingId != ''">
             AND building_id = #{p.buildingId}
         </if>
+        <if test="p.personBy != null and p.personBy != ''">
+            AND create_by = #{p.personBy}
+        </if>
+        <if test="p.district != null and p.district != ''">
+            AND district = #{p.district}
+        </if>
         <if test="p.unitId != null and p.unitId != ''">
             AND unit_id = #{p.unitId}
         </if>
@@ -60,9 +67,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="p.buildingId != null and p.buildingId != ''">
             AND building_id = #{p.buildingId}
         </if>
+        <if test="p.personBy != null and p.personBy != ''">
+            AND create_by = #{p.personBy}
+        </if>
         <if test="p.unitId != null and p.unitId != ''">
             AND unit_id = #{p.unitId}
         </if>
+        <if test="p.district != null and p.district != ''">
+            AND district = #{p.district}
+        </if>
         <if test="p.houseId != null and p.houseId != ''">
             AND house_id = #{p.houseId}
         </if>