复原

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

@@ -7,7 +7,6 @@
     <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 +71,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List" >
-    id, createdate, updatename, updatedate, qc_quality_inspection_id, parent_inspection_item_id, inspection_item_id,
+    id, createdate, updatename, updatedate, qc_quality_inspection_id, inspection_item_id, 
     inspection_value, single_conclusion, inspection_method
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.qualityControl.model.BusinessQcQualityInspectionItemExample" >
@@ -107,11 +106,11 @@
   </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, parent_inspection_item_id, inspection_item_id,
+      updatedate, qc_quality_inspection_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}, #{parentInspectionItemId,jdbcType=INTEGER}, #{inspectionItemId,jdbcType=INTEGER},
+      #{updatedate,jdbcType=TIMESTAMP}, #{qcQualityInspectionId,jdbcType=INTEGER}, #{inspectionItemId,jdbcType=INTEGER}, 
       #{inspectionValue,jdbcType=VARCHAR}, #{singleConclusion,jdbcType=VARCHAR}, #{inspectionMethod,jdbcType=VARCHAR}
       )
   </insert>
@@ -133,9 +132,6 @@
       <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>
@@ -203,9 +199,6 @@
       <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>
@@ -230,7 +223,6 @@
       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},
@@ -254,9 +246,6 @@
       <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>
@@ -278,7 +267,6 @@
       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

@@ -842,7 +842,8 @@
     FROM
         basic_enum
     WHERE
-        parentId = #{parentId}
+        enumId = #{parentId}
+    OR parentId = #{parentId}
     AND delFlag = 1
   </select>
 </mapper>

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

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