开栓提交

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

@@ -61,6 +61,13 @@ public class SysUserController extends BaseController {
     private final ISysDeptService deptService;
 
     /**
+     * 根据用户账号查询用户详情信息
+     */
+    @GetMapping("/selectUserByUserName")
+    public SysUser selectUserByUserName(String userName) {
+        return userService.selectUserByUserName(userName);
+    }
+    /**
      * 获取用户列表
      */
     @SaCheckPermission("system:user:list")

ruoyi-admin/src/main/resources/application.yml

@@ -140,6 +140,7 @@ security:
     - /zdsz/area/upload
     # 字典类型公共文件
     - /system/dict/data/type/*
+    - /system/user/selectUserByUserName
 
 # MyBatisPlus配置
 # https://baomidou.com/config/

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -73,7 +73,7 @@ public class SysUser extends BaseEntity {
     /**
      * 手机号码
      */
-    @Sensitive(strategy = SensitiveStrategy.PHONE)
+//    @Sensitive(strategy = SensitiveStrategy.PHONE)
     private String phonenumber;
 
     /**

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

@@ -47,6 +47,7 @@ public class ZEngiineeringPhotoVo extends BaseEntity implements Serializable {
      */
     @ExcelProperty(value = "备注")
     private String remark;
+    private String type;
 
 
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import java.util.Date;
 
@@ -47,4 +48,6 @@ public class ZEnginMaterialQualityVo implements Serializable {
     private String enginStep;
     private String nameType;
 
+    private String createBy;
+
 }

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

@@ -22,7 +22,7 @@ public class ZEnginSpecificationsVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     private String id;
@@ -41,5 +41,7 @@ public class ZEnginSpecificationsVo implements Serializable {
     @ExcelProperty(value = "材质名称")
     private String name;
 
+    private String createBy;
+
 
 }

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

@@ -37,22 +37,27 @@ public class ZEngineeringGasOpeningVo extends BaseEntity {
      * 行政区
      */
     private String district;
+    private String districtName;
     /**
      * 小区id
      */
     private String areaId;
+    private String areaName;
     /**
      * 楼栋id
      */
     private String buildingId;
+    private String buildingName;
     /**
      * 单元id
      */
     private String unitId;
+    private String unitName;
     /**
      * 房间id
      */
     private String houseId;
+    private String houseName;
 
     /**
      * 立杠是否刷涂防腐漆

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

@@ -1,8 +1,11 @@
 package com.ruoyi.zdsz.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import com.ruoyi.zdsz.domain.ZEngineeringGasOpening;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringGasOpeningBo;
 import com.ruoyi.zdsz.domain.vo.ZEngineeringGasOpeningVo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 开栓施工Mapper接口
@@ -12,4 +15,7 @@ import com.ruoyi.zdsz.domain.vo.ZEngineeringGasOpeningVo;
  */
 public interface ZEngineeringGasOpeningMapper extends BaseMapperPlus<ZEngineeringGasOpeningMapper, ZEngineeringGasOpening, ZEngineeringGasOpeningVo> {
 
+    Page<ZEngineeringGasOpeningVo> queryPageList(@Param("p") ZEngineeringGasOpeningBo bo, @Param("pa") Page<?> page, @Param("page") Integer pages, @Param("size") Integer size);
+
+
 }

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

@@ -2,6 +2,8 @@ package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;

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

@@ -2,6 +2,7 @@ package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;

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

@@ -58,16 +58,19 @@ public class ZEngineeringGasOpeningServiceImpl implements IZEngineeringGasOpenin
     @Override
     public ZEngineeringGasOpeningVo queryById(String id) {
         ZEngineeringGasOpeningVo zEngineeringGasOpeningVo = baseMapper.selectVoById(id);
-
-        ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
-        zEngiineeringPhotoBo.setParentId(zEngineeringGasOpeningVo.getId());
-        zEngiineeringPhotoBo.setCreateTime(zEngineeringGasOpeningVo.getCreateTime());
-        zEngineeringGasOpeningVo.setPics(photoService.queryList(zEngiineeringPhotoBo));
-        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
-        zEngineeringNodeBo.setCivliId(id);
-        zEngineeringNodeBo.setCreateTime(zEngineeringGasOpeningVo.getCreateTime());
-        List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
-        zEngineeringGasOpeningVo.setZEngineeringNodeBoList(zEngineeringNodeBos);
+        ZEngiineeringPhotoBo photoBo = new ZEngiineeringPhotoBo();
+        photoBo.setCreateTime(zEngineeringGasOpeningVo.getCreateTime());
+        photoBo.setParentId(zEngineeringGasOpeningVo.getId());
+        List<ZEngiineeringPhotoVo> photoVoList = photoService.queryList(photoBo);
+        zEngineeringGasOpeningVo.setGasCylinderPic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("gasCylinderPic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
+        zEngineeringGasOpeningVo.setPressureTestPic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("pressureTestPic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
+        zEngineeringGasOpeningVo.setGasMeterPic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("gasMeterPic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
+        zEngineeringGasOpeningVo.setRearPipePic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("rearPipePic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
+        zEngineeringGasOpeningVo.setGasChangePic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("gasChangePic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
+        zEngineeringGasOpeningVo.setSoftPipePic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("softPipePic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
+        zEngineeringGasOpeningVo.setWindproofCirclePic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("windproofCirclePic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
+        zEngineeringGasOpeningVo.setGasEnvironmentPic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("gasEnvironmentPic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
+        zEngineeringGasOpeningVo.setReceiptFormPic(photoVoList.stream().collect(Collectors.groupingBy(ZEngiineeringPhotoVo::getType)).get("receiptFormPic").stream().map(s -> s.getPicUrl()).collect(Collectors.toList()));
         return zEngineeringGasOpeningVo;
     }
 
@@ -76,10 +79,8 @@ public class ZEngineeringGasOpeningServiceImpl implements IZEngineeringGasOpenin
      */
     @Override
     public TableDataInfo<ZEngineeringGasOpeningVo> queryPageList(ZEngineeringGasOpeningBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<ZEngineeringGasOpening> lqw = buildQueryWrapper(bo);
-//        lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringGasOpening::getEnginName, bo.getEnginName());
-//        lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringGasOpening::getEnginType, bo.getEnginType());
-        Page<ZEngineeringGasOpeningVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<ZBuildingBo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        Page<ZEngineeringGasOpeningVo> result = baseMapper.queryPageList(bo, page, (pageQuery.getPageNum() - 1) * pageQuery.getPageSize(), pageQuery.getPageSize());
         return TableDataInfo.build(result);
     }
 
@@ -95,19 +96,11 @@ public class ZEngineeringGasOpeningServiceImpl implements IZEngineeringGasOpenin
     private LambdaQueryWrapper<ZEngineeringGasOpening> buildQueryWrapper(ZEngineeringGasOpeningBo bo) {
         LambdaQueryWrapper<ZEngineeringGasOpening> lqw = Wrappers.lambdaQuery();
         lqw.orderByDesc(ZEngineeringGasOpening::getCreateTime);
-//        lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringIndustry::getEnginType, bo.getEnginType());
-//        lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringIndustry::getEnginName, bo.getEnginName());
-//        lqw.like(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringIndustry::getEnginClassification, bo.getEnginClassification());
-//        lqw.eq(StringUtils.isNotBlank(bo.getConstructUnit()), ZEngineeringIndustry::getConstructUnit, bo.getConstructUnit());
-//        lqw.eq(StringUtils.isNotBlank(bo.getProjectHead()), ZEngineeringIndustry::getProjectHead, bo.getProjectHead());
-//        lqw.eq(StringUtils.isNotBlank(bo.getSceneHead()), ZEngineeringIndustry::getSceneHead, bo.getSceneHead());
-//        lqw.eq(StringUtils.isNotBlank(bo.getDesignUnit()), ZEngineeringIndustry::getDesignUnit, bo.getDesignUnit());
-//        lqw.eq(StringUtils.isNotBlank(bo.getDesignHead()), ZEngineeringIndustry::getDesignHead, bo.getDesignHead());
-//        lqw.eq(StringUtils.isNotBlank(bo.getDesignPhone()), ZEngineeringIndustry::getDesignPhone, bo.getDesignPhone());
-//        lqw.eq(StringUtils.isNotBlank(bo.getSupervisionUnit()), ZEngineeringIndustry::getSupervisionUnit, bo.getSupervisionUnit());
-//        lqw.eq(StringUtils.isNotBlank(bo.getSupervisionHead()), ZEngineeringIndustry::getSupervisionHead, bo.getSupervisionHead());
-//        lqw.eq(StringUtils.isNotBlank(bo.getSupervisionPhone()), ZEngineeringIndustry::getSupervisionPhone, bo.getSupervisionPhone());
-//        lqw.eq(StringUtils.isNotBlank(bo.getType()), ZEngineeringIndustry::getType, bo.getType());
+        lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), ZEngineeringGasOpening::getDistrict, bo.getDistrict());
+        lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZEngineeringGasOpening::getAreaId, bo.getAreaId());
+        lqw.eq(StringUtils.isNotBlank(bo.getBuildingId()), ZEngineeringGasOpening::getBuildingId, bo.getBuildingId());
+        lqw.eq(StringUtils.isNotBlank(bo.getUnitId()), ZEngineeringGasOpening::getUnitId, bo.getUnitId());
+        lqw.eq(StringUtils.isNotBlank(bo.getHouseId()), ZEngineeringGasOpening::getHouseId, bo.getHouseId());
         return lqw;
     }
 
@@ -403,9 +396,11 @@ public class ZEngineeringGasOpeningServiceImpl implements IZEngineeringGasOpenin
     public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
 
         ids.forEach(item -> {
+            ZEngineeringGasOpeningVo vo = baseMapper.selectVoById(item);
             // 查询数据库中已存在的文件列表
             ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
             zEngiineeringPhotoBo.setParentId(item);
+            zEngiineeringPhotoBo.setCreateTime(vo.getCreateTime());
             // 将查询出的url放入existingPhotos
             List<String> existingPhotos = photoService.queryList(zEngiineeringPhotoBo).stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList());
             // 若存在 则进行删除
@@ -414,17 +409,6 @@ public class ZEngineeringGasOpeningServiceImpl implements IZEngineeringGasOpenin
                     photoService.deleteWithValidByurls(i);
                 });
             }
-            // 初始化工程节点对象
-            ZEngineeringGasOpeningVo vo = baseMapper.selectVoById(item);
-            ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
-            zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
-            zEngineeringNodeBo.setCivliId(vo.getId());
-            //  查询数据库中已存在的工程节点
-            List<ZEngineeringNodeBo> zEngineeringNodeBos = nodeService.queryListDetails(zEngineeringNodeBo);
-            // 若存在 则进行删除
-            if (!zEngineeringNodeBos.isEmpty()) {
-                zEngineeringNodeBos.forEach(ite -> nodeService.delete(ite));
-            }
         });
         return baseMapper.deleteBatchIds(ids) > 0;
     }

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

@@ -135,10 +135,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             CASE is_qualified WHEN 'N' THEN 0 ELSE 1 END as isQualified
         FROM
-            z_comprehensive
+            z_engineering_gas_opening
         WHERE
             house_id = #{houseId}
-        AND type = '1' AND del_flag =0
+        AND del_flag =0
         order by create_time desc ,update_time desc
             LIMIT 1
     </select>

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

@@ -32,7 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.name as name,
         b.name as materName,
         b.id as materId,
-        b.engin_type AS enginType
+        b.engin_type AS enginType,
+        a.create_by AS createBy
         from z_engin_specifications a
         left join z_engin_material_quality b on b.id = a.mater_id
         <where>

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

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.zdsz.mapper.ZEngineeringGasOpeningMapper">
+
+    <select id="queryPageList" resultType="com.ruoyi.zdsz.domain.vo.ZEngineeringGasOpeningVo">
+        SELECT
+            z.id as id,
+            z.district,
+            z.area_id,
+            z.building_id,
+            z.unit_id,
+            z.house_id,
+            e.dict_label AS districtName,
+            if(a.name is null , '未知' ,a.NAME) AS areaName,
+            if(b.name is null , '未知' ,b.NAME) AS buildingName,
+            if(c.name is null , '未知' ,c.NAME) AS unitName,
+            if(d.name is null , '未知' ,d.NAME) AS houseName
+        FROM
+            z_engineering_gas_opening z
+            LEFT JOIN z_area a ON z.area_id = a.id
+            LEFT JOIN z_building b ON z.building_id = b.id
+            LEFT JOIN z_unit c ON z.unit_id = c.id
+            LEFT JOIN z_house d ON z.house_id = d.id
+            LEFT JOIN sys_dict_data e ON e.dict_value = z.district
+        where z.del_flag = 0
+        <if test="p.district != null and p.district != ''">
+            and z.district = #{p.district}
+        </if>
+        <if test="p.areaId != null and p.areaId != ''">
+            and z.area_id = #{p.areaId}
+        </if>
+        <if test="p.buildingId != null and p.buildingId != ''">
+            and z.building_id = #{p.buildingId}
+        </if>
+        <if test="p.unitId != null and p.unitId != ''">
+            and z.unit_id = #{p.unitId}
+        </if>
+        <if test="p.houseId != null and p.houseId != ''">
+            and z.house_id = #{p.houseId}
+        </if>
+        <if test="p.createBy != null and p.p.createBy != ''">
+            and z.create_by = #{p.createBy}
+        </if>
+        order by z.update_info_time desc
+    </select>
+
+</mapper>