Mybatis及UI删除条件修正

master/src/main/resources/mybatis/pssr/TPssrMaterialMapper.xml

@@ -77,10 +77,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM (
         SELECT DISTINCT CONFIRM1, CONFIRM2 FROM t_pssr_material WHERE sub_id = #{subId}
         <if test="approveStatus != null ">AND approve_status = #{approveStatus}</if>
+        and del_flag = 0
 
         UNION
         SELECT DISTINCT CONFIRM1, CONFIRM2 FROM t_pssr_material_raw WHERE sub_id = #{subId}
         <if test="approveStatus != null "> AND approve_status = #{approveStatus}</if>
+        and del_flag = 0
         )
     </select>
 

master/src/main/resources/mybatis/pssr/TPssrMaterialRawMapper.xml

@@ -77,10 +77,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM (
         SELECT DISTINCT CONFIRM1, CONFIRM2 FROM t_pssr_material_raw WHERE sub_id = #{subId}
         <if test="approveStatus != null ">AND approve_status = #{approveStatus}</if>
+        and del_flag = 0
 
         UNION
         SELECT DISTINCT CONFIRM1, CONFIRM2 FROM t_pssr_material WHERE sub_id = #{subId}
         <if test="approveStatus != null "> AND approve_status = #{approveStatus}</if>
+        and del_flag = 0
         )
     </select>
 

master/src/main/resources/mybatis/pssr/TPssrOverhaulExchangerMapper.xml

@@ -76,17 +76,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT LISTAGG(CONFIRMED_PERSON ,  ',') WITHIN GROUP (ORDER BY CONFIRMED_PERSON)AS CONFIRMED_PERSON
         FROM (
                  select CONFIRMED_PERSON from T_PSSR_OVERHAUL_EXCHANGER where sub_id= #{subId}
-        <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>union
+        <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+        and del_flag = 0 union
                  select RESP_PERSON  from T_PSSR_OVERHAUL_FILTER  where sub_id= #{subId}
-        <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>union
+        <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+        and del_flag = 0 union
                  select CONFIRMER from T_PSSR_OVERHAUL_PIPE  where sub_id= #{subId}
-        <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>union
+        <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+        and del_flag = 0 union
                  select CONFIRMED_PERSON from T_PSSR_OVERHAUL_PUMP  where sub_id= #{subId}
-        <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>union
+        <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+        and del_flag = 0 union
                  select CONFIRMED_PERSON from  T_PSSR_OVERHAUL_TOWER  where sub_id= #{subId}
-        <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>union
+        <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+        and del_flag = 0 union
                  select IDENTIFYING_PERSON  from T_PSSR_OVERHAUL_VALVE where sub_id= #{subId}
-        <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>)
+        <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
+        and del_flag = 0)
     </select>
 
     <update id="updateAllBySubId" parameterType="TPssrOverhaulExchanger">

master/src/main/resources/mybatis/pssr/TPssrPipeMapper.xml

@@ -79,10 +79,12 @@
         FROM (
         SELECT DISTINCT CONFIRMER1, CONFIRMER2 FROM t_pssr_pipe WHERE sub_id = #{subId}
         <if test="approveStatus != null "> AND approve_status = #{approveStatus}</if>
+        and del_flag = 0
 
         UNION
         SELECT DISTINCT CONFIRMER1, CONFIRMER2 FROM t_pssr_vessel WHERE sub_id = #{subId}
         <if test="approveStatus != null "> AND approve_status = #{approveStatus}</if>
+        and del_flag = 0
         )
 
     </select>

master/src/main/resources/mybatis/pssr/TPssrProtectionMapper.xml

@@ -74,10 +74,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM (
         SELECT DISTINCT CONFIRM1, CONFIRM2 FROM T_PSSR_PROTECTION WHERE sub_id = #{subId}
         <if test="approveStatus != null ">AND approve_status = #{approveStatus}</if>
+        and del_flag = 0
 
         UNION
         SELECT DISTINCT CONFIRM1, CONFIRM2 FROM T_PSSR_MEASURE WHERE sub_id = #{subId}
         <if test="approveStatus != null "> AND approve_status = #{approveStatus}</if>
+        and del_flag = 0
         )
     </select>
 

master/src/main/resources/mybatis/pssr/TPssrPumpFillMapper.xml

@@ -76,14 +76,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM (
         SELECT DISTINCT CONFIRMER1, CONFIRMER2 FROM t_pssr_pump_fill WHERE sub_id = #{subId}
         <if test="approveStatus != null ">AND approve_status = #{approveStatus}</if>
+        and del_flag = 0
 
         UNION
         SELECT DISTINCT CONFIRMER1, CONFIRMER2 FROM t_pssr_pump_cleaning WHERE sub_id = #{subId}
         <if test="approveStatus != null "> AND approve_status = #{approveStatus}</if>
+        and del_flag = 0
 
         UNION
         SELECT DISTINCT CONFIRMER1, CONFIRMER2 FROM t_pssr_pump_overhaul WHERE sub_id = #{subId}
         <if test="approveStatus != null "> AND approve_status = #{approveStatus}</if>
+        and del_flag = 0
         )
     </select>
 

master/src/main/resources/mybatis/pssr/TPssrSafetyBleedMapper.xml

@@ -94,22 +94,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM (
         SELECT DISTINCT CONFIRMER1, CONFIRMER2 FROM T_PSSR_SAFETY_BLEED WHERE sub_id = #{subId}
         <if test="approveStatus != null "> AND approve_status = #{approveStatus}</if>
-
+        and del_flag = 0
         UNION
         SELECT DISTINCT CONFIRMER1, CONFIRMER2 FROM T_PSSR_SAFETY_BRUST WHERE sub_id = #{subId}
         <if test="approveStatus != null "> AND approve_status = #{approveStatus}</if>
-
+        and del_flag = 0
         UNION
         SELECT DISTINCT CONFIRMER1, CONFIRMER2 FROM T_PSSR_SAFETY_BREATH WHERE sub_id = #{subId}
         <if test="approveStatus != null "> AND approve_status = #{approveStatus}</if>
-
+        and del_flag = 0
         UNION
         SELECT DISTINCT CONFIRMER1, CONFIRMER2 FROM T_PSSR_SAFETY_FLAMEARRESTER WHERE sub_id = #{subId}
         <if test="approveStatus != null "> AND approve_status = #{approveStatus}</if>
-
+        and del_flag = 0
         UNION
         SELECT DISTINCT CONFIRMER1, CONFIRMER2 FROM T_PSSR_SAFETY_VALVE WHERE sub_id = #{subId}
         <if test="approveStatus != null "> AND approve_status = #{approveStatus}</if>
+        and del_flag = 0
         )
 
     </select>

ui/src/views/pssr/aboveall/index.vue

@@ -114,14 +114,14 @@
                       v-hasPermi="['pssr:aboveall:edit']"
                     >修改
                     </el-button>-->
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['pssr:aboveall:remove']"
-          >删除
-          </el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['pssr:aboveall:remove']"-->
+<!--          >删除-->
+<!--          </el-button>-->
           <el-button
             size="mini"
             type="text"