Merge branch 'dev-1.6.3' of depot-qinghai/depot-qualitycheck-qinghai into dev

src/main/java/com/chinaitop/depot/qualityControl/mapper/BusinessQcQualityInspectionItemMapper.xml

@@ -7,6 +7,7 @@
     <result column="updatename" property="updatename" jdbcType="VARCHAR" />
     <result column="updatedate" property="updatedate" jdbcType="TIMESTAMP" />
     <result column="qc_quality_inspection_id" property="qcQualityInspectionId" jdbcType="INTEGER" />
+    <result column="parent_inspection_item_id" property="parentInspectionItemId" jdbcType="INTEGER" />
     <result column="inspection_item_id" property="inspectionItemId" jdbcType="INTEGER" />
     <result column="inspection_value" property="inspectionValue" jdbcType="VARCHAR" />
     <result column="single_conclusion" property="singleConclusion" jdbcType="VARCHAR" />
@@ -72,7 +73,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List" >
-    id, createdate, updatename, updatedate, qc_quality_inspection_id, inspection_item_id, 
+    id, createdate, updatename, updatedate, qc_quality_inspection_id, parent_inspection_item_id, inspection_item_id,
     inspection_value, single_conclusion, inspection_method
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.qualityControl.model.BusinessQcQualityInspectionItemExample" >
@@ -90,7 +91,7 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
+    select
     <include refid="Base_Column_List" />
     from business_qc_quality_inspection_item
     where id = #{id,jdbcType=INTEGER}
@@ -106,12 +107,12 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.chinaitop.depot.qualityControl.model.BusinessQcQualityInspectionItem" >
-    insert into business_qc_quality_inspection_item (id, createdate, updatename, 
-      updatedate, qc_quality_inspection_id, inspection_item_id, 
+    insert into business_qc_quality_inspection_item (id, createdate, updatename,
+      updatedate, qc_quality_inspection_id, parent_inspection_item_id, inspection_item_id,
       inspection_value, single_conclusion, inspection_method
       )
-    values (#{id,jdbcType=INTEGER}, #{createdate,jdbcType=TIMESTAMP}, #{updatename,jdbcType=VARCHAR}, 
-      #{updatedate,jdbcType=TIMESTAMP}, #{qcQualityInspectionId,jdbcType=INTEGER}, #{inspectionItemId,jdbcType=INTEGER}, 
+    values (#{id,jdbcType=INTEGER}, #{createdate,jdbcType=TIMESTAMP}, #{updatename,jdbcType=VARCHAR},
+      #{updatedate,jdbcType=TIMESTAMP}, #{qcQualityInspectionId,jdbcType=INTEGER}, #{parentInspectionItemId,jdbcType=INTEGER}, #{inspectionItemId,jdbcType=INTEGER},
       #{inspectionValue,jdbcType=VARCHAR}, #{singleConclusion,jdbcType=VARCHAR}, #{inspectionMethod,jdbcType=VARCHAR}
       )
   </insert>
@@ -133,6 +134,9 @@
       <if test="qcQualityInspectionId != null" >
         qc_quality_inspection_id,
       </if>
+      <if test="parentInspectionItemId != null" >
+        parent_inspection_item_id,
+      </if>
       <if test="inspectionItemId != null" >
         inspection_item_id,
       </if>
@@ -219,6 +223,9 @@
       <if test="record.qcQualityInspectionId != null" >
         qc_quality_inspection_id = #{record.qcQualityInspectionId,jdbcType=INTEGER},
       </if>
+      <if test="record.parentInspectionItemId != null" >
+        parent_inspection_item_id = #{record.parentInspectionItemId,jdbcType=INTEGER},
+      </if>
       <if test="record.inspectionItemId != null" >
         inspection_item_id = #{record.inspectionItemId,jdbcType=INTEGER},
       </if>
@@ -239,14 +246,15 @@
   <update id="updateByExample" parameterType="map" >
     update business_qc_quality_inspection_item
     set id = #{record.id,jdbcType=INTEGER},
-      createdate = #{record.createdate,jdbcType=TIMESTAMP},
-      updatename = #{record.updatename,jdbcType=VARCHAR},
-      updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
-      qc_quality_inspection_id = #{record.qcQualityInspectionId,jdbcType=INTEGER},
-      inspection_item_id = #{record.inspectionItemId,jdbcType=INTEGER},
-      inspection_value = #{record.inspectionValue,jdbcType=VARCHAR},
-      single_conclusion = #{record.singleConclusion,jdbcType=VARCHAR},
-      inspection_method = #{record.inspectionMethod,jdbcType=VARCHAR}
+    createdate = #{record.createdate,jdbcType=TIMESTAMP},
+    updatename = #{record.updatename,jdbcType=VARCHAR},
+    updatedate = #{record.updatedate,jdbcType=TIMESTAMP},
+    qc_quality_inspection_id = #{record.qcQualityInspectionId,jdbcType=INTEGER},
+    parent_inspection_item_id = #{record.parentInspectionItemId,jdbcType=INTEGER},
+    inspection_item_id = #{record.inspectionItemId,jdbcType=INTEGER},
+    inspection_value = #{record.inspectionValue,jdbcType=VARCHAR},
+    single_conclusion = #{record.singleConclusion,jdbcType=VARCHAR},
+    inspection_method = #{record.inspectionMethod,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -266,6 +274,9 @@
       <if test="qcQualityInspectionId != null" >
         qc_quality_inspection_id = #{qcQualityInspectionId,jdbcType=INTEGER},
       </if>
+      <if test="qcQualityInspectionId != null" >
+        parent_inspection_item_id = #{parentInspectionItemId,jdbcType=INTEGER},
+      </if>
       <if test="inspectionItemId != null" >
         inspection_item_id = #{inspectionItemId,jdbcType=INTEGER},
       </if>
@@ -287,6 +298,7 @@
       updatename = #{updatename,jdbcType=VARCHAR},
       updatedate = #{updatedate,jdbcType=TIMESTAMP},
       qc_quality_inspection_id = #{qcQualityInspectionId,jdbcType=INTEGER},
+      parent_inspection_item_id = #{parentInspectionItemId,jdbcType=INTEGER},
       inspection_item_id = #{inspectionItemId,jdbcType=INTEGER},
       inspection_value = #{inspectionValue,jdbcType=VARCHAR},
       single_conclusion = #{singleConclusion,jdbcType=VARCHAR},

src/main/java/com/chinaitop/depot/qualityControl/mapper/BusinessQcQualityInspectionMapper.xml

@@ -856,8 +856,7 @@
     FROM
         basic_enum
     WHERE
-        enumId = #{parentId}
-    OR parentId = #{parentId}
+        parentId = #{parentId}
     AND delFlag = 1
   </select>
   <select id="getQualityInspectionFindByWarehouseId"

src/main/java/com/chinaitop/depot/qualityControl/model/BusinessQcQualityInspection.java

@@ -536,16 +536,16 @@ public class BusinessQcQualityInspection {
     }
 
     /**
-     * 指标类别，1: 质量指标检验, 2：储存品质检验, 3：食品安全检验
-     * @return zblb 指标类别，1: 质量指标检验, 2：储存品质检验, 3：食品安全检验
+     * 指标类别，7602: 质量指标检验, 7603：储存品质检验, 7604：食品安全检验
+     * @return zblb 指标类别，7602: 质量指标检验, 7603：储存品质检验, 7604：食品安全检验
      */
     public String getZblb() {
         return zblb;
     }
 
     /**
-     * 指标类别，1: 质量指标检验, 2：储存品质检验, 3：食品安全检验
-     * @param zblb 指标类别，1: 质量指标检验, 2：储存品质检验, 3：食品安全检验
+     * 指标类别，7602: 质量指标检验, 7603：储存品质检验, 7604：食品安全检验
+     * @param zblb 指标类别，7602: 质量指标检验, 7603：储存品质检验, 7604：食品安全检验
      */
     public void setZblb(String zblb) {
         this.zblb = zblb == null ? null : zblb.trim();