删除实验室硬件标识字段

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/LabSubject.java

@@ -240,11 +240,6 @@ public class LabSubject extends BaseEntity implements QCInterface {
      */
     private String details;
 
-    /***
-     * 关联的硬件 1海康 2电子信息牌
-     */
-    private Integer hardwareType;
-
     private List<Long> deptIds;
 
     /**
@@ -632,12 +627,4 @@ public class LabSubject extends BaseEntity implements QCInterface {
     public void setClassifyList(List<XxpClassify> classifyList) {
         this.classifyList = classifyList;
     }
-
-    public Integer getHardwareType() {
-        return hardwareType;
-    }
-
-    public void setHardwareType(Integer hardwareType) {
-        this.hardwareType = hardwareType;
-    }
 }

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabSubjectMapper.xml

@@ -32,7 +32,6 @@
         <result property="inspectCheckCount" column="inspect_check_count"/>
         <result property="inspectSignTime" column="inspect_sign_time"/>
         <result property="details" column="details"/>
-        <result property="hardwareType" column="hardware_type"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabSubjectVO" id="LabSubjectResultVO">
@@ -82,7 +81,6 @@
         <result property="inspectCheckCount" column="inspect_check_count"/>
         <result property="inspectSignTime" column="inspect_sign_time"/>
         <result property="details" column="details"/>
-        <result property="hardwareType" column="hardware_type"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabSubjectDetailVO" id="subjectAndInfoResult">
@@ -125,7 +123,6 @@
         <result property="inspectCheckCount" column="inspect_check_count"/>
         <result property="inspectSignTime" column="inspect_sign_time"/>
         <result property="details" column="details"/>
-        <result property="hardwareType" column="hardware_type"/>
 
         <collection property="hazardSubjectRelations" column="id"
                     ofType="com.zd.laboratory.domain.LabHazardSubjectRelation"
@@ -174,7 +171,6 @@
                inspect_check_count,
                inspect_sign_time,
                details,
-               hardware_type,
                (SELECT GROUP_CONCAT(ur.nick_name)
                 FROM sys_user ur
                 WHERE ur.`user_id`
@@ -260,7 +256,6 @@
                t.inspect_check_count,
                t.inspect_sign_time,
                t.details,
-               t.hardware_type,
                (select i.id from xxp_card_info i where i.subJect_id=t.id LIMIT 1)         xxpCardInfoId,
                CONCAT(su.nick_name, '@', su.phonenumber)                      AS          adminNameAndPhone,
 
@@ -316,8 +311,7 @@
                t.inspect_skipped,
                t.inspect_check_count,
                t.inspect_sign_time,
-               t.details,
-               t.hardware_type
+               t.details
         from lab_subject t
                  left join sys_user su on su.user_id = t.admin_id
                  left join sys_dept sd on sd.dept_id = t.dept_id
@@ -467,8 +461,7 @@
         t.inspect_skipped,
         t.inspect_check_count,
         t.inspect_sign_time,
-        t.details,
-        t.hardware_type
+        t.details
         from lab_subject t
         left join sys_user su on su.user_id = t.admin_id AND su.`del_flag`=0
         left join sys_dept sd on sd.dept_id = t.dept_id
@@ -591,7 +584,6 @@
             <if test="inspectCheckCount != null">inspect_check_count,</if>
             <if test="inspectSignTime != null">inspect_sign_time,</if>
             <if test="details != null">details,</if>
-            <if test="hardwareType != null">hardware_type,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -632,7 +624,6 @@
             <if test="inspectCheckCount != null">#{inspectCheckCount},</if>
             <if test="inspectSignTime != null">#{inspectSignTime},</if>
             <if test="details != null">#{details},</if>
-            <if test="hardwareType != null">#{hardwareType},</if>
         </trim>
     </insert>
 
@@ -677,7 +668,6 @@
             <if test="inspectCheckCount != null">inspect_check_count = #{inspectCheckCount},</if>
             <if test="inspectSignTime != null">inspect_sign_time = #{inspectSignTime},</if>
             <if test="details != null">details = #{details},</if>
-            <if test="hardwareType != null">hardware_type = #{hardwareType},</if>
         </trim>
         where id = #{id}
     </update>