批量审核

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

@@ -122,19 +122,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 </select>
     <select id="getAreaCompletionInformationList"  resultType="com.ruoyi.zdsz.domain.vo.areaWillDoneVo">
         SELECT
-        a.id as areaId,
-        a.name,
-        IFNULL( b.completion_status, '未施工' ) AS roomStatus
+        za.id as areaId,
+        za.NAME,
+        IFNULL( ze.completion_status, '未施工' ) AS roomStatus
         FROM
-        z_area a
-        LEFT JOIN z_engineering_civil b ON a.id = b.area_id and b.engin_cycle = #{enginCycle}
+        z_house zh
+        LEFT JOIN z_area za ON za.id = zh.area_id
+        LEFT JOIN z_engineering_civil ze ON zh.id = ze.house_id AND ze.del_flag = '0' AND ze.engin_cycle=#{enginCycle}
         WHERE
-        a.del_flag = 0
-          AND a.id in
+        zh.del_flag = 0
+          AND zh.area_id in
         <foreach collection="idList" item="name" open="(" separator="," close=")">
             #{name}
         </foreach>
-        ORDER BY a.id ASC
+        ORDER BY za.id ASC
     </select>
     <select id="getsumStatus" resultType="com.ruoyi.zdsz.domain.vo.areaStatusVo">
         SELECT