批量审核

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

@@ -312,7 +312,6 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
             List<List<roomStatusVo>> roomStatusVoList = new ArrayList<>();
             Map<String, List<roomStatusVo>> sortMap = roomMap.entrySet().stream().sorted(Comparator.comparingInt(entry -> Integer.parseInt(entry.getKey()))).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldVal, newVal) -> oldVal, LinkedHashMap::new));
             sortMap.forEach((key1, value1) -> {
-                System.out.println(key1);
                 roomStatusVoList.add(value1);
             });
             bulidingStatusVo.setRoomStatusVoList(roomStatusVoList);

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

@@ -96,13 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     a.area_id,
     a.building_id,
     a.unit_id ,
-    <if test="buildingId != null and buildingId != ''">
-        CONCAT(bd.name,'栋',c.name,'单元') AS unitName,
-    </if>
-    <if test="unitId != null and unitId != ''">
-        CONCAT(c.name,'单元') AS unitName,
-    </if>
-    CONCAT(bd.name,c.name) AS unitName,
+    CONCAT(bd.name,'栋',c.name,'单元') AS unitName,
     a.NAME AS roomName,
     a.id AS roomId,
     b.engin_type AS enginCycle,