From 0047b170a787c0a27ce992ceb7dae503225f45d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?=
 <411641505@qq.com>
Date: Wed, 27 Nov 2024 14:39:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A3=80=E9=AA=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=80=BC=E7=B1=BB=E5=9E=8B=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ktg/mes/qc/domain/QcIndex.java   | 29 ++++++++++++++++++-
 .../resources/mapper/qc/QcIndexMapper.xml     | 10 ++++++-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIndex.java b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIndex.java
index ddd1fcc..e0894cc 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIndex.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIndex.java
@@ -34,6 +34,16 @@ public class QcIndex extends BaseEntity
     @Excel(name = "检测工具")
     private String qcTool;
 
+    /**
+     * 检测结果值类型
+     */
+    private String qcResultType;
+
+    /**
+     * 值属性
+     */
+    private String qcResultSpc;
+
     /** 预留字段1 */
     private String attr1;
 
@@ -91,7 +101,24 @@ public class QcIndex extends BaseEntity
     {
         return qcTool;
     }
-    public void setAttr1(String attr1) 
+
+    public String getQcResultType() {
+        return qcResultType;
+    }
+
+    public void setQcResultType(String qcResultType) {
+        this.qcResultType = qcResultType;
+    }
+
+    public String getQcResultSpc() {
+        return qcResultSpc;
+    }
+
+    public void setQcResultSpc(String qcResultSpc) {
+        this.qcResultSpc = qcResultSpc;
+    }
+
+    public void setAttr1(String attr1)
     {
         this.attr1 = attr1;
     }
diff --git a/ktg-mes/src/main/resources/mapper/qc/QcIndexMapper.xml b/ktg-mes/src/main/resources/mapper/qc/QcIndexMapper.xml
index 5f406e8..2b49af3 100644
--- a/ktg-mes/src/main/resources/mapper/qc/QcIndexMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/qc/QcIndexMapper.xml
@@ -10,6 +10,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="indexName"    column="index_name"    />
         <result property="indexType"    column="index_type"    />
         <result property="qcTool"    column="qc_tool"    />
+        <result property="qcResultType"    column="qc_result_type"    />
+        <result property="qcResultSpc"    column="qc_result_spc"    />
         <result property="remark"    column="remark"    />
         <result property="attr1"    column="attr1"    />
         <result property="attr2"    column="attr2"    />
@@ -22,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectQcIndexVo">
-        select index_id, index_code, index_name, index_type, qc_tool, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from qc_index
+        select index_id, index_code, index_name, index_type, qc_tool, qc_result_type,qc_result_spc,remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from qc_index
     </sql>
 
     <select id="selectQcIndexList" parameterType="QcIndex" resultMap="QcIndexResult">
@@ -57,6 +59,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="indexName != null and indexName != ''">index_name,</if>
             <if test="indexType != null and indexType != ''">index_type,</if>
             <if test="qcTool != null">qc_tool,</if>
+            <if test="qcResultType != null">qc_result_type,</if>
+            <if test="qcResultSpc != null">qc_result_spc,</if>
             <if test="remark != null">remark,</if>
             <if test="attr1 != null">attr1,</if>
             <if test="attr2 != null">attr2,</if>
@@ -72,6 +76,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="indexName != null and indexName != ''">#{indexName},</if>
             <if test="indexType != null and indexType != ''">#{indexType},</if>
             <if test="qcTool != null">#{qcTool},</if>
+            <if test="qcResultType != null">#{qcResultType},</if>
+            <if test="qcResultSpc != null">#{qcResultSpc},</if>
             <if test="remark != null">#{remark},</if>
             <if test="attr1 != null">#{attr1},</if>
             <if test="attr2 != null">#{attr2},</if>
@@ -91,6 +97,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="indexName != null and indexName != ''">index_name = #{indexName},</if>
             <if test="indexType != null and indexType != ''">index_type = #{indexType},</if>
             <if test="qcTool != null">qc_tool = #{qcTool},</if>
+            <if test="qcResultType != null">qc_result_type = #{qcResultType},</if>
+            <if test="qcResultSpc != null">qc_result_spc = #{qcResultSpc},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="attr1 != null">attr1 = #{attr1},</if>
             <if test="attr2 != null">attr2 = #{attr2},</if>