批量审核

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

@@ -27,4 +27,7 @@ public interface ZEngineeringCivilMapper extends BaseMapperPlus<ZEngineeringCivi
     areaStatusVo getsumStatus(String enginCycle);
 
     areaMessageVo getHouseMessage(String Id);
+    areaMessageVo getAreaMessage(String Id);
+    areaMessageVo getAreaName(String Id);
+
 }

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

@@ -443,19 +443,37 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         zEngineeringCivilBo.setzEngineeringNodeBo(izEngineeringNodeService.query(zEngineeringNodeBo));
         zEngineeringCivilBo.setCreateTime(zEngineeringReviewBo.getCreateTime());
         izEngineeringReviewService.Civilinsert(zEngineeringCivil, zEngineeringReviewBo);
-        areaMessageVo areaMessageVo = baseMapper.getHouseMessage(zEngineeringCivilBo.getHouseId());
+        areaMessageVo areaMessageVo=new areaMessageVo();
+        if (zEngineeringCivilBo.getEnginClassification().equals("courtyard")||zEngineeringCivilBo.getEnginClassification().equals("overhead "))
+        {
+            if (!"".equals(zEngineeringCivilBo.getBuildingId()))
+            {
+                areaMessageVo = baseMapper.getAreaMessage(zEngineeringCivilBo.getBuildingId());
+                areaMessageVo.setHouseId("未知");
+                areaMessageVo.setUnitId("未知");
+            }else
+            {
+                areaMessageVo = baseMapper.getAreaName(zEngineeringCivilBo.getAreaId());
+                areaMessageVo.setHouseId("未知");
+                areaMessageVo.setUnitId("未知");
+                areaMessageVo.setBuildingId("未知");
+            }
+        }else{
+            areaMessageVo = baseMapper.getHouseMessage(zEngineeringCivilBo.getHouseId());
+        }
+//        areaMessageVo areaMessageVo = baseMapper.getHouseMessage(zEngineeringCivilBo.getHouseId());
         BeanUtils.copyProperties(areaMessageVo, zEngineeringCivilBo);
         Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
         sysDictMap.get(zEngineeringCivilBo.getEnginType()).stream().forEach(item -> {
-            if (item.getDictValue().equals(zEngineeringCivilBo.getCompletionStatus())) {
-                zEngineeringCivilBo.setEnginClassification(item.getDictLabel());
-            }
-        });
-        sysDictMap.get(zEngineeringCivilBo.getEnginType() + "_" + zEngineeringCivilBo.getEnginClassification()).stream().forEach(item -> {
-            if (item.getDictValue().equals(zEngineeringCivilBo.getzEngineeringNodeBo().getType())) {
+            if (item.getDictValue().equals(zEngineeringCivilBo.getEnginClassification())) {
                 zEngineeringCivilBo.setEnginClassification(item.getDictLabel());
             }
         });
+//        sysDictMap.get(zEngineeringCivilBo.getEnginType() + "_" + zEngineeringCivilBo.getEnginClassification()).stream().forEach(item -> {
+//            if (item.getDictValue().equals(zEngineeringCivilBo.getzEngineeringNodeBo().getType())) {
+//                zEngineeringCivilBo.setEnginClassification(item.getDictLabel());
+//            }
+//        });
         sysDictMap.get("engin_cycle").stream().forEach(item -> {
             if (item.getDictValue().equals(zEngineeringCivilBo.getEnginCycle())) {
                 zEngineeringCivilBo.setEnginCycle(item.getDictLabel());

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

@@ -266,7 +266,25 @@ public class ZEngineeringNodeServiceImpl implements IZEngineeringNodeService {
             MonthTableNameHandler.removeData();
 //        zEngineeringCivilBo.setCreateTime(zEngineeringReviewBo.getCreateTime());
 //        izEngineeringReviewService.Civilinsert(zEngineeringCivil,zEngineeringReviewBo);
-            areaMessageVo areaMessageVo = zEngineeringCivilMapper.getHouseMessage(zEngineeringCivilBo.getHouseId());
+            areaMessageVo areaMessageVo=new areaMessageVo();
+            if (zEngineeringCivilBo.getEnginClassification().equals("courtyard")||zEngineeringCivilBo.getEnginClassification().equals("overhead "))
+            {
+                if (!"".equals(zEngineeringCivilBo.getBuildingId()))
+                {
+                    areaMessageVo = zEngineeringCivilMapper.getAreaMessage(zEngineeringCivilBo.getBuildingId());
+                    areaMessageVo.setHouseId("未知");
+                    areaMessageVo.setUnitId("未知");
+                }else
+                {
+                    areaMessageVo = zEngineeringCivilMapper.getAreaName(zEngineeringCivilBo.getAreaId());
+                    areaMessageVo.setHouseId("未知");
+                    areaMessageVo.setUnitId("未知");
+                    areaMessageVo.setBuildingId("未知");
+                }
+
+            }else{
+                 areaMessageVo = zEngineeringCivilMapper.getHouseMessage(zEngineeringCivilBo.getHouseId());
+            }
             if (!ObjectUtils.isEmpty(areaMessageVo))
             BeanUtils.copyProperties(areaMessageVo, zEngineeringCivilBo);
             Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");

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

@@ -163,4 +163,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             a.id = #{id}
  </select>
+    <select id="getAreaMessage" resultType="com.ruoyi.zdsz.domain.vo.areaMessageVo">
+        SELECT
+            a.`name` AS buildingId,
+            d.name AS areaId,
+            e.dict_label AS district
+        FROM
+            z_building a
+                LEFT JOIN z_area d ON a.area_id=d.id
+                LEFT JOIN sys_dict_data e ON e.dict_value=d.district
+        WHERE
+            a.id = #{id}
+    </select>
+    <select id="getAreaName" resultType="com.ruoyi.zdsz.domain.vo.areaMessageVo">
+        SELECT
+            a.`name` AS areaId,
+            e.dict_label AS district
+        FROM
+            z_area a
+                LEFT JOIN sys_dict_data e ON e.dict_value = a.district
+        WHERE
+            a.id = #{id}
+    </select>
 </mapper>