202406市政修改

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

@@ -85,12 +85,10 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         }
         else if ("4".equals(type)){
             leftJoin = "z_engineering_industry"; // 市政工程
-            szAndGy = "sz";
             enginType = "";
         }
         else if ("5".equals(type)){
             leftJoin = "z_engineering_industry"; // 工业工程
-            szAndGy = "gy";
         }
         else if ("6".equals(type)){
             leftJoin = "z_engineering_air_wall"; // 带气工程
@@ -208,10 +206,9 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                 MonthTableNameHandler.setData(date);
                 List<Map<String, String>> mapList = baseMapper.getReviewStatusByNodeId(item.get("id").toString());
                 Map<String, List<SysDictData>> sysDictMap = RedisUtils.getCacheMap("sys_dict");
-                List<SysDictData> municipalEngineeringNode = sysDictMap.get("municipal_engineering_node");
+                List<SysDictData> municipalEngineeringNode = sysDictMap.get("municipal_node_types");
                 mapList.forEach(ite -> {
                     String str = "2".equals(ite.get("reviewStatus"))?"未审核":"1".equals(ite.get("reviewStatus"))?"通过":"未通过";
-                    // "municipal_engineering_node";
                     try {
                         ite.put("type",municipalEngineeringNode.stream().filter(ie-> ie.getDictValue() .equals(ite.get("type"))).collect(Collectors.toList()).get(0).getDictLabel());
                     } catch (Exception e) {

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

@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from sys_dict_data
         where 1 = 1
         <if test="type == 4">
-            and dict_type = 'municipal_engineering_node'
+            and dict_type = 'municipal_node_types'
         </if>
         <if test="type == 2">
             and dict_type = 'engineering_infrastructure'
@@ -67,14 +67,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM z_engineering_info  ei
                  LEFT JOIN z_engineering_node en ON ei.eng_info_id = en.id
                  LEFT JOIN ${type} epj ON epj.id = en.civli_id
-                <if test="szAndGy != null and szAndGy != ''">
-                    <if test="szAndGy == 'gy'">
-                        and epj.type = '1'
-                    </if>
-                    <if test="szAndGy == 'sz'">
-                        and epj.type = '2'
-                    </if>
-                </if>
                 and epj.del_flag = '0'
         WHERE ei.create_by = #{by} AND epj.id IS NOT NULL
         <if test="enginName != '' and enginName != null ">
@@ -96,14 +88,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             FROM z_engineering_info_${name}  ei
             LEFT JOIN z_engineering_node_${name} en ON ei.eng_info_id = en.id
             LEFT JOIN ${type} epj ON epj.id = en.civli_id
-            <if test="szAndGy != null and szAndGy != ''">
-                <if test="szAndGy == 'gy'">
-                    and epj.type = '1'
-                </if>
-                <if test="szAndGy == 'sz'">
-                    and epj.type = '2'
-                </if>
-            </if>
             and epj.del_flag = '0'
             WHERE ei.create_by = #{by} AND epj.id IS NOT NULL
             <if test="enginName != '' and enginName != null ">
@@ -131,14 +115,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN z_engineering_node en ON ei.eng_info_id = en.id
         LEFT JOIN ${type} epj ON epj.id = en.civli_id
         left join sys_dict_data as dict ON dict.dict_value = epj.engin_type
-        <if test="szAndGy != null and szAndGy != ''">
-            <if test="szAndGy == 'gy'">
-                and epj.type = '1'
-            </if>
-            <if test="szAndGy == 'sz'">
-                and epj.type = '2'
-            </if>
-        </if>
         and epj.del_flag = '0'
         WHERE ei.create_by = #{by} AND epj.id IS NOT NULL
         <if test="enginName != '' and enginName != null ">
@@ -160,14 +136,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN z_engineering_node_${name} en ON ei.eng_info_id = en.id
             LEFT JOIN ${type} epj ON epj.id = en.civli_id
             left join sys_dict_data as dict ON dict.dict_value = epj.engin_type
-            <if test="szAndGy != null and szAndGy != ''">
-                <if test="szAndGy == 'gy'">
-                    and epj.type = '1'
-                </if>
-                <if test="szAndGy == 'sz'">
-                    and epj.type = '2'
-                </if>
-            </if>
             and epj.del_flag = '0'
             WHERE ei.create_by = #{by} AND epj.id IS NOT NULL
             <if test="enginName != '' and enginName != null ">