开栓

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

@@ -34,7 +34,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/zdsz/comprehensive")
+@RequestMapping("/zdsz/openbolt")
 public class ZComprehensiveController extends BaseController {
 
     private final IZComprehensiveService iZComprehensiveService;
@@ -42,7 +42,7 @@ public class ZComprehensiveController extends BaseController {
     /**
      * 查询开栓|安检|维修列表
      */
-    @SaCheckPermission("zdsz:comprehensive:list")
+    @SaCheckPermission("zdsz:openbolt:list")
     @GetMapping("/list")
     public TableDataInfo<ZComprehensiveVo> list(ZComprehensiveBo bo, PageQuery pageQuery) {
         return iZComprehensiveService.queryPageList(bo, pageQuery);
@@ -51,8 +51,8 @@ public class ZComprehensiveController extends BaseController {
     /**
      * 导出开栓|安检|维修列表
      */
-    @SaCheckPermission("zdsz:comprehensive:export")
-    @Log(title = "开栓|安检|维修", businessType = BusinessType.EXPORT)
+    @SaCheckPermission("zdsz:openbolt:export")
+    @Log(title = "开栓", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZComprehensiveBo bo, HttpServletResponse response) {
         List<ZComprehensiveVo> list = iZComprehensiveService.queryList(bo);
@@ -64,7 +64,7 @@ public class ZComprehensiveController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("zdsz:comprehensive:query")
+    @SaCheckPermission("zdsz:openbolt:query")
     @GetMapping("/{id}")
     public R<ZComprehensiveVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable String id) {
@@ -74,8 +74,8 @@ public class ZComprehensiveController extends BaseController {
     /**
      * 新增开栓|安检|维修
      */
-    @SaCheckPermission("zdsz:comprehensive:add")
-    @Log(title = "开栓|安检|维修", businessType = BusinessType.INSERT)
+    @SaCheckPermission("zdsz:openbolt:add")
+    @Log(title = "开栓", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody ZComprehensiveBo bo) {
@@ -85,8 +85,8 @@ public class ZComprehensiveController extends BaseController {
     /**
      * 修改开栓|安检|维修
      */
-    @SaCheckPermission("zdsz:comprehensive:edit")
-    @Log(title = "开栓|安检|维修", businessType = BusinessType.UPDATE)
+    @SaCheckPermission("zdsz:openbolt:edit")
+    @Log(title = "开栓", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZComprehensiveBo bo) {
@@ -98,8 +98,8 @@ public class ZComprehensiveController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("zdsz:comprehensive:remove")
-    @Log(title = "开栓|安检|维修", businessType = BusinessType.DELETE)
+    @SaCheckPermission("zdsz:openbolt:remove")
+    @Log(title = "开栓", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable String[] ids) {

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

@@ -53,7 +53,14 @@ public class ZHouseController extends BaseController {
     public TableDataInfo<ZHouseVo> list(ZHouseBo bo, PageQuery pageQuery) {
         return iZHouseService.queryPageList(bo, pageQuery);
     }
-
+    /**
+     * 房间下拉
+     *
+     */
+    @GetMapping("/getHouses")
+    public R getUnitList(String unitId) {
+        return R.ok(iZHouseService.getHouses(unitId));
+    }
     /**
      * 导出房间管理列表
      */

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

@@ -23,7 +23,7 @@ public class ZComprehensive extends BaseEntity {
     private static final long serialVersionUID=1L;
 
     /**
-     * 
+     *
      */
     @TableId(value = "id")
     private String id;

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

@@ -1,5 +1,7 @@
 package com.ruoyi.zdsz.domain.bo;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import lombok.Data;
@@ -22,9 +24,10 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class ZComprehensiveBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { EditGroup.class })
+    @TableId(type = IdType.ASSIGN_UUID)
     private String id;
 
     /**

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

@@ -22,7 +22,7 @@ public class ZComprehensiveVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String id;
@@ -75,5 +75,16 @@ public class ZComprehensiveVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    @ExcelProperty(value = "小区")
+    private String areaName;
+
+    @ExcelProperty(value = "楼栋")
+    private String buildingName;
+
+    @ExcelProperty(value = "单元")
+    private String unitName;
+
+    @ExcelProperty(value = "房间号")
+    private String houseName;
 
 }

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

@@ -1,8 +1,13 @@
 package com.ruoyi.zdsz.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.zdsz.domain.ZComprehensive;
+import com.ruoyi.zdsz.domain.bo.ZComprehensiveBo;
+import com.ruoyi.zdsz.domain.bo.ZHouseBo;
 import com.ruoyi.zdsz.domain.vo.ZComprehensiveVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import com.ruoyi.zdsz.domain.vo.ZHouseVo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 开栓|安检|维修Mapper接口
@@ -12,4 +17,5 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  */
 public interface ZComprehensiveMapper extends BaseMapperPlus<ZComprehensiveMapper, ZComprehensive, ZComprehensiveVo> {
 
+    Page<ZComprehensiveVo> getPageList(@Param("p") ZComprehensiveBo bo, Page<?> page);
 }

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

@@ -9,6 +9,8 @@ import com.ruoyi.zdsz.domain.vo.ZHouseVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 房间管理Mapper接口
  *
@@ -18,4 +20,5 @@ import org.apache.ibatis.annotations.Param;
 public interface ZHouseMapper extends BaseMapperPlus<ZHouseMapper, ZHouse, ZHouseVo> {
     Page<ZHouseVo> getPageList(@Param("p") ZHouseBo bo, Page<?> page);
 
+    List<ZHouseVo> selectListByunitId(String unitId);
 }

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

@@ -48,4 +48,6 @@ public interface IZHouseService {
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
     int getHouseByUnitId(Collection<String> list);
+
+    List<ZHouseVo> getHouses(String unitId);
 }

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

@@ -1,12 +1,15 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
 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.ZHouseBo;
+import com.ruoyi.zdsz.domain.vo.ZHouseVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZComprehensiveBo;
@@ -44,9 +47,12 @@ public class ZComprehensiveServiceImpl implements IZComprehensiveService {
      */
     @Override
     public TableDataInfo<ZComprehensiveVo> queryPageList(ZComprehensiveBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<ZComprehensive> lqw = buildQueryWrapper(bo);
-        Page<ZComprehensiveVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
+//        LambdaQueryWrapper<ZComprehensive> lqw = buildQueryWrapper(bo);
+//        Page<ZComprehensiveVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+//        return TableDataInfo.build(result);
+        Page<ZComprehensiveVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        Page<ZComprehensiveVo> list = baseMapper.getPageList(bo,page);
+        return PageUtils.buildDataInfo(list);
     }
 
     /**

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

@@ -8,9 +8,6 @@ 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.ZBuilding;
-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.ZHouseBo;
@@ -125,4 +122,9 @@ public class ZHouseServiceImpl implements IZHouseService {
         lqw.in(!ids.isEmpty(), ZHouse::getUnitId, ids);
         return baseMapper.selectVoList(lqw).size();
     }
+
+    @Override
+    public List<ZHouseVo> getHouses(String unitId) {
+        return baseMapper.selectListByunitId(unitId);
+    }
 }

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

@@ -20,6 +20,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
     </resultMap>
-
+    <select id="getPageList" resultType="com.ruoyi.zdsz.domain.vo.ZComprehensiveVo">
+        SELECT
+        zc.*,
+        zh.NAME AS houseName,
+        zt.NAME AS unitName,
+        zb.NAME AS buildingName,
+        za.NAME AS areaName
+        FROM
+        z_comprehensive AS zc
+        LEFT JOIN z_house AS zh ON zh.id = zc.house_id
+        LEFT JOIN z_unit AS zt ON zh.unit_id = zt.id
+        LEFT JOIN z_building AS zb ON zt.building_id = zb.id
+        LEFT JOIN z_area AS za ON zb.area_id = za.id
+        where 1=1
+           and zc.del_flag = '0'
+          and zc.type = #{p.type}
+            <if test="p.areaId != null  and p.areaId != ''">
+                and zc.area_id = #{p.areaId}
+            </if>
+            <if test="p.buildingId != null  and p.buildingId != ''">
+                and zc.building_id = #{p.buildingId}
+            </if>
+            <if test="p.unitId != null  and p.unitId != ''">
+                and zc.unit_id = #{p.unitId}
+            </if>
+            <if test="p.unitId != null  and p.unitId != ''">
+                and zc.unit_id = #{p.unitId}
+            </if>
+            <if test="p.houseId != null  and p.houseId != ''">
+                and zc.house_id = #{houseId}
+            </if>
+    </select>
 
 </mapper>

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

@@ -43,4 +43,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+
+    <select id="selectListByunitId" resultType="com.ruoyi.zdsz.domain.vo.ZHouseVo">
+        select * from z_house as zh where zh.del_flag = '0'
+        <if test="unitId != null  and unitId != ''">
+            and zh.unit_id = #{unitId}
+        </if>
+    </select>
 </mapper>