提交用料比例计算

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

@@ -67,7 +67,7 @@ public class ZEngineeringCivilController extends BaseController {
      * 导出民用工程列表
      */
     //    @SaCheckPermission("zdsz:engineeringCivil:export")
-    @Log(title = "民用工程", businessType = BusinessType.EXPORT)
+    @Log(title = "民用工程导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ZEngineeringCivilBo bo, PageQuery pageQuery, HttpServletResponse response) {
         if ("indoor_engin".equals(bo.getEnginClassification())) {
@@ -77,21 +77,30 @@ public class ZEngineeringCivilController extends BaseController {
             // 庭院
             List<ZEngineeringCivilExportVos> zEngineeringCivilExportVos = iZEngineeringCivilService.exportCcourtyardList(bo);
             ExcelUtil.exportTemplate(Collections.singletonList(zEngineeringCivilExportVos), "民用工程-庭院", "excel/CivilCourtyardExcel.xlsx", response);
-
         }else if ("overhead".equals(bo.getEnginClassification())) {
             // 架空
             List<ZEngineeringCivilExportVos> zEngineeringCivilExportVos = iZEngineeringCivilService.exportOverheadList(bo);
             ExcelUtil.exportTemplate(Collections.singletonList(zEngineeringCivilExportVos), "民用工程-架空", "excel/CivilOverheadExcel.xlsx", response);
-
         }else if ("bottom_leg".equals(bo.getEnginClassification())) {
             // 低腿
             List<ZEngineeringCivilExportVos> zEngineeringCivilExportVos = iZEngineeringCivilService.exportBottomLegList(bo);
             ExcelUtil.exportTemplate(Collections.singletonList(zEngineeringCivilExportVos), "民用工程-底腿", "excel/CivilBottLegExcel.xlsx", response);
-
         }
     }
 
     /**
+     * 导出民用工程列表
+     */
+    //    @SaCheckPermission("zdsz:engineeringCivil:export")
+    @Log(title = "民用工程导出带进度颜色", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportColor")
+    public void exportColor(ZEngineeringCivilBo bo, PageQuery pageQuery, HttpServletResponse response) {
+//            List<ZEngineeringCivilExportVos> zEngineeringCivilExportVos = iZEngineeringCivilService.exportList(bo);
+            List<ZEngineeringCivilVo> zEngineeringCivilExportVos = iZEngineeringCivilService.queryAllList(bo);
+            ExcelUtil.exportTemplate(Collections.singletonList(zEngineeringCivilExportVos), "民用工程-室内", "excel/civilExcelColor.xlsx", response);
+    }
+
+    /**
      * 获取民用工程详细信息
      *
      * @param id 主键

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

@@ -44,5 +44,6 @@ public class ZEnginMaterialQuality extends BaseEntity {
     private String enginNode;
     private String enginStep;
     private String nameType;
+    private String materialType;
 
 }

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

@@ -92,6 +92,9 @@ public class ZEngineeringGY extends BaseEntity {
     @TableLogic
     private String delFlag;
 
+    private Double pePreset;
+    private Double gcPreset;
+
 
 
 }

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

@@ -106,6 +106,9 @@ public class ZEngineeringIndustry extends BaseEntity {
     @TableLogic
     private String delFlag;
 
+    private Double pePreset;
+    private Double gcPreset;
+
 
 
 }

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

@@ -36,6 +36,7 @@ public class ZEnginMaterialQualityBo extends BaseEntity {
     private String enginNode;
     private String enginStep;
     private String nameType;
+    private String materialType;
 
     /**
      * 材质名称

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

@@ -94,6 +94,8 @@ public class ZEngineeringIndustryBo extends BaseEntity {
      * 类型(工业工程|市政工程)
      */
     private String type;
+    private Double pePreset;
+    private Double gcPreset;
 
     /**
      * 字典项

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

@@ -87,6 +87,9 @@ public class ZEngineeringIndustryGYBo extends BaseEntity {
      */
     private String enginClassification;
 
+    private Double pePreset;
+    private Double gcPreset;
+
 
     private ZEngineeringNodeBo zEngineeringNodeBo;
 

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

@@ -47,6 +47,7 @@ public class ZEnginMaterialQualityVo implements Serializable {
     private String enginNode;
     private String enginStep;
     private String nameType;
+    private String materialType;
 
     private String createBy;
 

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

@@ -36,6 +36,7 @@ public class ZEngineeringCivilVo extends BaseEntity implements Serializable {
     @ExcelProperty(value = "行政区", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "district")
     private String district;
+    private String districtName;
 
     /**
      * 小区id
@@ -68,6 +69,7 @@ public class ZEngineeringCivilVo extends BaseEntity implements Serializable {
     private String houseId;
     @ExcelProperty(value = "房间")
     private String houseName;
+    private String source;
 
     /**
      * 工程类型
@@ -140,4 +142,13 @@ public class ZEngineeringCivilVo extends BaseEntity implements Serializable {
     public void setzEngineeringNodeBoList(List<ZEngineeringNodeBo> zEngineeringNodeBoList) {
         this.zEngineeringNodeBoList = zEngineeringNodeBoList;
     }
+
+    //导出专用 其他没用
+    private String gx1;
+    private String gx2;
+    private String gx3;
+    private String gx4;
+    private String gx5;
+    private String gx6;
+    private String gx7;
 }

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

@@ -102,6 +102,11 @@ public class ZEngineeringGYVo extends BaseEntity {
     @ExcelProperty(value = "工程分类")
     private String enginClassification;
 
+    private Double pePreset;
+    private Double gcPreset;
+    private Double pesj=0.0;
+    private Double gsj=0.0;
+
     /**
      * 字典项
      * municipal_engineering_node

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

@@ -9,6 +9,7 @@ import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
 import lombok.Data;
 import lombok.Getter;
+import org.jetbrains.annotations.Contract;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
@@ -136,4 +137,9 @@ public class ZEngineeringIndustryVo extends BaseEntity {
     public void setNodeReViewStateList(Object nodeReViewStateList) {
         this.nodeReViewStateList = nodeReViewStateList;
     }
+
+    private Double pePreset;
+    private Double gcPreset;
+    private Double pesj=0.0;
+    private Double gsj=0.0;
 }

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

@@ -21,6 +21,7 @@ import java.util.Map;
 public interface ZEngineeringCivilMapper extends BaseMapperPlus<ZEngineeringCivilMapper, ZEngineeringCivil, ZEngineeringCivilVo> {
     List<Map<String, Integer>> selectByDistrictStatistics(String district);
     Page<ZEngineeringCivilVo> queryPageList(@Param("p") ZEngineeringCivilBo bo,@Param("pa")Page<?> page,@Param("page") Integer pages,@Param("size") Integer size);
+    List<ZEngineeringCivilVo> queryAllList(@Param("p") ZEngineeringCivilBo bo);
     Page<ZEngineeringCivilVo> queryPageIdList(@Param("idList") List idList, @Param("total") Long total, @Param("pa")Page<?> page,@Param("page") Integer pages,@Param("size") Integer size);
 
     List<roomStatusVo> getObtainRoomcCompletionInformationList(ZEngineeringCivilBo bo);

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

@@ -33,6 +33,7 @@ public interface IZEngineeringCivilService {
      * 查询民用工程列表
      */
     TableDataInfo<ZEngineeringCivilVo> queryPageList(ZEngineeringCivilBo bo, PageQuery pageQuery);
+    List<ZEngineeringCivilVo> queryAllList(ZEngineeringCivilBo bo);
     List<ZEngineeringCivilExportVos> exportList(ZEngineeringCivilBo bo);
     List<ZEngineeringCivilExportVos> exportCcourtyardList(ZEngineeringCivilBo bo);
     List<ZEngineeringCivilExportVos> exportOverheadList(ZEngineeringCivilBo bo);

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

@@ -97,6 +97,7 @@ public class ZEnginMaterialQualityServiceImpl implements IZEnginMaterialQualityS
         lqw.eq(StringUtils.isNotBlank(bo.getEnginNode()), ZEnginMaterialQuality::getEnginNode, bo.getEnginNode());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginStep()), ZEnginMaterialQuality::getEnginStep, bo.getEnginStep());
         lqw.eq(StringUtils.isNotBlank(bo.getNameType()), ZEnginMaterialQuality::getNameType, bo.getNameType());
+        lqw.eq(StringUtils.isNotBlank(bo.getMaterialType()), ZEnginMaterialQuality::getMaterialType, bo.getMaterialType());
         return lqw;
     }
 

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

@@ -232,6 +232,69 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         return TableDataInfo.build(result);
     }
 
+    /**
+     * 查询民用工程列表
+     */
+    @Override
+    public List<ZEngineeringCivilVo> queryAllList(ZEngineeringCivilBo bo) {
+        LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringCivil::getEnginType, bo.getEnginType());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, bo.getEnginClassification());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, bo.getEnginCycle());
+        lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZEngineeringCivil::getAreaId, bo.getAreaId());
+        lqw.eq(StringUtils.isNotBlank(bo.getBuildingId()), ZEngineeringCivil::getBuildingId, bo.getBuildingId());
+        lqw.eq(StringUtils.isNotBlank(bo.getUnitId()), ZEngineeringCivil::getUnitId, bo.getUnitId());
+        lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), ZEngineeringCivil::getDistrict, bo.getDistrict());
+        lqw.eq(StringUtils.isNotBlank(bo.getHouseId()), ZEngineeringCivil::getHouseId, bo.getHouseId());
+        List<ZEngineeringCivilVo> result = new ArrayList<>();
+        if (!"".equals(bo.getType()) && !ObjectUtils.isEmpty(bo.getType())) {
+            List IDList = zEngineeringNodeService.nodeTypeList(baseMapper.selectList(lqw), bo.getType(), bo.getCompletionStatus(), bo);
+
+            if (IDList.size() == 0) {
+                return result;
+            }
+            LinkedList<String> list = baseMapper.getTableNames("z_engineering_info");
+            List DateList = new ArrayList();
+            list.removeLast();
+            list.stream().forEach(item -> {
+
+                DateList.add(item.substring(item.indexOf("2")));
+            });
+            result = baseMapper.queryPageIdList(IDList, baseMapper.getTypeNumber(DateList, bo), null, null, null).getRecords();
+            Map<String, Object> ReviewList = zEngineeringNodeService.ReViewList(result);
+            result.forEach(item -> {
+                item.setNodeReViewStateList(ReviewList.get(item.getId()));
+            });
+            return result;
+        }
+        if ((!"".equals(bo.getBeginTime()) && !ObjectUtils.isEmpty(bo.getBeginTime())) || (!"".equals(bo.getCreateBy()) && !ObjectUtils.isEmpty(bo.getCreateBy()))) {
+            List<String> a = zEngineeringCivilList(bo.getBeginTime(), bo.getCreateBy(), bo);
+            if (a.size() == 0) {
+                return result;
+            }
+            result = baseMapper.queryPageIdList(a, Long.parseLong(String.valueOf(a.size())), null,null,null).getRecords();
+            Map<String, Object> ReviewList = zEngineeringNodeService.ReViewList(result);
+            result.forEach(item -> {
+                item.setNodeReViewStateList(ReviewList.get(item.getId()));
+            });
+            return result;
+        }
+        result = baseMapper.queryAllList(bo);
+        Map<String, Object> ReviewList = zEngineeringNodeService.ReViewList(result);
+        result.forEach(item -> {
+            item.setNodeReViewStateList(ReviewList.get(item.getId()));
+            item.setGx1(((List<Map<String,String>>) item.getNodeReViewStateList()).get(0).get("state"));
+            item.setGx2(((List<Map<String,String>>) item.getNodeReViewStateList()).get(1).get("state"));
+            item.setGx3(((List<Map<String,String>>) item.getNodeReViewStateList()).get(2).get("state"));
+            item.setGx4(((List<Map<String,String>>) item.getNodeReViewStateList()).get(3).get("state"));
+            item.setGx5(((List<Map<String,String>>) item.getNodeReViewStateList()).get(4).get("state"));
+            item.setGx6(((List<Map<String,String>>) item.getNodeReViewStateList()).get(5).get("state"));
+            item.setGx7(((List<Map<String,String>>) item.getNodeReViewStateList()).get(6).get("state"));
+        });
+
+        return result;
+    }
+
     @Override
     public List<ZEngineeringCivilExportVos> exportList(ZEngineeringCivilBo bo) {
         SimpleDateFormat format = new SimpleDateFormat("yyyy_MM");

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

@@ -33,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -70,6 +71,10 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
     private ZComprehensiveMapper zComprehensiveMapper;
     @Autowired
     private ZEngineeringInfoMapper zEngineeringInfoMapper;
+    @Autowired
+    private ZEngineeringMaterialMapper zEngineeringMaterialMapper;
+    @Autowired
+    private  ZEnginMaterialQualityMapper zEnginMaterialQualityMapper;
 
 
     /**
@@ -915,7 +920,7 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
         Map<String,Object> statemap=new HashMap<>();
         AtomicReference<List<Map<String, Object>>> ReViewStateMap= new AtomicReference<>(new ArrayList<>());
         list.stream().forEach(item->{
-            String date=  new SimpleDateFormat("yyyy_MM").format(item.getCreateTime());
+            String date = new SimpleDateFormat("yyyy_MM").format(item.getCreateTime());
             MonthTableNameHandler.setData(date);
             LambdaQueryWrapper<ZEngineeringNode> lqw = Wrappers.lambdaQuery();
             lqw.eq(StringUtils.isNotBlank(item.getId()), ZEngineeringNode::getCivliId, item.getId());
@@ -928,7 +933,41 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                 {
                     nodeTypeList.add(ReviewList.get(0));
                 }
-
+                if("焊接".equals(item2.getType())&&item.getEnginClassification().equals("室内管线")){
+                    LambdaQueryWrapper<ZEngineeringInfo> lqw3 = Wrappers.lambdaQuery();
+                    lqw3.eq(StringUtils.isNotBlank(item2.getId()), ZEngineeringInfo::getEngInfoId, item2.getId());
+                    List<ZEngineeringInfo> info= zEngineeringInfoMapper.selectList(lqw3);
+                    info.stream().forEach(item3->{
+                        LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
+                        lqw4.eq(StringUtils.isNotBlank(item3.getId()), ZEngineeringMaterial::getDetailsId, item3.getId());
+                        List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
+                        material.stream().forEach(item4->{
+                            String type = zEnginMaterialQualityMapper.selectVoById(item4.getMaterialQuality()).getMaterialType();
+                            if("0".equals(type)){
+                                item.setPesj(new BigDecimal(Double.toString(item.getPesj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
+                            }else if("1".equals(type)){
+                                item.setGsj(new BigDecimal(Double.toString(item.getGsj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
+                            }
+                        });
+                    });
+                }else if("下管".equals(item2.getType())&&item.getEnginClassification().equals("室外管线")){
+                    LambdaQueryWrapper<ZEngineeringInfo> lqw3 = Wrappers.lambdaQuery();
+                    lqw3.eq(StringUtils.isNotBlank(item2.getId()), ZEngineeringInfo::getEngInfoId, item2.getId());
+                    List<ZEngineeringInfo> info= zEngineeringInfoMapper.selectList(lqw3);
+                    info.stream().forEach(item3->{
+                        LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
+                        lqw4.eq(StringUtils.isNotBlank(item3.getId()), ZEngineeringMaterial::getDetailsId, item3.getId());
+                        List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
+                        material.stream().forEach(item4->{
+                            String type = zEnginMaterialQualityMapper.selectVoById(item4.getMaterialQuality()).getMaterialType();
+                            if("0".equals(type)){
+                                item.setPesj(new BigDecimal(Double.toString(item.getPesj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
+                            }else if("1".equals(type)){
+                                item.setGsj(new BigDecimal(Double.toString(item.getGsj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
+                            }
+                        });
+                    });
+                }
             });
             String flag = null;
             if (item.getEnginClassification().equals("室内管线")){
@@ -1017,7 +1056,24 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
                 if (ReviewList.size() > 0) {
                     nodeTypeList.add(ReviewList.get(0));
                 }
-
+                if("下管".equals(item2.getType())){
+                    LambdaQueryWrapper<ZEngineeringInfo> lqw3 = Wrappers.lambdaQuery();
+                    lqw3.eq(StringUtils.isNotBlank(item2.getId()), ZEngineeringInfo::getEngInfoId, item2.getId());
+                    List<ZEngineeringInfo> info= zEngineeringInfoMapper.selectList(lqw3);
+                    info.stream().forEach(item3->{
+                        LambdaQueryWrapper<ZEngineeringMaterial> lqw4 = Wrappers.lambdaQuery();
+                        lqw4.eq(StringUtils.isNotBlank(item3.getId()), ZEngineeringMaterial::getDetailsId, item3.getId());
+                        List<ZEngineeringMaterial> material= zEngineeringMaterialMapper.selectList(lqw4);
+                        material.stream().forEach(item4->{
+                            String type = zEnginMaterialQualityMapper.selectVoById(item4.getMaterialQuality()).getMaterialType();
+                            if("0".equals(type)){
+                                item.setPesj(new BigDecimal(Double.toString(item.getPesj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
+                            }else if("1".equals(type)){
+                                item.setGsj(new BigDecimal(Double.toString(item.getGsj())).add(new BigDecimal(Double.toString(item4.getNumber()))).doubleValue());
+                            }
+                        });
+                    });
+                }
             });
             List stateList = new ArrayList();
             List<SysDictData> list = sysDictMap.get(item.getEnginType() + "_" + item.getEnginClassification());

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

@@ -35,6 +35,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nameType != null and nameType != ''">
                 and zc.name_type = #{nameType}
             </if>
+            <if test="materialType != null and materialType != ''">
+                and zc.material_type = #{materialType}
+            </if>
         </where>
         order by zc.create_time desc
     </select>

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

@@ -108,10 +108,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and engin_cycle = 0
         </if>
         order by a.update_info_time desc
-        LIMIT #{page},#{size}
+            LIMIT #{page},#{size}
         ) AS at)
         order by a.update_info_time desc
     </select>
+    <select id="queryAllList" resultType="com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo">
+        select
+        a.*,
+        g.dict_label as districtName,
+        h.dict_label as source,
+        if(b.name is null , '未知' ,b.NAME) AS areaName,
+        if(c.name is null , '未知' ,c.NAME) AS buildingName,
+        if(d.name is null , '未知' ,d.NAME) AS unitName,
+        if(e.name is null , '未知' ,e.NAME) AS houseName,
+        f.dict_label AS enginClassificationName
+        from z_engineering_civil a
+        left join z_area b on b.id = a.area_id
+        left join z_building c on c.id = a.building_id
+        left join z_unit d on d.id = a.unit_id
+        left join z_house e on e.id = a.house_id
+        left join sys_dict_data f on f.dict_type = a.engin_type and f.dict_value = a.engin_classification
+        left join sys_dict_data g on g.dict_value = a.district
+        left join sys_dict_data h on h.dict_type='community_source' and h.dict_value = e.source
+        where a.id in (SELECT at.* FROM (SELECT a.id from z_engineering_civil a
+        where a.del_flag = 0
+        <if test="p.district != null and p.district != ''">
+            and a.district = #{p.district}
+        </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>
+        <if test="p.unitId != null and p.unitId != ''">
+            and a.unit_id = #{p.unitId}
+        </if>
+        <if test="p.houseId != null and p.houseId != ''">
+            and house_id = #{p.houseId}
+        </if>
+        <if test="p.enginType != null and p.enginType != ''">
+            and engin_type = #{p.enginType}
+        </if>
+        <if test="p.enginClassification != null and p.enginClassification != ''">
+            and engin_classification = #{p.enginClassification}
+        </if>
+        <if test="p.enginCycle != null and p.enginCycle != ''">
+            and engin_cycle = 0
+        </if>
+        ) AS at)
+        ORDER BY
+        b.name,
+        CONVERT ( REPLACE ( c.name, '栋', '' ), UNSIGNED ),
+        CONVERT ( REPLACE ( d.name, '单元', '' ), UNSIGNED ),
+        CONVERT ( REPLACE ( e.name, '号', '' ), UNSIGNED ) ASC
+    </select>
     <select id="queryPageIdList" resultType="com.ruoyi.zdsz.domain.vo.ZEngineeringCivilVo">
        select
        #{total} as total,
@@ -152,7 +203,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     CAST(CONCAT( REPLACE ( bd.NAME, '栋', '' ),REPLACE ( c.NAME, '单元', '' )) AS SIGNED) AS unitOrder
     FROM
     z_house a
-    LEFT JOIN z_engineering_civil b ON a.id = b.house_id AND b.engin_cycle=#{enginCycle}
+    LEFT JOIN z_engineering_civil b ON a.id = b.house_id
+    and b.del_flag = '0'
+    and b.engin_classification='indoor_engin'
+    AND b.engin_cycle=#{enginCycle}
     <if test="enginType != null and enginType != ''">
         and b.engin_type=#{enginType}
     </if>