提交代码

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

@@ -95,6 +95,7 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
         }
         else if ("7".equals(type)){
             leftJoin = "z_touch_operation_engineering"; // 碰口工程
+            szAndGy = "pk";
         }
         LinkedList<String> list = zEngineeringCivilMapper.getTableNames("z_engineering_info");
         List DateList = new ArrayList();
@@ -334,7 +335,6 @@ public class ZEngineeringIndustryServiceImpl implements IZEngineeringIndustrySer
                 MonthTableNameHandler.removeData();
             });
         }
-
         return TableDataInfo.build(listPage);
     }
 

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

@@ -73,11 +73,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="enginName != '' and enginName != null ">
             and epj.engin_name LIKE CONCAT('%',#{enginName},'%')
         </if>
-        <if test="enginType != '' and enginType != null and szAndGy!='gy'">
+        <if test="enginType != '' and enginType != null and szAndGy!='pk'">
             and epj.engin_type LIKE CONCAT('%',#{enginType},'%')
         </if>
-        <if test="enginType != '' and enginType != null and szAndGy=='gy'">
-            and epj.engin_classification LIKE CONCAT('%',#{enginType},'%')
+        <if test="enginType != '' and enginType != null and szAndGy=='pk'">
+            and epj.mode_operation LIKE CONCAT('%',#{enginType},'%')
         </if>
         GROUP BY epj.id
         <foreach collection="names" item="name">
@@ -95,11 +95,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enginName != '' and enginName != null ">
                 and epj.engin_name LIKE CONCAT('%',#{enginName},'%')
             </if>
-            <if test="enginType != '' and enginType != null and szAndGy!='gy'">
+            <if test="enginType != '' and enginType != null and szAndGy!='pk'">
                 and epj.engin_type LIKE CONCAT('%',#{enginType},'%')
             </if>
-            <if test="enginType != '' and enginType != null and szAndGy=='gy'">
-                and epj.engin_classification LIKE CONCAT('%',#{enginType},'%')
+            <if test="enginType != '' and enginType != null and szAndGy=='pk'">
+                and epj.mode_operation LIKE CONCAT('%',#{enginType},'%')
             </if>
             GROUP BY epj.id