提交代码

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZBuildingController.java

@@ -5,8 +5,10 @@ import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
 import lombok.RequiredArgsConstructor;
+
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
+
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
@@ -40,7 +42,8 @@ public class ZBuildingController extends BaseController {
     private final IZBuildingService iZBuildingService;
 
     /**
-     * 小区下拉
+     * 楼宇下拉
+     *
      * @return
      */
     @GetMapping("/getBuildingList")
@@ -75,8 +78,7 @@ public class ZBuildingController extends BaseController {
      */
     @SaCheckPermission("zdsz:building:query")
     @GetMapping("/{id}")
-    public R<ZBuildingVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+    public R<ZBuildingVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) {
         return R.ok(iZBuildingService.queryById(id));
     }
 
@@ -110,8 +112,7 @@ public class ZBuildingController extends BaseController {
     @SaCheckPermission("zdsz:building:remove")
     @Log(title = "楼栋管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
+    public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable String[] ids) {
         return toAjax(iZBuildingService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZUnitController.java

@@ -5,8 +5,10 @@ import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
 import lombok.RequiredArgsConstructor;
+
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
+
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
@@ -40,12 +42,22 @@ public class ZUnitController extends BaseController {
     private final IZUnitService iZUnitService;
 
     /**
+     * 单元下拉
+     *
+     * @return
+     */
+    @GetMapping("/getUnitList")
+    public R getUnitList(String areaId, String buildingId) {
+        return R.ok(iZUnitService.getUnitList(areaId, buildingId));
+    }
+
+    /**
      * 查询单元管理列表
      */
     @SaCheckPermission("zdsz:unit:list")
     @GetMapping("/list")
     public TableDataInfo<ZUnitVo> list(ZUnitBo bo, PageQuery pageQuery) {
-        return iZUnitService.queryPageList(bo, pageQuery);
+        return iZUnitService.getPageList(bo, pageQuery);
     }
 
     /**
@@ -66,8 +78,7 @@ public class ZUnitController extends BaseController {
      */
     @SaCheckPermission("zdsz:unit:query")
     @GetMapping("/{id}")
-    public R<ZUnitVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+    public R<ZUnitVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) {
         return R.ok(iZUnitService.queryById(id));
     }
 
@@ -101,8 +112,7 @@ public class ZUnitController extends BaseController {
     @SaCheckPermission("zdsz:unit:remove")
     @Log(title = "单元管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable String[] ids) {
+    public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable String[] ids) {
         return toAjax(iZUnitService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

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

@@ -48,7 +48,6 @@ public class ZUnitBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

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

@@ -32,12 +32,14 @@ public class ZUnitVo implements Serializable {
      */
     @ExcelProperty(value = "")
     private String areaId;
+    private String areaName;
 
     /**
      * 
      */
     @ExcelProperty(value = "")
     private String buildingId;
+    private String buildingName;
 
     /**
      * 

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZUnitMapper.java

@@ -1,8 +1,15 @@
 package com.ruoyi.zdsz.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.zdsz.domain.ZUnit;
+import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
+import com.ruoyi.zdsz.domain.bo.ZUnitBo;
+import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
 import com.ruoyi.zdsz.domain.vo.ZUnitVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 单元管理Mapper接口
@@ -11,5 +18,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * @date 2023-12-27
  */
 public interface ZUnitMapper extends BaseMapperPlus<ZUnitMapper, ZUnit, ZUnitVo> {
+    Page<ZUnitVo> getPageList(@Param("p") ZUnitBo bo, Page<?> page);
 
+    List<ZUnitVo> getUnitList(@Param("areaId")String areaId,@Param("buildingId") String buildingId);
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZUnitService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.zdsz.service;
 
 import com.ruoyi.zdsz.domain.ZUnit;
+import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
 import com.ruoyi.zdsz.domain.vo.ZUnitVo;
 import com.ruoyi.zdsz.domain.bo.ZUnitBo;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -18,6 +19,12 @@ import java.util.List;
 public interface IZUnitService {
 
     /**
+     * 单元下拉
+     * */
+    List<ZUnitVo> getUnitList(String areaId,String buildingId);
+
+
+    /**
      * 查询单元管理
      */
     ZUnitVo queryById(String id);
@@ -25,7 +32,7 @@ public interface IZUnitService {
     /**
      * 查询单元管理列表
      */
-    TableDataInfo<ZUnitVo> queryPageList(ZUnitBo bo, PageQuery pageQuery);
+    TableDataInfo<ZUnitVo> getPageList(ZUnitBo bo, PageQuery pageQuery);
 
     /**
      * 查询单元管理列表

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZBuildingServiceImpl.java

@@ -47,7 +47,7 @@ public class ZBuildingServiceImpl implements IZBuildingService {
     public TableDataInfo<ZBuildingVo> getPageList(ZBuildingBo bo, PageQuery pageQuery) {
         Page<ZBuildingBo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
         Page<ZBuildingVo> list = baseMapper.getPageList(bo,page);
-        return PageUtils.buildDataInfo(list);
+        return TableDataInfo.build(list);
     }
 
     /**

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZUnitServiceImpl.java

@@ -7,6 +7,8 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
+import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZUnitBo;
@@ -31,6 +33,11 @@ public class ZUnitServiceImpl implements IZUnitService {
 
     private final ZUnitMapper baseMapper;
 
+    @Override
+    public List<ZUnitVo> getUnitList(String areaId, String buildingId) {
+        return baseMapper.getUnitList(areaId,buildingId);
+    }
+
     /**
      * 查询单元管理
      */
@@ -43,9 +50,9 @@ public class ZUnitServiceImpl implements IZUnitService {
      * 查询单元管理列表
      */
     @Override
-    public TableDataInfo<ZUnitVo> queryPageList(ZUnitBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<ZUnit> lqw = buildQueryWrapper(bo);
-        Page<ZUnitVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+    public TableDataInfo<ZUnitVo> getPageList(ZUnitBo bo, PageQuery pageQuery) {
+        Page<ZUnitBo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        Page<ZUnitVo> result = baseMapper.getPageList(bo,page);
         return TableDataInfo.build(result);
     }
 

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

@@ -25,8 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                name as name
         from z_area
         where del_flag = '0'
-        <if test="district != null district != ''">
-            and a.district = #{district}
+        <if test="district != null and district != ''">
+            and district = #{district}
         </if>
     </select>
 

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

@@ -21,8 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                name as name
         from z_building
         where del_flag = '0'
-        <if test="areaId != null areaId != ''">
-            and a.area_id = #{areaId}
+        <if test="areaId != null and areaId != ''">
+            and area_id = #{areaId}
         </if>
     </select>
 

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

@@ -18,4 +18,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
 
+    <select id="getUnitList" resultType="com.ruoyi.zdsz.domain.vo.ZUnitVo">
+        select id   as id,
+        name as name
+        from z_unit
+        where del_flag = '0'
+        <if test="areaId != null and areaId != ''">
+            and area_id = #{areaId}
+        </if>
+        <if test="buildingId != null and buildingId != ''">
+            and building_id = #{buildingId}
+        </if>
+    </select>
+
+    <select id="getPageList" resultType="com.ruoyi.zdsz.domain.vo.ZUnitVo">
+        select a.id as id,
+        a.name as name,
+        (select b.name from z_area b where b.id = a.area_id) as areaName,
+        (select c.name from z_building c where c.id = a.building_id) as buildingName
+        from z_unit a
+        <where>
+            a.del_flag = '0'
+            <if test="p.name != null  and p.name != ''">
+                and a.name LIKE CONCAT('%',#{p.name},'%')
+            </if>
+            <if test="p.areaId != null  and p.areaId != ''">
+                and a.area_id = #{p.areaId}
+            </if>
+            <if test="p.buildingId != null  and p.buildingId != ''">
+                and a.building_id = #{p.buildingId}
+            </if>
+        </where>
+    </select>
+
 </mapper>