From 52c9c41a6dde904c481861825775a1aa52a481ff Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Fri, 7 Jun 2024 16:35:11 +0800
Subject: [PATCH] =?UTF-8?q?2024-06-07=20=E8=B4=A8=E9=87=8F=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97-=E6=8A=BD=E6=A0=B7=E6=96=B9=E6=A1=88=E6=94=B9?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/quality/domain/QcSampleRuleAql.java    |  68 +-
 .../op/quality/domain/QcSampleRuleCode.java   |  22 +-
 .../impl/QcSampleRuleAqlServiceImpl.java      |   5 +-
 .../impl/QcSampleRuleCodeServiceImpl.java     |   5 +-
 .../mapper/quality/QcSampleRuleAqlMapper.xml  | 764 +++++++++---------
 .../mapper/quality/QcSampleRuleCodeMapper.xml | 180 +++--
 6 files changed, 531 insertions(+), 513 deletions(-)

diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcSampleRuleAql.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcSampleRuleAql.java
index b58141247..6c9f75bde 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcSampleRuleAql.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcSampleRuleAql.java
@@ -17,139 +17,139 @@ private static final long serialVersionUID=1L;
     /** id */
     private String id;
 
-    /** 样品量字码开始 */
-            @Excel(name = "样品量字码开始")
+    /** 样品量字码 */
+    @Excel(name = "样品量字码")
     private String sampleCode;
 
     /** 样品量字码结束 */
-            @Excel(name = "样品量字码结束")
+    @Excel(name = "样品量字码")
     private String sampleAql;
 
     /** 预留字段1 */
-            @Excel(name = "预留字段1")
+    @Excel(name = "预留字段1")
     private String attr1;
 
     /** 工厂编码 */
-            @Excel(name = "工厂编码")
+    @Excel(name = "工厂编码")
     private String factoryCode;
 
     /** 删除标识1删除0正常 */
     private String delFlag;
 
     /** 最大坏量 */
-            @Excel(name = "最大坏量")
+    @Excel(name = "最大坏量")
     private Long maxBadQuality;
 
     /** 小节点 */
-            @Excel(name = "小节点")
+    @Excel(name = "小节点")
     private String checkType;
 
     /** 大节点 */
-            @Excel(name = "大节点")
+    @Excel(name = "大节点")
     private String typeCode;
 
     /** 0.010 */
-            @Excel(name = "0.010")
+    @Excel(name = "0.010")
     private Long aql1;
 
     /** 0.015 */
-            @Excel(name = "0.015")
+    @Excel(name = "0.015")
     private Long aql2;
 
     /** 0.025 */
-            @Excel(name = "0.025")
+    @Excel(name = "0.025")
     private Long aql3;
 
     /** 0.040 */
-            @Excel(name = "0.040")
+    @Excel(name = "0.040")
     private Long aql4;
 
     /** 0.065 */
-            @Excel(name = "0.065")
+    @Excel(name = "0.065")
     private Long aql5;
 
     /** 0.10 */
-            @Excel(name = "0.10")
+    @Excel(name = "0.10")
     private Long aql6;
 
     /** 0.15 */
-            @Excel(name = "0.15")
+    @Excel(name = "0.15")
     private Long aql7;
 
     /** 0.25 */
-            @Excel(name = "0.25")
+    @Excel(name = "0.25")
     private Long aql8;
 
     /** 0.40 */
-            @Excel(name = "0.40")
+    @Excel(name = "0.40")
     private Long aql9;
 
     /** 0.65 */
-            @Excel(name = "0.65")
+    @Excel(name = "0.65")
     private Long aql10;
 
     /** 1.0 */
-            @Excel(name = "1.0")
+    @Excel(name = "1.0")
     private Long aql11;
 
     /** 1.5 */
-            @Excel(name = "1.5")
+    @Excel(name = "1.5")
     private Long aql12;
 
     /** 2.5 */
-            @Excel(name = "2.5")
+    @Excel(name = "2.5")
     private Long aql13;
 
     /** 4.0 */
-            @Excel(name = "4.0")
+    @Excel(name = "4.0")
     private Long aql14;
 
     /** 6.5 */
-            @Excel(name = "6.5")
+    @Excel(name = "6.5")
     private Long aql15;
 
     /** 10 */
-            @Excel(name = "10")
+    @Excel(name = "10")
     private Long aql16;
 
     /** 15 */
-            @Excel(name = "15")
+    @Excel(name = "15")
     private Long aql17;
 
     /** 25 */
-            @Excel(name = "25")
+    @Excel(name = "25")
     private Long aql18;
 
     /** 40 */
-            @Excel(name = "40")
+    @Excel(name = "40")
     private Long aql19;
 
     /** 65 */
-            @Excel(name = "65")
+    @Excel(name = "65")
     private Long aql20;
 
     /** 100 */
-            @Excel(name = "100")
+    @Excel(name = "100")
     private Long aql21;
 
     /** 150 */
-            @Excel(name = "150")
+    @Excel(name = "150")
     private Long aql22;
 
     /** 250 */
-            @Excel(name = "250")
+    @Excel(name = "250")
     private Long aql23;
 
     /** 400 */
-            @Excel(name = "400")
+    @Excel(name = "400")
     private Long aql24;
 
     /** 650 */
-            @Excel(name = "650")
+    @Excel(name = "650")
     private Long aql25;
 
     /** 1000 */
-            @Excel(name = "1000")
+    @Excel(name = "1000")
     private Long aql26;
 
     public void setId(String id){
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcSampleRuleCode.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcSampleRuleCode.java
index cdd19ea25..e99cc2b4e 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcSampleRuleCode.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcSampleRuleCode.java
@@ -17,41 +17,41 @@ private static final long serialVersionUID=1L;
     /** id */
     private String id;
 
+    /** 检测水平 */
+    @Excel(name = "检测水平")
+    private String checkLevel;
+
     /** 开始值 */
-            @Excel(name = "开始值")
+    @Excel(name = "开始值")
     private Long startValue;
 
     /** 结束值 */
-            @Excel(name = "结束值")
+    @Excel(name = "结束值")
     private Long endValue;
 
     /** 预留字段1 */
-            @Excel(name = "预留字段1")
+    @Excel(name = "预留字段1")
     private String attr1;
 
     /** 工厂编码 */
-            @Excel(name = "工厂编码")
+    @Excel(name = "工厂编码")
     private String factoryCode;
 
     /** 删除标识1删除0正常 */
     private String delFlag;
 
     /** 样品量字码 */
-            @Excel(name = "样品量字码")
+    @Excel(name = "样品量字码")
     private String sampleCode;
 
     /** 小节点 */
-            @Excel(name = "小节点")
+    @Excel(name = "小节点")
     private String checkType;
 
     /** 大节点 */
-            @Excel(name = "大节点")
+    @Excel(name = "大节点")
     private String typeCode;
 
-    /** 检测水平 */
-            @Excel(name = "检测水平")
-    private String checkLevel;
-
     public void setId(String id){
             this.id = id;
             }
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcSampleRuleAqlServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcSampleRuleAqlServiceImpl.java
index a1ebd35bf..77355cda3 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcSampleRuleAqlServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcSampleRuleAqlServiceImpl.java
@@ -5,6 +5,7 @@ import java.util.List;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.op.common.core.utils.DateUtils;
 import com.op.common.core.utils.uuid.IdUtils;
+import com.op.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.op.quality.mapper.QcSampleRuleAqlMapper;
@@ -56,6 +57,7 @@ public class QcSampleRuleAqlServiceImpl implements IQcSampleRuleAqlService {
     @DS("#header.poolName")
     public int insertQcSampleRuleAql(QcSampleRuleAql qcSampleRuleAql) {
         qcSampleRuleAql.setCreateTime(DateUtils.getNowDate());
+        qcSampleRuleAql.setCreateBy(SecurityUtils.getUsername());
         qcSampleRuleAql.setId(IdUtils.fastSimpleUUID());
         return qcSampleRuleAqlMapper.insertQcSampleRuleAql(qcSampleRuleAql);
     }
@@ -69,7 +71,8 @@ public class QcSampleRuleAqlServiceImpl implements IQcSampleRuleAqlService {
     @Override
     @DS("#header.poolName")
     public int updateQcSampleRuleAql(QcSampleRuleAql qcSampleRuleAql) {
-                qcSampleRuleAql.setUpdateTime(DateUtils.getNowDate());
+        qcSampleRuleAql.setUpdateTime(DateUtils.getNowDate());
+        qcSampleRuleAql.setUpdateBy(SecurityUtils.getUsername());
         return qcSampleRuleAqlMapper.updateQcSampleRuleAql(qcSampleRuleAql);
     }
 
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcSampleRuleCodeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcSampleRuleCodeServiceImpl.java
index 95a142bbc..f8c4d02ba 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcSampleRuleCodeServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcSampleRuleCodeServiceImpl.java
@@ -5,6 +5,7 @@ import java.util.List;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.op.common.core.utils.DateUtils;
 import com.op.common.core.utils.uuid.IdUtils;
+import com.op.common.security.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.op.quality.mapper.QcSampleRuleCodeMapper;
@@ -57,6 +58,7 @@ public class QcSampleRuleCodeServiceImpl implements IQcSampleRuleCodeService {
     public int insertQcSampleRuleCode(QcSampleRuleCode qcSampleRuleCode) {
         qcSampleRuleCode.setId(IdUtils.fastSimpleUUID());
         qcSampleRuleCode.setCreateTime(DateUtils.getNowDate());
+        qcSampleRuleCode.setCreateBy(SecurityUtils.getUsername());
         return qcSampleRuleCodeMapper.insertQcSampleRuleCode(qcSampleRuleCode);
     }
 
@@ -69,7 +71,8 @@ public class QcSampleRuleCodeServiceImpl implements IQcSampleRuleCodeService {
     @Override
     @DS("#header.poolName")
     public int updateQcSampleRuleCode(QcSampleRuleCode qcSampleRuleCode) {
-                qcSampleRuleCode.setUpdateTime(DateUtils.getNowDate());
+        qcSampleRuleCode.setUpdateTime(DateUtils.getNowDate());
+        qcSampleRuleCode.setUpdateBy(SecurityUtils.getUsername());
         return qcSampleRuleCodeMapper.updateQcSampleRuleCode(qcSampleRuleCode);
     }
 
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcSampleRuleAqlMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcSampleRuleAqlMapper.xml
index a329b18bd..bff5ea790 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcSampleRuleAqlMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcSampleRuleAqlMapper.xml
@@ -53,407 +53,413 @@
     <select id="selectQcSampleRuleAqlList" parameterType="QcSampleRuleAql" resultMap="QcSampleRuleAqlResult">
         <include refid="selectQcSampleRuleAqlVo"/>
         <where>
-                        <if test="sampleCode != null  and sampleCode != ''">
-                            and sample_code = #{sampleCode}
-                        </if>
-                        <if test="sampleAql != null  and sampleAql != ''">
-                            and sample_aql = #{sampleAql}
-                        </if>
-                        <if test="attr1 != null  and attr1 != ''">
-                            and attr1 = #{attr1}
-                        </if>
-                        <if test="factoryCode != null  and factoryCode != ''">
-                            and factory_code = #{factoryCode}
-                        </if>
-                        <if test="maxBadQuality != null ">
-                            and max_bad_quality = #{maxBadQuality}
-                        </if>
-                        <if test="checkType != null  and checkType != ''">
-                            and check_type = #{checkType}
-                        </if>
-                        <if test="typeCode != null  and typeCode != ''">
-                            and type_code = #{typeCode}
-                        </if>
-                        <if test="aql1 != null ">
-                            and aql1 = #{aql1}
-                        </if>
-                        <if test="aql2 != null ">
-                            and aql2 = #{aql2}
-                        </if>
-                        <if test="aql3 != null ">
-                            and aql3 = #{aql3}
-                        </if>
-                        <if test="aql4 != null ">
-                            and aql4 = #{aql4}
-                        </if>
-                        <if test="aql5 != null ">
-                            and aql5 = #{aql5}
-                        </if>
-                        <if test="aql6 != null ">
-                            and aql6 = #{aql6}
-                        </if>
-                        <if test="aql7 != null ">
-                            and aql7 = #{aql7}
-                        </if>
-                        <if test="aql8 != null ">
-                            and aql8 = #{aql8}
-                        </if>
-                        <if test="aql9 != null ">
-                            and aql9 = #{aql9}
-                        </if>
-                        <if test="aql10 != null ">
-                            and aql10 = #{aql10}
-                        </if>
-                        <if test="aql11 != null ">
-                            and aql11 = #{aql11}
-                        </if>
-                        <if test="aql12 != null ">
-                            and aql12 = #{aql12}
-                        </if>
-                        <if test="aql13 != null ">
-                            and aql13 = #{aql13}
-                        </if>
-                        <if test="aql14 != null ">
-                            and aql14 = #{aql14}
-                        </if>
-                        <if test="aql15 != null ">
-                            and aql15 = #{aql15}
-                        </if>
-                        <if test="aql16 != null ">
-                            and aql16 = #{aql16}
-                        </if>
-                        <if test="aql17 != null ">
-                            and aql17 = #{aql17}
-                        </if>
-                        <if test="aql18 != null ">
-                            and aql18 = #{aql18}
-                        </if>
-                        <if test="aql19 != null ">
-                            and aql19 = #{aql19}
-                        </if>
-                        <if test="aql20 != null ">
-                            and aql20 = #{aql20}
-                        </if>
-                        <if test="aql21 != null ">
-                            and aql21 = #{aql21}
-                        </if>
-                        <if test="aql22 != null ">
-                            and aql22 = #{aql22}
-                        </if>
-                        <if test="aql23 != null ">
-                            and aql23 = #{aql23}
-                        </if>
-                        <if test="aql24 != null ">
-                            and aql24 = #{aql24}
-                        </if>
-                        <if test="aql25 != null ">
-                            and aql25 = #{aql25}
-                        </if>
-                        <if test="aql26 != null ">
-                            and aql26 = #{aql26}
-                        </if>
+            <if test="sampleCode != null  and sampleCode != ''">
+                and sample_code = #{sampleCode}
+            </if>
+            <if test="sampleAql != null  and sampleAql != ''">
+                and sample_aql = #{sampleAql}
+            </if>
+            <if test="attr1 != null  and attr1 != ''">
+                and attr1 = #{attr1}
+            </if>
+            <if test="factoryCode != null  and factoryCode != ''">
+                and factory_code = #{factoryCode}
+            </if>
+            <if test="maxBadQuality != null ">
+                and max_bad_quality = #{maxBadQuality}
+            </if>
+            <if test="checkType != null  and checkType != ''">
+                and check_type = #{checkType}
+            </if>
+            <if test="typeCode != null  and typeCode != ''">
+                and type_code = #{typeCode}
+            </if>
+            <if test="aql1 != null ">
+                and aql1 = #{aql1}
+            </if>
+            <if test="aql2 != null ">
+                and aql2 = #{aql2}
+            </if>
+            <if test="aql3 != null ">
+                and aql3 = #{aql3}
+            </if>
+            <if test="aql4 != null ">
+                and aql4 = #{aql4}
+            </if>
+            <if test="aql5 != null ">
+                and aql5 = #{aql5}
+            </if>
+            <if test="aql6 != null ">
+                and aql6 = #{aql6}
+            </if>
+            <if test="aql7 != null ">
+                and aql7 = #{aql7}
+            </if>
+            <if test="aql8 != null ">
+                and aql8 = #{aql8}
+            </if>
+            <if test="aql9 != null ">
+                and aql9 = #{aql9}
+            </if>
+            <if test="aql10 != null ">
+                and aql10 = #{aql10}
+            </if>
+            <if test="aql11 != null ">
+                and aql11 = #{aql11}
+            </if>
+            <if test="aql12 != null ">
+                and aql12 = #{aql12}
+            </if>
+            <if test="aql13 != null ">
+                and aql13 = #{aql13}
+            </if>
+            <if test="aql14 != null ">
+                and aql14 = #{aql14}
+            </if>
+            <if test="aql15 != null ">
+                and aql15 = #{aql15}
+            </if>
+            <if test="aql16 != null ">
+                and aql16 = #{aql16}
+            </if>
+            <if test="aql17 != null ">
+                and aql17 = #{aql17}
+            </if>
+            <if test="aql18 != null ">
+                and aql18 = #{aql18}
+            </if>
+            <if test="aql19 != null ">
+                and aql19 = #{aql19}
+            </if>
+            <if test="aql20 != null ">
+                and aql20 = #{aql20}
+            </if>
+            <if test="aql21 != null ">
+                and aql21 = #{aql21}
+            </if>
+            <if test="aql22 != null ">
+                and aql22 = #{aql22}
+            </if>
+            <if test="aql23 != null ">
+                and aql23 = #{aql23}
+            </if>
+            <if test="aql24 != null ">
+                and aql24 = #{aql24}
+            </if>
+            <if test="aql25 != null ">
+                and aql25 = #{aql25}
+            </if>
+            <if test="aql26 != null ">
+                and aql26 = #{aql26}
+            </if>
+            and del_flag = '0'
         </where>
+        order by sample_code asc
     </select>
 
-    <select id="selectQcSampleRuleAqlById" parameterType="String"
-            resultMap="QcSampleRuleAqlResult">
-            <include refid="selectQcSampleRuleAqlVo"/>
-            where id = #{id}
+    <select id="selectQcSampleRuleAqlById" parameterType="String" resultMap="QcSampleRuleAqlResult">
+        <include refid="selectQcSampleRuleAqlVo"/>
+        where id = #{id}
+        and del_flag = '0'
     </select>
 
     <insert id="insertQcSampleRuleAql" parameterType="QcSampleRuleAql">
         insert into qc_sample_rule_aql
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test="id != null">id,
-                    </if>
-                    <if test="sampleCode != null">sample_code,
-                    </if>
-                    <if test="sampleAql != null">sample_aql,
-                    </if>
-                    <if test="attr1 != null">attr1,
-                    </if>
-                    <if test="createBy != null">create_by,
-                    </if>
-                    <if test="createTime != null">create_time,
-                    </if>
-                    <if test="updateBy != null">update_by,
-                    </if>
-                    <if test="updateTime != null">update_time,
-                    </if>
-                    <if test="factoryCode != null">factory_code,
-                    </if>
-                    <if test="delFlag != null">del_flag,
-                    </if>
-                    <if test="maxBadQuality != null">max_bad_quality,
-                    </if>
-                    <if test="checkType != null">check_type,
-                    </if>
-                    <if test="typeCode != null">type_code,
-                    </if>
-                    <if test="aql1 != null">aql1,
-                    </if>
-                    <if test="aql2 != null">aql2,
-                    </if>
-                    <if test="aql3 != null">aql3,
-                    </if>
-                    <if test="aql4 != null">aql4,
-                    </if>
-                    <if test="aql5 != null">aql5,
-                    </if>
-                    <if test="aql6 != null">aql6,
-                    </if>
-                    <if test="aql7 != null">aql7,
-                    </if>
-                    <if test="aql8 != null">aql8,
-                    </if>
-                    <if test="aql9 != null">aql9,
-                    </if>
-                    <if test="aql10 != null">aql10,
-                    </if>
-                    <if test="aql11 != null">aql11,
-                    </if>
-                    <if test="aql12 != null">aql12,
-                    </if>
-                    <if test="aql13 != null">aql13,
-                    </if>
-                    <if test="aql14 != null">aql14,
-                    </if>
-                    <if test="aql15 != null">aql15,
-                    </if>
-                    <if test="aql16 != null">aql16,
-                    </if>
-                    <if test="aql17 != null">aql17,
-                    </if>
-                    <if test="aql18 != null">aql18,
-                    </if>
-                    <if test="aql19 != null">aql19,
-                    </if>
-                    <if test="aql20 != null">aql20,
-                    </if>
-                    <if test="aql21 != null">aql21,
-                    </if>
-                    <if test="aql22 != null">aql22,
-                    </if>
-                    <if test="aql23 != null">aql23,
-                    </if>
-                    <if test="aql24 != null">aql24,
-                    </if>
-                    <if test="aql25 != null">aql25,
-                    </if>
-                    <if test="aql26 != null">aql26,
-                    </if>
+            <if test="id != null">id,
+            </if>
+            <if test="sampleCode != null">sample_code,
+            </if>
+            <if test="sampleAql != null">sample_aql,
+            </if>
+            <if test="attr1 != null">attr1,
+            </if>
+            <if test="createBy != null">create_by,
+            </if>
+            <if test="createTime != null">create_time,
+            </if>
+            <if test="updateBy != null">update_by,
+            </if>
+            <if test="updateTime != null">update_time,
+            </if>
+            <if test="factoryCode != null">factory_code,
+            </if>
+            <if test="delFlag != null">del_flag,
+            </if>
+            <if test="maxBadQuality != null">max_bad_quality,
+            </if>
+            <if test="checkType != null">check_type,
+            </if>
+            <if test="typeCode != null">type_code,
+            </if>
+            <if test="aql1 != null">aql1,
+            </if>
+            <if test="aql2 != null">aql2,
+            </if>
+            <if test="aql3 != null">aql3,
+            </if>
+            <if test="aql4 != null">aql4,
+            </if>
+            <if test="aql5 != null">aql5,
+            </if>
+            <if test="aql6 != null">aql6,
+            </if>
+            <if test="aql7 != null">aql7,
+            </if>
+            <if test="aql8 != null">aql8,
+            </if>
+            <if test="aql9 != null">aql9,
+            </if>
+            <if test="aql10 != null">aql10,
+            </if>
+            <if test="aql11 != null">aql11,
+            </if>
+            <if test="aql12 != null">aql12,
+            </if>
+            <if test="aql13 != null">aql13,
+            </if>
+            <if test="aql14 != null">aql14,
+            </if>
+            <if test="aql15 != null">aql15,
+            </if>
+            <if test="aql16 != null">aql16,
+            </if>
+            <if test="aql17 != null">aql17,
+            </if>
+            <if test="aql18 != null">aql18,
+            </if>
+            <if test="aql19 != null">aql19,
+            </if>
+            <if test="aql20 != null">aql20,
+            </if>
+            <if test="aql21 != null">aql21,
+            </if>
+            <if test="aql22 != null">aql22,
+            </if>
+            <if test="aql23 != null">aql23,
+            </if>
+            <if test="aql24 != null">aql24,
+            </if>
+            <if test="aql25 != null">aql25,
+            </if>
+            <if test="aql26 != null">aql26,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test="id != null">#{id},
-                    </if>
-                    <if test="sampleCode != null">#{sampleCode},
-                    </if>
-                    <if test="sampleAql != null">#{sampleAql},
-                    </if>
-                    <if test="attr1 != null">#{attr1},
-                    </if>
-                    <if test="createBy != null">#{createBy},
-                    </if>
-                    <if test="createTime != null">#{createTime},
-                    </if>
-                    <if test="updateBy != null">#{updateBy},
-                    </if>
-                    <if test="updateTime != null">#{updateTime},
-                    </if>
-                    <if test="factoryCode != null">#{factoryCode},
-                    </if>
-                    <if test="delFlag != null">#{delFlag},
-                    </if>
-                    <if test="maxBadQuality != null">#{maxBadQuality},
-                    </if>
-                    <if test="checkType != null">#{checkType},
-                    </if>
-                    <if test="typeCode != null">#{typeCode},
-                    </if>
-                    <if test="aql1 != null">#{aql1},
-                    </if>
-                    <if test="aql2 != null">#{aql2},
-                    </if>
-                    <if test="aql3 != null">#{aql3},
-                    </if>
-                    <if test="aql4 != null">#{aql4},
-                    </if>
-                    <if test="aql5 != null">#{aql5},
-                    </if>
-                    <if test="aql6 != null">#{aql6},
-                    </if>
-                    <if test="aql7 != null">#{aql7},
-                    </if>
-                    <if test="aql8 != null">#{aql8},
-                    </if>
-                    <if test="aql9 != null">#{aql9},
-                    </if>
-                    <if test="aql10 != null">#{aql10},
-                    </if>
-                    <if test="aql11 != null">#{aql11},
-                    </if>
-                    <if test="aql12 != null">#{aql12},
-                    </if>
-                    <if test="aql13 != null">#{aql13},
-                    </if>
-                    <if test="aql14 != null">#{aql14},
-                    </if>
-                    <if test="aql15 != null">#{aql15},
-                    </if>
-                    <if test="aql16 != null">#{aql16},
-                    </if>
-                    <if test="aql17 != null">#{aql17},
-                    </if>
-                    <if test="aql18 != null">#{aql18},
-                    </if>
-                    <if test="aql19 != null">#{aql19},
-                    </if>
-                    <if test="aql20 != null">#{aql20},
-                    </if>
-                    <if test="aql21 != null">#{aql21},
-                    </if>
-                    <if test="aql22 != null">#{aql22},
-                    </if>
-                    <if test="aql23 != null">#{aql23},
-                    </if>
-                    <if test="aql24 != null">#{aql24},
-                    </if>
-                    <if test="aql25 != null">#{aql25},
-                    </if>
-                    <if test="aql26 != null">#{aql26},
-                    </if>
+            <if test="id != null">#{id},
+            </if>
+            <if test="sampleCode != null">#{sampleCode},
+            </if>
+            <if test="sampleAql != null">#{sampleAql},
+            </if>
+            <if test="attr1 != null">#{attr1},
+            </if>
+            <if test="createBy != null">#{createBy},
+            </if>
+            <if test="createTime != null">#{createTime},
+            </if>
+            <if test="updateBy != null">#{updateBy},
+            </if>
+            <if test="updateTime != null">#{updateTime},
+            </if>
+            <if test="factoryCode != null">#{factoryCode},
+            </if>
+            <if test="delFlag != null">#{delFlag},
+            </if>
+            <if test="maxBadQuality != null">#{maxBadQuality},
+            </if>
+            <if test="checkType != null">#{checkType},
+            </if>
+            <if test="typeCode != null">#{typeCode},
+            </if>
+            <if test="aql1 != null">#{aql1},
+            </if>
+            <if test="aql2 != null">#{aql2},
+            </if>
+            <if test="aql3 != null">#{aql3},
+            </if>
+            <if test="aql4 != null">#{aql4},
+            </if>
+            <if test="aql5 != null">#{aql5},
+            </if>
+            <if test="aql6 != null">#{aql6},
+            </if>
+            <if test="aql7 != null">#{aql7},
+            </if>
+            <if test="aql8 != null">#{aql8},
+            </if>
+            <if test="aql9 != null">#{aql9},
+            </if>
+            <if test="aql10 != null">#{aql10},
+            </if>
+            <if test="aql11 != null">#{aql11},
+            </if>
+            <if test="aql12 != null">#{aql12},
+            </if>
+            <if test="aql13 != null">#{aql13},
+            </if>
+            <if test="aql14 != null">#{aql14},
+            </if>
+            <if test="aql15 != null">#{aql15},
+            </if>
+            <if test="aql16 != null">#{aql16},
+            </if>
+            <if test="aql17 != null">#{aql17},
+            </if>
+            <if test="aql18 != null">#{aql18},
+            </if>
+            <if test="aql19 != null">#{aql19},
+            </if>
+            <if test="aql20 != null">#{aql20},
+            </if>
+            <if test="aql21 != null">#{aql21},
+            </if>
+            <if test="aql22 != null">#{aql22},
+            </if>
+            <if test="aql23 != null">#{aql23},
+            </if>
+            <if test="aql24 != null">#{aql24},
+            </if>
+            <if test="aql25 != null">#{aql25},
+            </if>
+            <if test="aql26 != null">#{aql26},
+            </if>
         </trim>
     </insert>
 
     <update id="updateQcSampleRuleAql" parameterType="QcSampleRuleAql">
         update qc_sample_rule_aql
         <trim prefix="SET" suffixOverrides=",">
-                    <if test="sampleCode != null">sample_code =
-                        #{sampleCode},
-                    </if>
-                    <if test="sampleAql != null">sample_aql =
-                        #{sampleAql},
-                    </if>
-                    <if test="attr1 != null">attr1 =
-                        #{attr1},
-                    </if>
-                    <if test="createBy != null">create_by =
-                        #{createBy},
-                    </if>
-                    <if test="createTime != null">create_time =
-                        #{createTime},
-                    </if>
-                    <if test="updateBy != null">update_by =
-                        #{updateBy},
-                    </if>
-                    <if test="updateTime != null">update_time =
-                        #{updateTime},
-                    </if>
-                    <if test="factoryCode != null">factory_code =
-                        #{factoryCode},
-                    </if>
-                    <if test="delFlag != null">del_flag =
-                        #{delFlag},
-                    </if>
-                    <if test="maxBadQuality != null">max_bad_quality =
-                        #{maxBadQuality},
-                    </if>
-                    <if test="checkType != null">check_type =
-                        #{checkType},
-                    </if>
-                    <if test="typeCode != null">type_code =
-                        #{typeCode},
-                    </if>
-                    <if test="aql1 != null">aql1 =
-                        #{aql1},
-                    </if>
-                    <if test="aql2 != null">aql2 =
-                        #{aql2},
-                    </if>
-                    <if test="aql3 != null">aql3 =
-                        #{aql3},
-                    </if>
-                    <if test="aql4 != null">aql4 =
-                        #{aql4},
-                    </if>
-                    <if test="aql5 != null">aql5 =
-                        #{aql5},
-                    </if>
-                    <if test="aql6 != null">aql6 =
-                        #{aql6},
-                    </if>
-                    <if test="aql7 != null">aql7 =
-                        #{aql7},
-                    </if>
-                    <if test="aql8 != null">aql8 =
-                        #{aql8},
-                    </if>
-                    <if test="aql9 != null">aql9 =
-                        #{aql9},
-                    </if>
-                    <if test="aql10 != null">aql10 =
-                        #{aql10},
-                    </if>
-                    <if test="aql11 != null">aql11 =
-                        #{aql11},
-                    </if>
-                    <if test="aql12 != null">aql12 =
-                        #{aql12},
-                    </if>
-                    <if test="aql13 != null">aql13 =
-                        #{aql13},
-                    </if>
-                    <if test="aql14 != null">aql14 =
-                        #{aql14},
-                    </if>
-                    <if test="aql15 != null">aql15 =
-                        #{aql15},
-                    </if>
-                    <if test="aql16 != null">aql16 =
-                        #{aql16},
-                    </if>
-                    <if test="aql17 != null">aql17 =
-                        #{aql17},
-                    </if>
-                    <if test="aql18 != null">aql18 =
-                        #{aql18},
-                    </if>
-                    <if test="aql19 != null">aql19 =
-                        #{aql19},
-                    </if>
-                    <if test="aql20 != null">aql20 =
-                        #{aql20},
-                    </if>
-                    <if test="aql21 != null">aql21 =
-                        #{aql21},
-                    </if>
-                    <if test="aql22 != null">aql22 =
-                        #{aql22},
-                    </if>
-                    <if test="aql23 != null">aql23 =
-                        #{aql23},
-                    </if>
-                    <if test="aql24 != null">aql24 =
-                        #{aql24},
-                    </if>
-                    <if test="aql25 != null">aql25 =
-                        #{aql25},
-                    </if>
-                    <if test="aql26 != null">aql26 =
-                        #{aql26},
-                    </if>
+            <if test="sampleCode != null">sample_code =
+                #{sampleCode},
+            </if>
+            <if test="sampleAql != null">sample_aql =
+                #{sampleAql},
+            </if>
+            <if test="attr1 != null">attr1 =
+                #{attr1},
+            </if>
+            <if test="createBy != null">create_by =
+                #{createBy},
+            </if>
+            <if test="createTime != null">create_time =
+                #{createTime},
+            </if>
+            <if test="updateBy != null">update_by =
+                #{updateBy},
+            </if>
+            <if test="updateTime != null">update_time =
+                #{updateTime},
+            </if>
+            <if test="factoryCode != null">factory_code =
+                #{factoryCode},
+            </if>
+            <if test="delFlag != null">del_flag =
+                #{delFlag},
+            </if>
+            <if test="maxBadQuality != null">max_bad_quality =
+                #{maxBadQuality},
+            </if>
+            <if test="checkType != null">check_type =
+                #{checkType},
+            </if>
+            <if test="typeCode != null">type_code =
+                #{typeCode},
+            </if>
+            <if test="aql1 != null">aql1 =
+                #{aql1},
+            </if>
+            <if test="aql2 != null">aql2 =
+                #{aql2},
+            </if>
+            <if test="aql3 != null">aql3 =
+                #{aql3},
+            </if>
+            <if test="aql4 != null">aql4 =
+                #{aql4},
+            </if>
+            <if test="aql5 != null">aql5 =
+                #{aql5},
+            </if>
+            <if test="aql6 != null">aql6 =
+                #{aql6},
+            </if>
+            <if test="aql7 != null">aql7 =
+                #{aql7},
+            </if>
+            <if test="aql8 != null">aql8 =
+                #{aql8},
+            </if>
+            <if test="aql9 != null">aql9 =
+                #{aql9},
+            </if>
+            <if test="aql10 != null">aql10 =
+                #{aql10},
+            </if>
+            <if test="aql11 != null">aql11 =
+                #{aql11},
+            </if>
+            <if test="aql12 != null">aql12 =
+                #{aql12},
+            </if>
+            <if test="aql13 != null">aql13 =
+                #{aql13},
+            </if>
+            <if test="aql14 != null">aql14 =
+                #{aql14},
+            </if>
+            <if test="aql15 != null">aql15 =
+                #{aql15},
+            </if>
+            <if test="aql16 != null">aql16 =
+                #{aql16},
+            </if>
+            <if test="aql17 != null">aql17 =
+                #{aql17},
+            </if>
+            <if test="aql18 != null">aql18 =
+                #{aql18},
+            </if>
+            <if test="aql19 != null">aql19 =
+                #{aql19},
+            </if>
+            <if test="aql20 != null">aql20 =
+                #{aql20},
+            </if>
+            <if test="aql21 != null">aql21 =
+                #{aql21},
+            </if>
+            <if test="aql22 != null">aql22 =
+                #{aql22},
+            </if>
+            <if test="aql23 != null">aql23 =
+                #{aql23},
+            </if>
+            <if test="aql24 != null">aql24 =
+                #{aql24},
+            </if>
+            <if test="aql25 != null">aql25 =
+                #{aql25},
+            </if>
+            <if test="aql26 != null">aql26 =
+                #{aql26},
+            </if>
         </trim>
         where id = #{id}
     </update>
 
-    <delete id="deleteQcSampleRuleAqlById" parameterType="String">
-		delete from qc_sample_rule_aql where id = #{id}
-	</delete>
+    <update id="deleteQcSampleRuleAqlById" parameterType="String">
+		update qc_sample_rule_aql
+        set del_flag = '1'
+		where id = #{id}
+	</update>
 
-    <delete id="deleteQcSampleRuleAqlByIds" parameterType="String">
-        delete from qc_sample_rule_aql where id in
+    <update id="deleteQcSampleRuleAqlByIds" parameterType="String">
+        update qc_sample_rule_aql
+        set del_flag = '1'
+        where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
-    </delete>
+    </update>
 </mapper>
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcSampleRuleCodeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcSampleRuleCodeMapper.xml
index f4d938e4b..d06b14828 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcSampleRuleCodeMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcSampleRuleCodeMapper.xml
@@ -28,101 +28,103 @@
     <select id="selectQcSampleRuleCodeList" parameterType="QcSampleRuleCode" resultMap="QcSampleRuleCodeResult">
         <include refid="selectQcSampleRuleCodeVo"/>
         <where>
-                        <if test="startValue != null ">
-                            and start_value = #{startValue}
-                        </if>
-                        <if test="endValue != null ">
-                            and end_value = #{endValue}
-                        </if>
-                        <if test="attr1 != null  and attr1 != ''">
-                            and attr1 = #{attr1}
-                        </if>
-                        <if test="factoryCode != null  and factoryCode != ''">
-                            and factory_code = #{factoryCode}
-                        </if>
-                        <if test="sampleCode != null  and sampleCode != ''">
-                            and sample_code = #{sampleCode}
-                        </if>
-                        <if test="checkType != null  and checkType != ''">
-                            and check_type = #{checkType}
-                        </if>
-                        <if test="typeCode != null  and typeCode != ''">
-                            and type_code = #{typeCode}
-                        </if>
-                        <if test="checkLevel != null  and checkLevel != ''">
-                            and check_level = #{checkLevel}
-                        </if>
+            <if test="startValue != null ">
+                and start_value = #{startValue}
+            </if>
+            <if test="endValue != null ">
+                and end_value = #{endValue}
+            </if>
+            <if test="attr1 != null  and attr1 != ''">
+                and attr1 = #{attr1}
+            </if>
+            <if test="factoryCode != null  and factoryCode != ''">
+                and factory_code = #{factoryCode}
+            </if>
+            <if test="sampleCode != null  and sampleCode != ''">
+                and sample_code = #{sampleCode}
+            </if>
+            <if test="checkType != null  and checkType != ''">
+                and check_type = #{checkType}
+            </if>
+            <if test="typeCode != null  and typeCode != ''">
+                and type_code = #{typeCode}
+            </if>
+            <if test="checkLevel != null  and checkLevel != ''">
+                and check_level = #{checkLevel}
+            </if>
+            and del_flag = '0'
         </where>
-        order by check_level
+        order by check_level,start_value,end_value
     </select>
 
     <select id="selectQcSampleRuleCodeById" parameterType="String"
             resultMap="QcSampleRuleCodeResult">
             <include refid="selectQcSampleRuleCodeVo"/>
             where id = #{id}
+            and del_flag = '0'
     </select>
 
     <insert id="insertQcSampleRuleCode" parameterType="QcSampleRuleCode">
         insert into qc_sample_rule_code
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test="id != null">id,
-                    </if>
-                    <if test="startValue != null">start_value,
-                    </if>
-                    <if test="endValue != null">end_value,
-                    </if>
-                    <if test="attr1 != null">attr1,
-                    </if>
-                    <if test="createBy != null">create_by,
-                    </if>
-                    <if test="createTime != null">create_time,
-                    </if>
-                    <if test="updateBy != null">update_by,
-                    </if>
-                    <if test="updateTime != null">update_time,
-                    </if>
-                    <if test="factoryCode != null">factory_code,
-                    </if>
-                    <if test="delFlag != null">del_flag,
-                    </if>
-                    <if test="sampleCode != null">sample_code,
-                    </if>
-                    <if test="checkType != null">check_type,
-                    </if>
-                    <if test="typeCode != null">type_code,
-                    </if>
-                    <if test="checkLevel != null">check_level,
-                    </if>
+            <if test="id != null">id,
+            </if>
+            <if test="startValue != null">start_value,
+            </if>
+            <if test="endValue != null">end_value,
+            </if>
+            <if test="attr1 != null">attr1,
+            </if>
+            <if test="createBy != null">create_by,
+            </if>
+            <if test="createTime != null">create_time,
+            </if>
+            <if test="updateBy != null">update_by,
+            </if>
+            <if test="updateTime != null">update_time,
+            </if>
+            <if test="factoryCode != null">factory_code,
+            </if>
+            <if test="delFlag != null">del_flag,
+            </if>
+            <if test="sampleCode != null">sample_code,
+            </if>
+            <if test="checkType != null">check_type,
+            </if>
+            <if test="typeCode != null">type_code,
+            </if>
+            <if test="checkLevel != null">check_level,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test="id != null">#{id},
-                    </if>
-                    <if test="startValue != null">#{startValue},
-                    </if>
-                    <if test="endValue != null">#{endValue},
-                    </if>
-                    <if test="attr1 != null">#{attr1},
-                    </if>
-                    <if test="createBy != null">#{createBy},
-                    </if>
-                    <if test="createTime != null">#{createTime},
-                    </if>
-                    <if test="updateBy != null">#{updateBy},
-                    </if>
-                    <if test="updateTime != null">#{updateTime},
-                    </if>
-                    <if test="factoryCode != null">#{factoryCode},
-                    </if>
-                    <if test="delFlag != null">#{delFlag},
-                    </if>
-                    <if test="sampleCode != null">#{sampleCode},
-                    </if>
-                    <if test="checkType != null">#{checkType},
-                    </if>
-                    <if test="typeCode != null">#{typeCode},
-                    </if>
-                    <if test="checkLevel != null">#{checkLevel},
-                    </if>
+            <if test="id != null">#{id},
+            </if>
+            <if test="startValue != null">#{startValue},
+            </if>
+            <if test="endValue != null">#{endValue},
+            </if>
+            <if test="attr1 != null">#{attr1},
+            </if>
+            <if test="createBy != null">#{createBy},
+            </if>
+            <if test="createTime != null">#{createTime},
+            </if>
+            <if test="updateBy != null">#{updateBy},
+            </if>
+            <if test="updateTime != null">#{updateTime},
+            </if>
+            <if test="factoryCode != null">#{factoryCode},
+            </if>
+            <if test="delFlag != null">#{delFlag},
+            </if>
+            <if test="sampleCode != null">#{sampleCode},
+            </if>
+            <if test="checkType != null">#{checkType},
+            </if>
+            <if test="typeCode != null">#{typeCode},
+            </if>
+            <if test="checkLevel != null">#{checkLevel},
+            </if>
         </trim>
     </insert>
 
@@ -172,14 +174,18 @@
         where id = #{id}
     </update>
 
-    <delete id="deleteQcSampleRuleCodeById" parameterType="String">
-		delete from qc_sample_rule_code where id = #{id}
-	</delete>
+    <update id="deleteQcSampleRuleCodeById" parameterType="String">
+		update qc_sample_rule_code
+		set del_flag = '1'
+		where id = #{id}
+	</update>
 
-    <delete id="deleteQcSampleRuleCodeByIds" parameterType="String">
-        delete from qc_sample_rule_code where id in
+    <update id="deleteQcSampleRuleCodeByIds" parameterType="String">
+        update qc_sample_rule_code
+        set del_flag = '1'
+        where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
-    </delete>
+    </update>
 </mapper>