Merge branch 'dev' of http://192.168.1.43:3000/v2/zd-parents into dev

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/AlarmRecordMapper.xml

@@ -3,14 +3,14 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zd.airbottle.mapper.AlarmRecordMapper">
-    
+
     <resultMap type="com.zd.airbottle.domain.AlarmRecord" id="AlarmRecordResult">
-        <result property="id"    column="id"    />
-        <result property="masterId"    column="master_id"    />
-        <result property="electronicTag"    column="electronic_tag"    />
-        <result property="type"    column="type"    />
-        <result property="productType"    column="product_type"    />
-        <result property="alarmTime"    column="alarm_time"    />
+        <result property="id" column="id"/>
+        <result property="masterId" column="master_id"/>
+        <result property="electronicTag" column="electronic_tag"/>
+        <result property="type" column="type"/>
+        <result property="productType" column="product_type"/>
+        <result property="alarmTime" column="alarm_time"/>
     </resultMap>
 
     <sql id="selectAlarmRecordVo">
@@ -63,22 +63,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertAlarmRecord" parameterType="com.zd.airbottle.domain.AlarmRecord" useGeneratedKeys="true" keyProperty="id">
         insert into qp_alarm_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="masterId != null">master_id,</if>
-    <if test="electronicTag != null">electronic_tag,</if>
-
-    <if test="type != null">type,</if>
-
-    <if test="productType != null">product_type,</if>
-
-    <if test="alarmTime != null">alarm_time,</if>
-
+            <if test="masterId != null">master_id,</if>
+            <if test="electronicTag != null">electronic_tag,</if>
+            <if test="type != null">type,</if>
+            <if test="productType != null">product_type,</if>
+            <if test="alarmTime != null">alarm_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="masterId != null">#{masterId},</if>
-    <if test="electronicTag != null">#{electronicTag},</if>
-    <if test="type != null">#{type},</if>
-    <if test="productType != null">#{productType},</if>
-    <if test="alarmTime != null">#{alarmTime},</if>
+            <if test="masterId != null">#{masterId},</if>
+            <if test="electronicTag != null">#{electronicTag},</if>
+            <if test="type != null">#{type},</if>
+            <if test="productType != null">#{productType},</if>
+            <if test="alarmTime != null">#{alarmTime},</if>
          </trim>
     </insert>
 

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpAirBottleConfigMapper.xml

@@ -14,10 +14,12 @@
         select id, bottle_id, config_id
         from qp_air_bottle_config
     </sql>
+
     <sql id="selectQpAirBottleConfigListVo">
         select t.id, t.bottle_id, t.config_id
         from qp_air_bottle_config as t
     </sql>
+
     <select id="selectQpAirBottleConfigList" parameterType="com.zd.airbottle.domain.QpAirBottleConfig"
             resultMap="QpAirBottleConfigResult">
         <include refid="selectQpAirBottleConfigVo"/>
@@ -31,6 +33,7 @@
         <include refid="selectQpAirBottleConfigVo"/>
         where id = #{id}
     </select>
+
     <select id="getByBottleIds" resultType="com.zd.airbottle.domain.QpAirBottleConfig">
         <include refid="selectQpAirBottleConfigVo"/>
         where bottle_id in
@@ -38,10 +41,12 @@
             #{id}
         </foreach>
     </select>
+
     <select id="getByBottleId" resultType="com.zd.airbottle.domain.QpAirBottleConfig" parameterType="java.lang.Long">
         <include refid="selectQpAirBottleConfigVo"/>
         where bottle_id = #{bottleId}
     </select>
+
     <select id="getByIds" resultType="com.zd.airbottle.domain.QpAirBottleConfig">
         <include refid="selectQpAirBottleConfigVo"/>
         <where>
@@ -58,11 +63,8 @@
             useGeneratedKeys="true" keyProperty="id">
         insert into qp_air_bottle_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
-
             <if test="bottleId != null">bottle_id,</if>
-
             <if test="configId != null">config_id,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="bottleId != null">#{bottleId},</if>

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpAirBottleMapper.xml

@@ -82,23 +82,14 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="airName != null">air_name,</if>
             <if test="configId != null">config_id,</if>
-
             <if test="airConstituents != null">air_constituents,</if>
-
             <if test="supplierId != null">supplier_id,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="centerAuditStatus != null">center_audit_status,</if>
-
             <if test="centerAuditUserid != null">center_audit_userid,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpAirGoodsConfigMapper.xml

@@ -20,10 +20,12 @@
         select id, goods_id, config_id, min_value,name,detail
         from qp_air_goods_config
     </sql>
+
     <sql id="selectQpAirGoodsConfigListVo">
         select t.id, t.goods_id, t.config_id, t.min_value,name,detail
         from qp_air_goods_config as t
     </sql>
+
     <select id="selectQpAirGoodsConfigList" parameterType="com.zd.airbottle.domain.QpAirGoodsConfig"
             resultMap="QpAirGoodsConfigResult">
         <include refid="selectQpAirGoodsConfigVo"/>
@@ -40,6 +42,7 @@
         <include refid="selectQpAirGoodsConfigVo"/>
         where id = #{id}
     </select>
+
     <select id="getListByGoogsIds" resultType="com.zd.airbottle.domain.QpAirGoodsConfig">
         <include refid="selectQpAirGoodsConfigVo"/>
         where goods_id in
@@ -52,15 +55,11 @@
             keyProperty="id">
         insert into qp_air_goods_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
-
             <if test="goodsId != null">goods_id,</if>
-
             <if test="configId != null">config_id,</if>
-
             <if test="minValue != null">min_value,</if>
             <if test="name != null">`name`,</if>
             <if test="detail != null">detail,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="goodsId != null">#{goodsId},</if>
@@ -95,6 +94,7 @@
             #{id}
         </foreach>
     </delete>
+
     <delete id="deleteByGoogsIds">
         delete from qp_air_goods_config where goods_id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
@@ -133,6 +133,7 @@
         <if test="specValue != null">  and agc.name like  concat('%', #{specValue}, '%') </if>
         <if test="deptId != null"> and FIND_IN_SET(su.dept_id,#{deptId})</if>
     </select>
+
     <select id="getByIds" resultType="com.zd.airbottle.domain.QpAirGoodsConfig">
         <include refid="selectQpAirGoodsConfigVo"/>
         where id in

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpAirGoogsMapper.xml

@@ -79,23 +79,14 @@
         insert into qp_air_googs
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="goodsName != null">goods_name,</if>
-
             <if test="typeId != null">type_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="createTime != null">create_time,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="goodsName != null">#{goodsName},</if>

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpBottleStorageErrorMapper.xml

@@ -81,17 +81,11 @@
             <if test="storageId != null">storage_id,</if>
             <if test="locationId != null">location_id,</if>
             <if test="location != null">location,</if>
-
             <if test="beforeEdit != null">before_edit,</if>
-
             <if test="afterEdit != null">after_edit,</if>
-
             <if test="opTime != null">op_time,</if>
-
             <if test="phone != null">phone,</if>
-
             <if test="createBy != null">create_by,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="storageId != null">#{storageId},</if>

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpBottleStorageMapper.xml

@@ -314,75 +314,40 @@
         insert into qp_bottle_storage
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="driverName != null">driver_name,</if>
-
             <if test="driverId != null">driver_id,</if>
-
             <if test="carCodeId != null">car_code_id,</if>
-
             <if test="carCode != null">car_code,</if>
-
             <if test="phone != null">phone,</if>
-
             <if test="color != null">color,</if>
-
             <if test="isHandwheel != null">is_handwheel,</if>
-
             <if test="isFixed != null">is_fixed,</if>
-
             <if test="isElectronicTag != null">is_electronic_tag,</if>
-
             <if test="isStatusSign != null">is_status_sign,</if>
-
             <if test="isPhoto != null">is_photo,</if>
-
             <if test="gasPressure != null">gas_pressure,</if>
-
             <if test="validateStartTime != null">validate_start_time,</if>
-
             <if test="validateEndTime != null">validate_end_time,</if>
-
             <if test="electronicTag != null">electronic_tag,</if>
-
             <if test="isSurplus != null">is_surplus,</if>
-
             <if test="currentPressure != null">current_pressure,</if>
-
             <if test="airNumber != null">air_number,</if>
-
             <if test="validateRemark != null">validate_remark,</if>
-
             <if test="rejectionApplyImg != null">rejection_apply_img,</if>
-
             <if test="rejectionApplyRemark != null">rejection_apply_remark,</if>
-
             <if test="rejectionApplyUserid != null">rejection_apply_userid,</if>
-
             <if test="rejectionApplyTime != null">rejection_apply_time,</if>
-
             <if test="rejectionUserid != null">rejection_userid,</if>
-
             <if test="rejectionTime != null">rejection_time,</if>
-
             <if test="taskDetailId != null">task_detail_id,</if>
-
             <if test="storageStatus != null">storage_status,</if>
-
             <if test="airStatus != null">air_status,</if>
-
             <if test="taskId != null">task_id,</if>
-
             <if test="storageUserid != null">storage_userid,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="airBottleId != null">air_bottle_id,</if>
-
             <if test="airBottleName != null">air_bottle_name,</if>
-
             <if test="specificationName != null">specification_name,</if>
-
             <if test="airBottleConfigId != null">air_bottle_config_id,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="driverName != null">#{driverName},</if>

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpBottleStorageOutMapper.xml

@@ -5,24 +5,24 @@
 <mapper namespace="com.zd.airbottle.mapper.QpBottleStorageOutMapper">
 
     <resultMap type="com.zd.airbottle.domain.vo.QpBottleStorageOutVO" id="QpBottleStorageOutResult">
-        <result property="id"    column="id"    />
-        <result property="applyUserName"    column="apply_user_name"    />
-        <result property="applyUserid"    column="apply_userid"    />
-        <result property="phone"    column="phone"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="storageId"    column="storage_id"    />
-        <result property="carId"    column="car_id"    />
-        <result property="carNumber"    column="car_number"    />
-        <result property="transportId"    column="transport_id"    />
-        <result property="transportName"    column="transport_name"    />
-        <result property="disposeUserid"    column="dispose_userid"    />
-        <result property="disposeUsername"    column="dispose_username"    />
-        <result property="disposeTime"    column="dispose_time"    />
-        <result property="completeTime"    column="complete_time"    />
-        <result property="completeUserid"    column="complete_userid"    />
-        <result property="completeUsername"    column="complete_username"    />
-        <result property="pressure"    column="pressure"    />
-        <result property="outStatus"    column="out_status"    />
+        <result property="id" column="id"/>
+        <result property="applyUserName" column="apply_user_name"/>
+        <result property="applyUserid" column="apply_userid"/>
+        <result property="phone" column="phone"/>
+        <result property="createTime" column="create_time"/>
+        <result property="storageId" column="storage_id"/>
+        <result property="carId" column="car_id"/>
+        <result property="carNumber" column="car_number"/>
+        <result property="transportId" column="transport_id"/>
+        <result property="transportName" column="transport_name"/>
+        <result property="disposeUserid" column="dispose_userid"/>
+        <result property="disposeUsername" column="dispose_username"/>
+        <result property="disposeTime" column="dispose_time"/>
+        <result property="completeTime" column="complete_time"/>
+        <result property="completeUserid" column="complete_userid"/>
+        <result property="completeUsername" column="complete_username"/>
+        <result property="pressure" column="pressure"/>
+        <result property="outStatus" column="out_status"/>
     </resultMap>
 
     <sql id="selectQpBottleStorageOutVo">
@@ -88,39 +88,22 @@
         insert into qp_bottle_storage_out
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="applyUserName != null">apply_user_name,</if>
-
             <if test="applyUserid != null">apply_userid,</if>
-
             <if test="phone != null">phone,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="storageId != null">storage_id,</if>
-
             <if test="carId != null">car_id,</if>
-
             <if test="carNumber != null">car_number,</if>
-
             <if test="transportId != null">transport_id,</if>
-
             <if test="transportName != null">transport_name,</if>
-
             <if test="disposeUserid != null">dispose_userid,</if>
-
             <if test="disposeUsername != null">dispose_username,</if>
-
             <if test="disposeTime != null">dispose_time,</if>
-
             <if test="completeTime != null">complete_time,</if>
-
             <if test="completeUserid != null">complete_userid,</if>
-
             <if test="completeUsername != null">complete_username,</if>
-
             <if test="pressure != null">pressure,</if>
-
             <if test="outStatus != null">out_status,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="applyUserName != null">#{applyUserName},</if>
@@ -197,6 +180,4 @@
                ) t
              ) t2
     </select>
-
-
 </mapper>

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpFlowDetailMapper.xml

@@ -97,24 +97,15 @@
         insert into qp_flow_detail
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="uuid != null">uuid,</if>
-
             <if test="userNumber != null">user_number,</if>
             <if test="flowType != null">flow_type,</if>
-
             <if test="userType != null">user_type,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="userName != null">user_name,</if>
-
             <if test="userTelephone != null">user_telephone,</if>
-
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="createTime != null">create_time,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="uuid != null">#{uuid},</if>

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpFlowMapper.xml

@@ -5,16 +5,16 @@
 <mapper namespace="com.zd.airbottle.mapper.QpFlowMapper">
 
     <resultMap type="com.zd.airbottle.domain.QpFlow" id="QpFlowResult">
-        <result property="id"    column="id"    />
-        <result property="flowName"    column="flow_name"    />
-        <result property="flowType"    column="flow_type"    />
-        <result property="uuid"    column="uuid"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="remark"    column="remark"    />
-        <result property="createUserid"    column="create_userid"    />
-        <result property="createUser"    column="create_user"    />
-        <result property="createTime"    column="create_time"    />
+        <result property="id" column="id"/>
+        <result property="flowName" column="flow_name"/>
+        <result property="flowType" column="flow_type"/>
+        <result property="uuid" column="uuid"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="remark" column="remark"/>
+        <result property="createUserid" column="create_userid"/>
+        <result property="createUser" column="create_user"/>
+        <result property="createTime" column="create_time"/>
     </resultMap>
 
     <sql id="selectQpFlowVo">
@@ -53,23 +53,14 @@
         insert into qp_flow
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="flowName != null">flow_name,</if>
-
             <if test="flowType != null">flow_type,</if>
-
             <if test="uuid != null">uuid,</if>
-
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="remark != null">remark,</if>
-
             <if test="createUserid != null">create_userid,</if>
-
             <if test="createUser != null">create_user,</if>
-
             <if test="createTime != null">create_time,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="flowName != null">#{flowName},</if>

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpQualificationApplyDetailMapper.xml

@@ -3,13 +3,13 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zd.airbottle.mapper.QpQualificationApplyDetailMapper">
-    
+
     <resultMap type="com.zd.airbottle.domain.vo.QpQualificationApplyDetailVO" id="QpQualificationApplyDetailResult">
-        <result property="id"    column="id"    />
-        <result property="airBottleConfigId"    column="air_bottle_config_id"    />
-        <result property="qualificateApplyId"    column="qualificate_apply_id"    />
-        <result property="bottleNumber"    column="bottle_number"    />
-        <result property="applyDescribe"    column="apply_describe"    />
+        <result property="id" column="id"/>
+        <result property="airBottleConfigId" column="air_bottle_config_id"/>
+        <result property="qualificateApplyId" column="qualificate_apply_id"/>
+        <result property="bottleNumber" column="bottle_number"/>
+        <result property="applyDescribe" column="apply_describe"/>
     </resultMap>
 
     <resultMap type="com.zd.airbottle.domain.vo.QpAirGoodsConfigRelationVo" id="QpAirGoodsConfigRelationVo">
@@ -18,9 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectQpQualificationApplyDetailVo">
         select id, air_bottle_config_id, qualificate_apply_id, bottle_number,apply_describe from qp_qualification_apply_detail
     </sql>
+
     <sql id="selectQpQualificationApplyDetailListVo">
         select t.id, t.air_bottle_config_id, t.qualificate_apply_id, t.bottle_number, t.apply_describe from qp_qualification_apply_detail as t
     </sql>
+
     <select id="selectQpQualificationApplyDetailList" parameterType="com.zd.airbottle.domain.QpQualificationApplyDetail" resultMap="QpQualificationApplyDetailResult">
         <include refid="selectQpQualificationApplyDetailVo"/>
         <where>  
@@ -39,20 +41,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertQpQualificationApplyDetail" parameterType="com.zd.airbottle.domain.QpQualificationApplyDetail" useGeneratedKeys="true" keyProperty="id">
         insert into qp_qualification_apply_detail
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="airBottleConfigId != null">air_bottle_config_id,</if>
-
-    <if test="qualificateApplyId != null">qualificate_apply_id,</if>
-
-    <if test="bottleNumber != null">bottle_number,</if>
-
-     <if test="applyDescribe != null">apply_describe,</if>
-     </trim>
-     <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="airBottleConfigId != null">#{airBottleConfigId},</if>
-    <if test="qualificateApplyId != null">#{qualificateApplyId},</if>
-    <if test="bottleNumber != null">#{bottleNumber},</if>
-    <if test="applyDescribe != null">#{applyDescribe},</if>
-     </trim>
+            <if test="airBottleConfigId != null">air_bottle_config_id,</if>
+            <if test="qualificateApplyId != null">qualificate_apply_id,</if>
+            <if test="bottleNumber != null">bottle_number,</if>
+            <if test="applyDescribe != null">apply_describe,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="airBottleConfigId != null">#{airBottleConfigId},</if>
+            <if test="qualificateApplyId != null">#{qualificateApplyId},</if>
+            <if test="bottleNumber != null">#{bottleNumber},</if>
+            <if test="applyDescribe != null">#{applyDescribe},</if>
+        </trim>
     </insert>
 
     <update id="updateQpQualificationApplyDetail" parameterType="com.zd.airbottle.domain.QpQualificationApplyDetail">

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpQualificationApplyMapper.xml

@@ -5,59 +5,59 @@
 <mapper namespace="com.zd.airbottle.mapper.QpQualificationApplyMapper">
 
     <resultMap type="com.zd.airbottle.domain.QpQualificationApply" id="QpQualificationApplyResult">
-        <result property="id"    column="id"    />
-        <result property="subjectId"    column="subject_id"    />
-        <result property="location"    column="location"    />
-        <result property="userId"    column="user_id"    />
-        <result property="applyUser"    column="apply_user"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="phone"    column="phone"    />
-        <result property="startTime"    column="start_time"    />
-        <result property="endTime"    column="end_time"    />
-        <result property="gasUse"    column="gas_use"    />
-        <result property="applyCertificate"    column="apply_certificate"    />
-        <result property="safetyPrecautions"    column="safety_precautions"    />
-        <result property="useGasId"    column="use_gas_id"    />
-        <result property="leadAuditStatus"    column="lead_audit_status"    />
-        <result property="leadAuditUserid"    column="lead_audit_userid"    />
-        <result property="leadAuditUsername"    column="lead_audit_username"    />
-        <result property="leadAuditTime"    column="lead_audit_time"    />
-        <result property="leadAuditCause"    column="lead_audit_cause"    />
-        <result property="centerAuditStatus"    column="center_audit_status"    />
-        <result property="centerAuditUserid"    column="center_audit_userid"    />
-        <result property="centerAuditUsername"    column="center_audit_username"    />
-        <result property="centerAuditTime"    column="center_audit_time"    />
-        <result property="centerAuditCause"    column="center_audit_cause"    />
-        <result property="createTime"    column="create_time"    />
+        <result property="id" column="id"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="location" column="location"/>
+        <result property="userId" column="user_id"/>
+        <result property="applyUser" column="apply_user"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="phone" column="phone"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="gasUse" column="gas_use"/>
+        <result property="applyCertificate" column="apply_certificate"/>
+        <result property="safetyPrecautions" column="safety_precautions"/>
+        <result property="useGasId" column="use_gas_id"/>
+        <result property="leadAuditStatus" column="lead_audit_status"/>
+        <result property="leadAuditUserid" column="lead_audit_userid"/>
+        <result property="leadAuditUsername" column="lead_audit_username"/>
+        <result property="leadAuditTime" column="lead_audit_time"/>
+        <result property="leadAuditCause" column="lead_audit_cause"/>
+        <result property="centerAuditStatus" column="center_audit_status"/>
+        <result property="centerAuditUserid" column="center_audit_userid"/>
+        <result property="centerAuditUsername" column="center_audit_username"/>
+        <result property="centerAuditTime" column="center_audit_time"/>
+        <result property="centerAuditCause" column="center_audit_cause"/>
+        <result property="createTime" column="create_time"/>
     </resultMap>
 
     <resultMap type="com.zd.airbottle.domain.vo.QpQualificationApplyVO" id="QpQualificationApplyResultVO">
-        <result property="id"    column="id"    />
-        <result property="subjectId"    column="subject_id"    />
-        <result property="location"    column="location"    />
-        <result property="userId"    column="user_id"    />
-        <result property="applyUser"    column="apply_user"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="phone"    column="phone"    />
-        <result property="startTime"    column="start_time"    />
-        <result property="endTime"    column="end_time"    />
-        <result property="gasUse"    column="gas_use"    />
-        <result property="applyCertificate"    column="apply_certificate"    />
-        <result property="safetyPrecautions"    column="safety_precautions"    />
-        <result property="useGasId"    column="use_gas_id"    />
-        <result property="leadAuditStatus"    column="lead_audit_status"    />
-        <result property="leadAuditUserid"    column="lead_audit_userid"    />
-        <result property="leadAuditUsername"    column="lead_audit_username"    />
-        <result property="leadAuditTime"    column="lead_audit_time"    />
-        <result property="leadAuditCause"    column="lead_audit_cause"    />
-        <result property="centerAuditStatus"    column="center_audit_status"    />
-        <result property="centerAuditUserid"    column="center_audit_userid"    />
-        <result property="centerAuditUsername"    column="center_audit_username"    />
-        <result property="centerAuditTime"    column="center_audit_time"    />
-        <result property="centerAuditCause"    column="center_audit_cause"    />
-        <result property="createTime"    column="create_time"    />
+        <result property="id" column="id"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="location" column="location"/>
+        <result property="userId" column="user_id"/>
+        <result property="applyUser" column="apply_user"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="phone" column="phone"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="gasUse" column="gas_use"/>
+        <result property="applyCertificate" column="apply_certificate"/>
+        <result property="safetyPrecautions" column="safety_precautions"/>
+        <result property="useGasId" column="use_gas_id"/>
+        <result property="leadAuditStatus" column="lead_audit_status"/>
+        <result property="leadAuditUserid" column="lead_audit_userid"/>
+        <result property="leadAuditUsername" column="lead_audit_username"/>
+        <result property="leadAuditTime" column="lead_audit_time"/>
+        <result property="leadAuditCause" column="lead_audit_cause"/>
+        <result property="centerAuditStatus" column="center_audit_status"/>
+        <result property="centerAuditUserid" column="center_audit_userid"/>
+        <result property="centerAuditUsername" column="center_audit_username"/>
+        <result property="centerAuditTime" column="center_audit_time"/>
+        <result property="centerAuditCause" column="center_audit_cause"/>
+        <result property="createTime" column="create_time"/>
     </resultMap>
 
     <sql id="selectQpQualificationApplyVo">
@@ -140,53 +140,29 @@
         insert into qp_qualification_apply
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="subjectId != null">subject_id,</if>
-
             <if test="location != null">location,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="applyUser != null">apply_user,</if>
-
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="phone != null">phone,</if>
-
             <if test="startTime != null">start_time,</if>
-
             <if test="endTime != null">end_time,</if>
-
             <if test="gasUse != null">gas_use,</if>
-
             <if test="applyCertificate != null">apply_certificate,</if>
-
             <if test="safetyPrecautions != null">safety_precautions,</if>
-
             <if test="useGasId != null">use_gas_id,</if>
-
             <if test="leadAuditStatus != null">lead_audit_status,</if>
-
             <if test="leadAuditUserid != null">lead_audit_userid,</if>
-
             <if test="leadAuditUsername != null">lead_audit_username,</if>
-
             <if test="leadAuditTime != null">lead_audit_time,</if>
-
             <if test="leadAuditCause != null">lead_audit_cause,</if>
-
             <if test="centerAuditStatus != null">center_audit_status,</if>
-
             <if test="centerAuditUserid != null">center_audit_userid,</if>
-
             <if test="centerAuditUsername != null">center_audit_username,</if>
-
             <if test="centerAuditTime != null">center_audit_time,</if>
-
             <if test="centerAuditCause != null">center_audit_cause,</if>
-
             <if test="createTime != null">create_time,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="subjectId != null">#{subjectId},</if>
@@ -357,16 +333,6 @@
             <if test="applyCertificate != null">apply_certificate = #{applyCertificate},</if>
             <if test="safetyPrecautions != null">safety_precautions = #{safetyPrecautions},</if>
             <if test="useGasId != null">use_gas_id = #{useGasId},</if>
-           <!-- <if test="leadAuditStatus != null">lead_audit_status = #{leadAuditStatus},</if>-->
-            <!--<if test="leadAuditUserid != null">lead_audit_userid = #{leadAuditUserid},</if>-->
-            <!--<if test="leadAuditUsername != null">lead_audit_username = #{leadAuditUsername},</if>-->
-            <!--<if test="leadAuditTime != null">lead_audit_time = #{leadAuditTime},</if>-->
-            <!--<if test="leadAuditCause != null">lead_audit_cause = #{leadAuditCause},</if>-->
-            <!--<if test="centerAuditStatus != null">center_audit_status = #{centerAuditStatus},</if>-->
-            <!--<if test="centerAuditUserid != null">center_audit_userid = #{centerAuditUserid},</if>-->
-            <!--<if test="centerAuditUsername != null">center_audit_username = #{centerAuditUsername},</if>-->
-            <!--<if test="centerAuditTime != null">center_audit_time = #{centerAuditTime},</if>-->
-            <!--<if test="centerAuditCause != null">center_audit_cause = #{centerAuditCause},</if>-->
             <if test="createTime != null">create_time = #{createTime},</if>
             lead_audit_status=0, lead_audit_userid=null,lead_audit_username=null,lead_audit_time=null,lead_audit_cause=null,
             center_audit_status=0,center_audit_userid=null,center_audit_username=null,center_audit_time=null,center_audit_cause=NULL

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpQualificationApplyRecordMapper.xml

@@ -3,24 +3,26 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zd.airbottle.mapper.QpQualificationApplyRecordMapper">
-    
+
     <resultMap type="com.zd.airbottle.domain.QpQualificationApplyRecord" id="QpQualificationApplyRecordResult">
-        <result property="id"    column="id"    />
-        <result property="auditUser"    column="audit_user"    />
-        <result property="auditUserid"    column="audit_userid"    />
-        <result property="auditTime"    column="audit_time"    />
-        <result property="auditStatus"    column="audit_status"    />
-        <result property="remark"    column="remark"    />
-        <result property="qualificationApplyId"    column="qualification_apply_id"    />
-        <result property="auditType"    column="audit_type"    />
+        <result property="id" column="id"/>
+        <result property="auditUser" column="audit_user"/>
+        <result property="auditUserid" column="audit_userid"/>
+        <result property="auditTime" column="audit_time"/>
+        <result property="auditStatus" column="audit_status"/>
+        <result property="remark" column="remark"/>
+        <result property="qualificationApplyId" column="qualification_apply_id"/>
+        <result property="auditType" column="audit_type"/>
     </resultMap>
 
     <sql id="selectQpQualificationApplyRecordVo">
         select id, audit_user, audit_userid, audit_time, audit_status, remark, qualification_apply_id, audit_type from qp_qualification_apply_record
     </sql>
+
     <sql id="selectQpQualificationApplyRecordListVo">
         select t.id, t.audit_user, t.audit_userid, t.audit_time, t.audit_status, t.remark, t.qualification_apply_id, t.audit_type from qp_qualification_apply_record as t
     </sql>
+
     <select id="selectQpQualificationApplyRecordList" parameterType="com.zd.airbottle.domain.QpQualificationApplyRecord" resultMap="QpQualificationApplyRecordResult">
         <include refid="selectQpQualificationApplyRecordVo"/>
         <where>  
@@ -42,29 +44,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertQpQualificationApplyRecord" parameterType="com.zd.airbottle.domain.QpQualificationApplyRecord" useGeneratedKeys="true" keyProperty="id">
         insert into qp_qualification_apply_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="auditUser != null">audit_user,</if>
-
-    <if test="auditUserid != null">audit_userid,</if>
-
-    <if test="auditTime != null">audit_time,</if>
-
-    <if test="auditStatus != null">audit_status,</if>
-
-    <if test="remark != null">remark,</if>
-
-    <if test="qualificationApplyId != null">qualification_apply_id,</if>
-
-    <if test="auditType != null">audit_type,</if>
-
+            <if test="auditUser != null">audit_user,</if>
+            <if test="auditUserid != null">audit_userid,</if>
+            <if test="auditTime != null">audit_time,</if>
+            <if test="auditStatus != null">audit_status,</if>
+            <if test="remark != null">remark,</if>
+            <if test="qualificationApplyId != null">qualification_apply_id,</if>
+            <if test="auditType != null">audit_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="auditUser != null">#{auditUser},</if>
-    <if test="auditUserid != null">#{auditUserid},</if>
-    <if test="auditTime != null">#{auditTime},</if>
-    <if test="auditStatus != null">#{auditStatus},</if>
-    <if test="remark != null">#{remark},</if>
-    <if test="qualificationApplyId != null">#{qualificationApplyId},</if>
-    <if test="auditType != null">#{auditType},</if>
+            <if test="auditUser != null">#{auditUser},</if>
+            <if test="auditUserid != null">#{auditUserid},</if>
+            <if test="auditTime != null">#{auditTime},</if>
+            <if test="auditStatus != null">#{auditStatus},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="qualificationApplyId != null">#{qualificationApplyId},</if>
+            <if test="auditType != null">#{auditType},</if>
          </trim>
     </insert>
 

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpQualificationCertificateMapper.xml

@@ -77,17 +77,11 @@
         insert into qp_qualification_certificate
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="name != null">name,</if>
-
             <if test="supplierType != null">supplier_type,</if>
-
             <if test="type != null">type,</if>
-
             <if test="sort != null">sort,</if>
-
             <if test="required != null">required,</if>
-
             <if test="validity != null">validity,</if>
-
             <if test="remark != null">remark,</if>
             <if test="createBy != null">create_by,</if>
             <if test="userId != null">user_id,</if>

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpRfidTagMapper.xml

@@ -52,11 +52,8 @@
         insert into qp_rfid_tag
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="tagCode != null">tag_code,</if>
-
             <if test="isBind != null">is_bind,</if>
-
             <if test="createTime != null">create_time,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="tagCode != null">#{tagCode},</if>

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpSpecificationDetailMapper.xml

@@ -53,9 +53,7 @@
         insert into qp_specification_detail
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="specValue != null">spec_value,</if>
-
             <if test="specId != null">spec_id,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="specValue != null">#{specValue},</if>

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpSpecificationMapper.xml

@@ -63,19 +63,12 @@
         insert into qp_specification
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="specName != null">spec_name,</if>
-
             <if test="category != null">category,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="createTime != null">create_time,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="specName != null">#{specName},</if>

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpSupplierCredentialsMapper.xml

@@ -53,17 +53,11 @@
         insert into qp_supplier_credentials
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="certificateId != null">certificate_id,</if>
-
             <if test="naturalName != null">natural_name,</if>
-
             <if test="naturalUrl != null">natural_url,</if>
-
             <if test="startTime != null">start_time,</if>
-
             <if test="endTime != null">end_time,</if>
-
             <if test="supplierId != null">supplier_id,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="certificateId != null">#{certificateId},</if>

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpSupplierSyntheticalAuditMapper.xml

@@ -92,19 +92,12 @@
         insert into qp_supplier_synthetical_audit
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="auditUser != null">audit_user,</if>
-
             <if test="auditContent != null">audit_content,</if>
-
             <if test="auditType != null">audit_type,</if>
-
             <if test="auditTime != null">audit_time,</if>
-
             <if test="status != null">`status`,</if>
-
             <if test="remark != null">remark,</if>
-
             <if test="syntheticalId != null">synthetical_id,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="auditUser != null">#{auditUser},</if>

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpTaskDetailMapper.xml

@@ -5,54 +5,55 @@
 <mapper namespace="com.zd.airbottle.mapper.QpTaskDetailMapper">
 
     <resultMap type="com.zd.airbottle.domain.QpTaskDetail" id="QpTaskDetailResult">
-        <result property="id"    column="id"    />
-        <result property="airBottleConfigId"    column="air_bottle_matter_id"    />
-        <result property="taskId"    column="task_id"    />
-        <result property="bottleNumber"    column="bottle_number"    />
-        <result property="qpStatus"    column="qp_status"    />
-        <result property="applyDescribe"    column="apply_describe"    />
-        <result property="supplierId"    column="supplier_id"    />
-        <result property="carId"    column="car_id"    />
-        <result property="carNumber"    column="car_number"    />
-        <result property="transportId"    column="transport_id"    />
-        <result property="transportName"    column="transport_name"    />
-        <result property="isDispose"    column="is_dispose"    />
-        <result property="disposeUser"    column="dispose_user"    />
-        <result property="disposeUserid"    column="dispose_userid"    />
-        <result property="disposeTime"    column="dispose_time"    />
-        <result property="createTime"    column="create_time"    />
+        <result property="id" column="id"/>
+        <result property="airBottleConfigId" column="air_bottle_matter_id"/>
+        <result property="taskId" column="task_id"/>
+        <result property="bottleNumber" column="bottle_number"/>
+        <result property="qpStatus" column="qp_status"/>
+        <result property="applyDescribe" column="apply_describe"/>
+        <result property="supplierId" column="supplier_id"/>
+        <result property="carId" column="car_id"/>
+        <result property="carNumber" column="car_number"/>
+        <result property="transportId" column="transport_id"/>
+        <result property="transportName" column="transport_name"/>
+        <result property="isDispose" column="is_dispose"/>
+        <result property="disposeUser" column="dispose_user"/>
+        <result property="disposeUserid" column="dispose_userid"/>
+        <result property="disposeTime" column="dispose_time"/>
+        <result property="createTime" column="create_time"/>
     </resultMap>
 
     <resultMap type="com.zd.airbottle.domain.vo.QpTaskDetailVO" id="QpTaskDetailResultVO">
-        <result property="id"    column="id"    />
-        <result property="airBottleConfigId"    column="air_bottle_matter_id"    />
-        <result property="taskId"    column="task_id"    />
-        <result property="bottleNumber"    column="bottle_number"    />
-        <result property="qpStatus"    column="qp_status"    />
-        <result property="applyDescribe"    column="apply_describe"    />
-        <result property="supplierId"    column="supplier_id"    />
-        <result property="carId"    column="car_id"    />
-        <result property="carNumber"    column="car_number"    />
-        <result property="transportId"    column="transport_id"    />
-        <result property="transportName"    column="transport_name"    />
-        <result property="isDispose"    column="is_dispose"    />
-        <result property="disposeUser"    column="dispose_user"    />
-        <result property="disposeUserid"    column="dispose_userid"    />
-        <result property="disposeTime"    column="dispose_time"    />
-        <result property="createTime"    column="create_time"    />
+        <result property="id" column="id"/>
+        <result property="airBottleConfigId" column="air_bottle_matter_id"/>
+        <result property="taskId" column="task_id"/>
+        <result property="bottleNumber" column="bottle_number"/>
+        <result property="qpStatus" column="qp_status"/>
+        <result property="applyDescribe" column="apply_describe"/>
+        <result property="supplierId" column="supplier_id"/>
+        <result property="carId" column="car_id"/>
+        <result property="carNumber" column="car_number"/>
+        <result property="transportId" column="transport_id"/>
+        <result property="transportName" column="transport_name"/>
+        <result property="isDispose" column="is_dispose"/>
+        <result property="disposeUser" column="dispose_user"/>
+        <result property="disposeUserid" column="dispose_userid"/>
+        <result property="disposeTime" column="dispose_time"/>
+        <result property="createTime" column="create_time"/>
     </resultMap>
 
     <resultMap type="com.zd.airbottle.domain.vo.QpAirGoodsConfigRelationVo" id="QpAirGoodsConfigRelationVo">
-
     </resultMap>
 
 
     <sql id="selectQpTaskDetailVo">
         select id, air_bottle_config_id, task_id, bottle_number, qp_status, apply_describe, supplier_id, car_id, car_number, transport_id, transport_name, is_dispose, dispose_user, dispose_userid, dispose_time, create_time from qp_task_detail
     </sql>
+
     <sql id="selectQpTaskDetailListVo">
         select t.id, t.air_bottle_config_id, t.task_id, t.bottle_number, t.qp_status, t.apply_describe, t.supplier_id, t.car_id, t.car_number, t.transport_id, t.transport_name, t.is_dispose, t.dispose_user, t.dispose_userid, t.dispose_time, t.create_time from qp_task_detail as t
     </sql>
+
     <select id="selectQpTaskDetailList" parameterType="com.zd.airbottle.domain.QpTaskDetail" resultMap="QpTaskDetailResult">
         <include refid="selectQpTaskDetailVo"/>
         <where>
@@ -109,35 +110,20 @@
         insert into qp_task_detail
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="airBottleConfigId != null">air_bottle_config_id,</if>
-
             <if test="taskId != null">task_id,</if>
-
             <if test="bottleNumber != null">bottle_number,</if>
-
             <if test="qpStatus != null">qp_status,</if>
-
             <if test="applyDescribe != null">apply_describe,</if>
-
             <if test="supplierId != null">supplier_id,</if>
-
             <if test="carId != null">car_id,</if>
-
             <if test="carNumber != null">car_number,</if>
-
             <if test="transportId != null">transport_id,</if>
-
             <if test="transportName != null">transport_name,</if>
-
             <if test="isDispose != null">is_dispose,</if>
-
             <if test="disposeUser != null">dispose_user,</if>
-
             <if test="disposeUserid != null">dispose_userid,</if>
-
             <if test="disposeTime != null">dispose_time,</if>
-
             <if test="createTime != null">create_time,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="airBottleConfigId != null">#{airBottleConfigId},</if>

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpTaskMapper.xml

@@ -126,25 +126,15 @@
     <insert id="insertQpTask" parameterType="com.zd.airbottle.domain.QpTask" useGeneratedKeys="true" keyProperty="id">
         insert into qp_task
         <trim prefix="(" suffix=")" suffixOverrides=",">
-
             <if test="location != null">location,</if>
-
             <if test="locationId != null">location_id,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="userName != null">user_name,</if>
-
             <if test="phone != null">phone,</if>
-
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="type != null">type,</if>
-
             <if test="createTime != null">create_time,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="location != null">#{location},</if>

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpTransportCarCredentialsMapper.xml

@@ -60,17 +60,11 @@
         insert into qp_transport_car_credentials
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="certificateId != null">certificate_id,</if>
-
             <if test="naturalName != null">natural_name,</if>
-
             <if test="naturalUrl != null">natural_url,</if>
-
             <if test="startTime != null">start_time,</if>
-
             <if test="endTime != null">end_time,</if>
-
             <if test="transportCarId != null">transport_car_id,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="certificateId != null">#{certificateId},</if>

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpTransportCarMapper.xml

@@ -111,27 +111,16 @@
         insert into qp_transport_car
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="carCode != null">car_code,</if>
-
             <if test="driverRemark != null">driver_remark,</if>
-
             <if test="isAudit != null">is_audit,</if>
-
             <if test="auditUser != null">audit_user,</if>
-
             <if test="auditTime != null">audit_time,</if>
-
             <if test="supplierId != null">supplier_id,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="updateBy != null">update_by,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="carCode != null">#{carCode},</if>

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpTransportUserCredentialsMapper.xml

@@ -58,17 +58,11 @@
         insert into qp_transport_user_credentials
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="certificateId != null">certificate_id,</if>
-
             <if test="naturalName != null">natural_name,</if>
-
             <if test="naturalUrl != null">natural_url,</if>
-
             <if test="startTime != null">start_time,</if>
-
             <if test="endTime != null">end_time,</if>
-
             <if test="transportUserId != null">transport_user_id,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="certificateId != null">#{certificateId},</if>

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpTransportUserMapper.xml

@@ -117,29 +117,17 @@
         insert into qp_transport_user
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="userName != null">user_name,</if>
-
             <if test="phone != null">phone,</if>
-
             <if test="remark != null">remark,</if>
-
             <if test="isAudit != null">is_audit,</if>
-
             <if test="auditUser != null">audit_user,</if>
-
             <if test="auditTime != null">audit_time,</if>
-
             <if test="supplierId != null">supplier_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="createTime != null">create_time,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userName != null">#{userName},</if>

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpUseRecordMapper.xml

@@ -176,37 +176,21 @@
         insert into qp_use_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="contacts != null">contacts,</if>
-
             <if test="phone != null">phone,</if>
-
             <if test="location != null">location,</if>
-
             <if test="storageId != null">storage_id,</if>
-
             <if test="beforeUsePic != null">before_use_pic,</if>
-
             <if test="beforeUse != null">before_use,</if>
-
             <if test="afterUsePic != null">after_use_pic,</if>
-
             <if test="afterUse != null">after_use,</if>
-
             <if test="amount != null">amount,</if>
-
             <if test="useTime != null">use_time,</if>
-
             <if test="backTime != null">back_time,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="subjectId != null">subject_id,</if>
-
             <if test="userId != null">user_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpUsegasApplyMapper.xml

@@ -5,32 +5,32 @@
 <mapper namespace="com.zd.airbottle.mapper.QpUsegasApplyMapper">
 
     <resultMap type="com.zd.airbottle.domain.vo.QpUsegasApplyVO" id="QpUsegasApplyResult">
-        <result property="id"    column="id"    />
-        <result property="location"    column="location"    />
-        <result property="subjectId"    column="subject_id"    />
-        <result property="applyUser"    column="apply_user"    />
-        <result property="userId"    column="user_id"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="phone"    column="phone"    />
-        <result property="startTime"    column="start_time"    />
-        <result property="endTime"    column="end_time"    />
-        <result property="gasUse"    column="gas_use"    />
-        <result property="applyCertificate"    column="apply_certificate"    />
-        <result property="safetyPrecautions"    column="safety_precautions"    />
-        <result property="useGasId"    column="use_gas_id"    />
-        <result property="useGasName"    column="use_gas_name"    />
-        <result property="leadAuditStaus"    column="lead_audit_staus"    />
-        <result property="leadAuditUserid"    column="lead_audit_userid"    />
-        <result property="leadAuditUsername"    column="lead_audit_username"    />
-        <result property="leadAuditTime"    column="lead_audit_time"    />
-        <result property="leadAuditCause"    column="lead_audit_cause"    />
-        <result property="centerAuditStatus"    column="center_audit_status"    />
-        <result property="centerAuditUserid"    column="center_audit_userid"    />
-        <result property="centerAuditUsername"    column="center_audit_username"    />
-        <result property="centerAuditTime"    column="center_audit_time"    />
-        <result property="centerAuditCause"    column="center_audit_cause"    />
-        <result property="createTime"    column="create_time"    />
+        <result property="id" column="id"/>
+        <result property="location" column="location"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="applyUser" column="apply_user"/>
+        <result property="userId" column="user_id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="phone" column="phone"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="gasUse" column="gas_use"/>
+        <result property="applyCertificate" column="apply_certificate"/>
+        <result property="safetyPrecautions" column="safety_precautions"/>
+        <result property="useGasId" column="use_gas_id"/>
+        <result property="useGasName" column="use_gas_name"/>
+        <result property="leadAuditStaus" column="lead_audit_staus"/>
+        <result property="leadAuditUserid" column="lead_audit_userid"/>
+        <result property="leadAuditUsername" column="lead_audit_username"/>
+        <result property="leadAuditTime" column="lead_audit_time"/>
+        <result property="leadAuditCause" column="lead_audit_cause"/>
+        <result property="centerAuditStatus" column="center_audit_status"/>
+        <result property="centerAuditUserid" column="center_audit_userid"/>
+        <result property="centerAuditUsername" column="center_audit_username"/>
+        <result property="centerAuditTime" column="center_audit_time"/>
+        <result property="centerAuditCause" column="center_audit_cause"/>
+        <result property="createTime" column="create_time"/>
     </resultMap>
 
     <sql id="selectQpUsegasApplyVo">
@@ -107,55 +107,30 @@
         insert into qp_usegas_apply
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="location != null">location,</if>
-
             <if test="subjectId != null">subject_id,</if>
-
             <if test="applyUser != null">apply_user,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="phone != null">phone,</if>
-
             <if test="startTime != null">start_time,</if>
-
             <if test="endTime != null">end_time,</if>
-
             <if test="gasUse != null">gas_use,</if>
-
             <if test="applyCertificate != null">apply_certificate,</if>
-
             <if test="safetyPrecautions != null">safety_precautions,</if>
-
             <if test="useGasId != null">use_gas_id,</if>
-
             <if test="useGasName != null">use_gas_name,</if>
-
             <if test="leadAuditStaus != null">lead_audit_staus,</if>
-
             <if test="leadAuditUserid != null">lead_audit_userid,</if>
-
             <if test="leadAuditUsername != null">lead_audit_username,</if>
-
             <if test="leadAuditTime != null">lead_audit_time,</if>
-
             <if test="leadAuditCause != null">lead_audit_cause,</if>
-
             <if test="centerAuditStatus != null">center_audit_status,</if>
-
             <if test="centerAuditUserid != null">center_audit_userid,</if>
-
             <if test="centerAuditUsername != null">center_audit_username,</if>
-
             <if test="centerAuditTime != null">center_audit_time,</if>
-
             <if test="centerAuditCause != null">center_audit_cause,</if>
-
             <if test="createTime != null">create_time,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="location != null">#{location},</if>
@@ -264,10 +239,6 @@
         concat_ws(' - ',
         date_format(ua.start_time,'%Y-%m-%d'),
         date_format(ua.end_time,'%Y-%m-%d') ) usageTime,
-        /*concat_ws('-',
-        (select l.room room from lab_subject s,lab_subject_layout l where s.layout_id =l.id and  s.id=ua.subject_id),
-        ua.location
-        ) location*/
         ua.location
         from qp_usegas_apply ua
         where ua.center_audit_status=1

zd-modules/zd-airbottle/src/main/resources/mapper/airbottle/QpUsegasAuditRecordMapper.xml

@@ -3,16 +3,16 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zd.airbottle.mapper.QpUsegasAuditRecordMapper">
-    
+
     <resultMap type="com.zd.airbottle.domain.QpUsegasAuditRecord" id="QpUsegasAuditRecordResult">
-        <result property="id"    column="id"    />
-        <result property="auditUserid"    column="audit_userid"    />
-        <result property="auditUser"    column="audit_user"    />
-        <result property="auditTime"    column="audit_time"    />
-        <result property="auditStatus"    column="audit_status"    />
-        <result property="remark"    column="remark"    />
-        <result property="usegasApplyId"    column="usegas_apply_id"    />
-        <result property="auditType"    column="audit_type"    />
+        <result property="id" column="id"/>
+        <result property="auditUserid" column="audit_userid"/>
+        <result property="auditUser" column="audit_user"/>
+        <result property="auditTime" column="audit_time"/>
+        <result property="auditStatus" column="audit_status"/>
+        <result property="remark" column="remark"/>
+        <result property="usegasApplyId" column="usegas_apply_id"/>
+        <result property="auditType" column="audit_type"/>
     </resultMap>
 
     <sql id="selectQpUsegasAuditRecordVo">
@@ -42,30 +42,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertQpUsegasAuditRecord" parameterType="com.zd.airbottle.domain.QpUsegasAuditRecord" useGeneratedKeys="true" keyProperty="id">
         insert into qp_usegas_audit_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="auditUserid != null">audit_userid,</if>
-
-    <if test="auditUser != null">audit_user,</if>
-
-    <if test="auditTime != null">audit_time,</if>
-
-    <if test="auditStatus != null">audit_status,</if>
-
-    <if test="remark != null">remark,</if>
-
-    <if test="usegasApplyId != null">usegas_apply_id,</if>
-
-     <if test="auditType != null">audit_type,</if>
-     </trim>
-
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="auditUserid != null">#{auditUserid},</if>
-    <if test="auditUser != null">#{auditUser},</if>
-    <if test="auditTime != null">#{auditTime},</if>
-    <if test="auditStatus != null">#{auditStatus},</if>
-    <if test="remark != null">#{remark},</if>
-    <if test="usegasApplyId != null">#{usegasApplyId},</if>
-    <if test="auditType != null">#{auditType},</if>
-    </trim>
+            <if test="auditUserid != null">audit_userid,</if>
+            <if test="auditUser != null">audit_user,</if>
+            <if test="auditTime != null">audit_time,</if>
+            <if test="auditStatus != null">audit_status,</if>
+            <if test="remark != null">remark,</if>
+            <if test="usegasApplyId != null">usegas_apply_id,</if>
+            <if test="auditType != null">audit_type,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="auditUserid != null">#{auditUserid},</if>
+            <if test="auditUser != null">#{auditUser},</if>
+            <if test="auditTime != null">#{auditTime},</if>
+            <if test="auditStatus != null">#{auditStatus},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="usegasApplyId != null">#{usegasApplyId},</if>
+            <if test="auditType != null">#{auditType},</if>
+        </trim>
     </insert>
 
     <update id="updateQpUsegasAuditRecord" parameterType="com.zd.airbottle.domain.QpUsegasAuditRecord">

zd-modules/zd-base/src/main/java/com/zd/base/files/file/controller/SysFileController.java

@@ -1,5 +1,6 @@
 package com.zd.base.files.file.controller;
 
+import com.zd.base.files.file.enums.FileEnum;
 import com.zd.base.files.file.service.ISysFileService;
 import com.zd.common.core.utils.file.FileUtils;
 import com.zd.model.domain.R;
@@ -31,8 +32,14 @@ public class SysFileController {
     @PostMapping("/upload")
     public R<SysFile> upload(MultipartFile file) {
         try {
-            String fileSuffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
-            String[] picSuffixList = {".jpg", ".png", ".jpeg", ".gif", ".bmp", ".ico",".pdf",".doc",".docx",".ppt",".pptx",".mp3",".mp4",".xls",".xlsx",".csv",".txt"};
+            String fileSuffix = "";
+            String originalFilename = file.getOriginalFilename();
+            if (FileEnum.getPrefix(originalFilename) != null) {
+                fileSuffix = FileEnum.getMessage(originalFilename);
+            }else {
+                fileSuffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+            }
+            String[] picSuffixList = {".jpg", ".png", ".jpeg", ".gif", ".bmp", ".ico", ".pdf", ".doc", ".docx", ".ppt", ".pptx", ".mp3", ".mp4", ".xls", ".xlsx", ".csv", ".txt"};
             boolean suffixFlag = false;
             for (String white_suffix : picSuffixList) {
                 if (fileSuffix.toLowerCase().equals(white_suffix)) {

zd-modules/zd-base/src/main/java/com/zd/base/files/file/enums/FileEnum.java

@@ -0,0 +1,42 @@
+package com.zd.base.files.file.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Description 文件枚举类
+ * @Author hzw
+ * @Date 2023/1/3 17:28
+ * @Version 2.0
+ */
+@Getter
+@AllArgsConstructor
+public enum FileEnum {
+    BASE64_JPEG(1,"data:image/jpeg",".jpeg"),
+    BASE64_ICO(2,"data:image/ico",".ico"),
+    BASE64_GIF(3,"data:image/gif",".gif"),
+    BASE64_PNG(4,"data:image/png",".png"),
+    BASE64_JPG(5,"data:image/jpg",".jpg");
+
+    private Integer code;
+    private String name;
+    private String message;
+
+    public static String getPrefix(String name) {
+        for (FileEnum fileEnum : values()) {
+            if (fileEnum.getName().equals(name)) {
+                return fileEnum.getName();
+            }
+        }
+        return null;
+    }
+
+    public static String getMessage(String name) {
+        for (FileEnum fileEnum : values()) {
+            if (fileEnum.getName().equals(name)) {
+                return fileEnum.getMessage();
+            }
+        }
+        return null;
+    }
+}

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/AlarmRecordController.java

@@ -78,7 +78,7 @@ public class AlarmRecordController extends BaseController<AlarmRecord> {
         List<AlarmRecordVo> recordVos = TransferUtils.transferList(list, AlarmRecordVo.class);
         if (!recordVos.isEmpty()) {
             alarmRecordService.getRecordInfo(recordVos);
-            recordVos.forEach(r -> r.setCurrentPressureValue(r.getCurrentPressure().toPlainString() + "MPa"));
+            recordVos.forEach(r -> r.setCurrentPressureValue(r.getCurrentPressure()==null?"":r.getCurrentPressure()+"MPa"));
         }
 
         util.exportExcel(response, recordVos, "报警记录数据");

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/service/impl/AlarmRecordServiceImpl.java

@@ -10,10 +10,7 @@ import com.zd.algorithm.api.alarm.entity.SendTypes;
 import com.zd.algorithm.api.alarm.feign.RemoteAlarmService;
 import com.zd.algorithm.api.forward.feign.RemoteForwardService;
 import com.zd.algorithm.api.rfid.feign.RemoteRfidService;
-import com.zd.bottle.domain.AlarmRecord;
-import com.zd.bottle.domain.BottleStorage;
-import com.zd.bottle.domain.RfidTag;
-import com.zd.bottle.domain.UsegasApply;
+import com.zd.bottle.domain.*;
 import com.zd.bottle.mapper.AlarmRecordMapper;
 import com.zd.bottle.properties.AlarmProperties;
 import com.zd.bottle.service.AlarmRecordService;
@@ -121,6 +118,15 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
         String endTime = alarmRecord.getEndTime();
         queryWrapper.apply(StringUtils.hasLength(startTime), "DATE_FORMAT(alarm_time,'%Y-%m-%d') >=date_format('" + startTime + "','%Y-%m-%d')")
                 .apply(StringUtils.hasLength(startTime), "DATE_FORMAT(alarm_time,'%Y-%m-%d') <=date_format('" + endTime + "','%Y-%m-%d')");
+        String searchValue = alarmRecord.getSearchValue();
+        if (StringUtils.hasLength(searchValue)) {
+            queryWrapper.like(AlarmRecord::getElectronicTag, searchValue);
+        }
+
+        List<Long> ids = alarmRecord.getIds();
+        if (ids != null && !ids.isEmpty()) {
+            queryWrapper.in(AlarmRecord::getId, ids);
+        }
         return list(queryWrapper);
     }
 

zd-modules/zd-chemical/src/main/resources/mapper/chemical/ActApplytaskMapper.xml

@@ -5,15 +5,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.chemical.mapper.ActApplytaskMapper">
 
     <resultMap type="com.zd.chemical.domain.ActApplytask" id="ActApplytaskResult">
-        <result property="id"    column="id"    />
-        <result property="taskId"    column="task_id"    />
-        <result property="taskName"    column="task_name"    />
-        <result property="taskType"    column="task_type"    />
-        <result property="nowStep"    column="now_step"    />
-        <result property="nextStep"    column="next_step"    />
-        <result property="approvalStatus"    column="approval_status"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="overTime"    column="over_time"    />
+        <result property="id" column="id"/>
+        <result property="taskId" column="task_id"/>
+        <result property="taskName" column="task_name"/>
+        <result property="taskType" column="task_type"/>
+        <result property="nowStep" column="now_step"/>
+        <result property="nextStep" column="next_step"/>
+        <result property="approvalStatus" column="approval_status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="overTime" column="over_time"/>
     </resultMap>
 
     <sql id="selectActApplytaskVo">
@@ -22,14 +22,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectActApplytaskListVo">
         select t.id, t.task_id, t.task_name, t.task_type, t.now_step, t.next_step, t.approval_status, t.create_time, t.over_time from act_applytask as t
     </sql>
-    <select id="selectActApplytaskList" parameterType="com.zd.chemical.domain.ActApplytask" resultMap="ActApplytaskResult">
+    <select id="selectActApplytaskList" parameterType="com.zd.chemical.domain.ActApplytask"
+            resultMap="ActApplytaskResult">
         <include refid="selectActApplytaskVo"/>
         <where>
-            <if test="taskId != null "> and task_id = #{taskId}</if>
-            <if test="taskName != null  and taskName != ''"> and task_name like concat('%', #{taskName}, '%')</if>
-            <if test="taskType != null "> and task_type = #{taskType}</if>
-            <if test="nowStep != null "> and now_step = #{nowStep}</if>
-            <if test="nextStep != null "> and next_step = #{nextStep}</if>
+            <if test="taskId != null ">and task_id = #{taskId}</if>
+            <if test="taskName != null  and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
+            <if test="taskType != null ">and task_type = #{taskType}</if>
+            <if test="nowStep != null ">and now_step = #{nowStep}</if>
+            <if test="nextStep != null ">and next_step = #{nextStep}</if>
         </where>
     </select>
 
@@ -51,32 +52,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertActApplytask" parameterType="com.zd.chemical.domain.ActApplytask" useGeneratedKeys="true" keyProperty="id">
         insert into act_applytask
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="taskId != null">task_id,</if>
-
-    <if test="taskName != null">task_name,</if>
-
-    <if test="taskType != null">task_type,</if>
-
-    <if test="nowStep != null">now_step,</if>
-
-    <if test="nextStep != null">next_step,</if>
-
-    <if test="approvalStatus != null">approval_status,</if>
-
-    <if test="createTime != null">create_time,</if>
-
-    <if test="overTime != null">over_time,</if>
-
+            <if test="taskId != null">task_id,</if>
+            <if test="taskName != null">task_name,</if>
+            <if test="taskType != null">task_type,</if>
+            <if test="nowStep != null">now_step,</if>
+            <if test="nextStep != null">next_step,</if>
+            <if test="approvalStatus != null">approval_status,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="overTime != null">over_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="taskId != null">#{taskId},</if>
-    <if test="taskName != null">#{taskName},</if>
-    <if test="taskType != null">#{taskType},</if>
-    <if test="nowStep != null">#{nowStep},</if>
-    <if test="nextStep != null">#{nextStep},</if>
-    <if test="approvalStatus != null">#{approvalStatus},</if>
-    <if test="createTime != null">#{createTime},</if>
-    <if test="overTime != null">#{overTime},</if>
+            <if test="taskId != null">#{taskId},</if>
+            <if test="taskName != null">#{taskName},</if>
+            <if test="taskType != null">#{taskType},</if>
+            <if test="nowStep != null">#{nowStep},</if>
+            <if test="nextStep != null">#{nextStep},</if>
+            <if test="approvalStatus != null">#{approvalStatus},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="overTime != null">#{overTime},</if>
          </trim>
     </insert>
 

zd-modules/zd-chemical/src/main/resources/mapper/chemical/ActApplytaskNodeMapper.xml

@@ -5,15 +5,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.chemical.mapper.ActApplytaskNodeMapper">
 
     <resultMap type="com.zd.chemical.domain.ActApplytaskNode" id="ActApplytaskNodeResult">
-        <result property="id"    column="id"    />
-        <result property="nodeName"    column="node_name"    />
-        <result property="applytaskId"    column="applytask_id"    />
-        <result property="auditconfigId"    column="auditconfig_id"    />
-        <result property="applyUserIds"    column="apply_user_ids"    />
-        <result property="nodeStatus"    column="node_status"    />
-        <result property="nodeContent"    column="node_content"    />
-        <result property="nodeOrder"    column="node_order"    />
-        <result property="applyUserid"    column="apply_userid"    />
+        <result property="id" column="id"/>
+        <result property="nodeName" column="node_name"/>
+        <result property="applytaskId" column="applytask_id"/>
+        <result property="auditconfigId" column="auditconfig_id"/>
+        <result property="applyUserIds" column="apply_user_ids"/>
+        <result property="nodeStatus" column="node_status"/>
+        <result property="nodeContent" column="node_content"/>
+        <result property="nodeOrder" column="node_order"/>
+        <result property="applyUserid" column="apply_userid"/>
     </resultMap>
 
     <sql id="selectActApplytaskNodeVo">
@@ -71,34 +71,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertActApplytaskNode" parameterType="com.zd.chemical.domain.ActApplytaskNode" useGeneratedKeys="true" keyProperty="id">
         insert into act_applytask_node
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="nodeName != null">node_name,</if>
-
-    <if test="applytaskId != null">applytask_id,</if>
-
-    <if test="auditconfigId != null">auditconfig_id,</if>
-
-    <if test="applyUserIds != null">apply_user_ids,</if>
-
-    <if test="nodeStatus != null">node_status,</if>
-
-    <if test="nodeContent != null">node_content,</if>
-
-    <if test="nodeOrder != null">node_order,</if>
-
-    <if test="applyUserid != null">apply_userid,</if>
-
-    <if test="updateTime != null">update_time,</if>
+            <if test="nodeName != null">node_name,</if>
+            <if test="applytaskId != null">applytask_id,</if>
+            <if test="auditconfigId != null">auditconfig_id,</if>
+            <if test="applyUserIds != null">apply_user_ids,</if>
+            <if test="nodeStatus != null">node_status,</if>
+            <if test="nodeContent != null">node_content,</if>
+            <if test="nodeOrder != null">node_order,</if>
+            <if test="applyUserid != null">apply_userid,</if>
+            <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="nodeName != null">#{nodeName},</if>
-    <if test="applytaskId != null">#{applytaskId},</if>
-    <if test="auditconfigId != null">#{auditconfigId},</if>
-    <if test="applyUserIds != null">#{applyUserIds},</if>
-    <if test="nodeStatus != null">#{nodeStatus},</if>
-    <if test="nodeContent != null">#{nodeContent},</if>
-    <if test="nodeOrder != null">#{nodeOrder},</if>
-    <if test="applyUserid != null">#{applyUserid},</if>
-    <if test="updateTime != null">#{updateTime},</if>
+            <if test="nodeName != null">#{nodeName},</if>
+            <if test="applytaskId != null">#{applytaskId},</if>
+            <if test="auditconfigId != null">#{auditconfigId},</if>
+            <if test="applyUserIds != null">#{applyUserIds},</if>
+            <if test="nodeStatus != null">#{nodeStatus},</if>
+            <if test="nodeContent != null">#{nodeContent},</if>
+            <if test="nodeOrder != null">#{nodeOrder},</if>
+            <if test="applyUserid != null">#{applyUserid},</if>
+            <if test="updateTime != null">#{updateTime},</if>
          </trim>
     </insert>
 

zd-modules/zd-chemical/src/main/resources/mapper/chemical/ActAuditconfigMapper.xml

@@ -5,23 +5,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.chemical.mapper.ActAuditconfigMapper">
 
     <resultMap type="com.zd.chemical.domain.ActAuditconfig" id="ActAuditconfigResult">
-        <result property="id"    column="id"    />
-        <result property="auditType"    column="audit_type"    />
-        <result property="auditStatus"    column="audit_status"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="auditType" column="audit_type"/>
+        <result property="auditStatus" column="audit_status"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectActAuditconfigVo">
         select id, audit_type, user_id, create_by, create_time, update_by, update_time, remark from act_auditconfig
     </sql>
+
     <sql id="selectActAuditconfigListVo">
         select t.id, t.audit_type, t.user_id, t.create_by, t.create_time, t.update_by, t.update_time, t.remark from act_auditconfig as t
     </sql>
+
     <select id="selectActAuditconfigList" parameterType="com.zd.chemical.domain.ActAuditconfig" resultMap="ActAuditconfigResult">
         <include refid="selectActAuditconfigVo"/>
         <where>
@@ -49,29 +51,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertActAuditconfig" parameterType="com.zd.chemical.domain.ActAuditconfig" useGeneratedKeys="true" keyProperty="id">
         insert into act_auditconfig
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="auditType != null">audit_type,</if>
-
-    <if test="userId != null">user_id,</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="remark != null">remark,</if>
-
+            <if test="auditType != null">audit_type,</if>
+            <if test="userId != null">user_id,</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="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="auditType != null">#{auditType},</if>
-    <if test="userId != null">#{userId},</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="remark != null">#{remark},</if>
+            <if test="auditType != null">#{auditType},</if>
+            <if test="userId != null">#{userId},</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="remark != null">#{remark},</if>
          </trim>
     </insert>
 

zd-modules/zd-chemical/src/main/resources/mapper/chemical/ActAudituserMapper.xml

@@ -5,24 +5,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.chemical.mapper.ActAudituserMapper">
 
     <resultMap type="com.zd.chemical.domain.ActAudituser" id="ActAudituserResult">
-        <result property="id"    column="id"    />
-        <result property="configId"    column="config_id"    />
-        <result property="auditUserId"    column="audit_user_id"    />
-        <result property="auditOrder"    column="audit_order"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="configId" column="config_id"/>
+        <result property="auditUserId" column="audit_user_id"/>
+        <result property="auditOrder" column="audit_order"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectActAudituserVo">
         select id, config_id, audit_user_id, audit_order, user_id, create_by, create_time, update_by, update_time, remark from act_audituser
     </sql>
+
     <sql id="selectActAudituserListVo">
         select t.id, t.config_id, t.audit_user_id, t.audit_order, t.user_id, t.create_by, t.create_time, t.update_by, t.update_time, t.remark from act_audituser as t
     </sql>
+
     <select id="selectActAudituserList" parameterType="com.zd.chemical.domain.ActAudituser" resultMap="ActAudituserResult">
         <include refid="selectActAudituserVo"/>
         <where>
@@ -32,7 +34,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-
     <select id="getActUserInfoList" parameterType="com.zd.chemical.domain.ActAudituser" resultType="com.zd.chemical.domain.vo.ActAudituserVo">
         select ar.id, ar.audit_user_id userId, ur.nick_name nickName,ur.avatar
         from act_audituser ar left join sys_user ur on ar.audit_user_id = ur.user_id
@@ -60,35 +61,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertActAudituser" parameterType="com.zd.chemical.domain.ActAudituser" useGeneratedKeys="true" keyProperty="id">
         insert into act_audituser
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="configId != null">config_id,</if>
-
-    <if test="auditUserId != null">audit_user_id,</if>
-
-    <if test="auditOrder != null">audit_order,</if>
-
-    <if test="userId != null">user_id,</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="remark != null">remark,</if>
-
+            <if test="configId != null">config_id,</if>
+            <if test="auditUserId != null">audit_user_id,</if>
+            <if test="auditOrder != null">audit_order,</if>
+            <if test="userId != null">user_id,</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="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="configId != null">#{configId},</if>
-    <if test="auditUserId != null">#{auditUserId},</if>
-    <if test="auditOrder != null">#{auditOrder},</if>
-    <if test="userId != null">#{userId},</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="remark != null">#{remark},</if>
+            <if test="configId != null">#{configId},</if>
+            <if test="auditUserId != null">#{auditUserId},</if>
+            <if test="auditOrder != null">#{auditOrder},</if>
+            <if test="userId != null">#{userId},</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="remark != null">#{remark},</if>
          </trim>
     </insert>
 

zd-modules/zd-chemical/src/main/resources/mapper/chemical/ActHxpapplyDetailMapper.xml

@@ -5,21 +5,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.chemical.mapper.ActHxpapplyDetailMapper">
 
     <resultMap type="com.zd.chemical.domain.ActHxpapplyDetail" id="ActHxpapplyDetailResult">
-        <result property="id"    column="id"    />
-        <result property="hxpapplyId"    column="hxpapply_id"    />
-        <result property="chemicalId"    column="chemical_id"    />
-        <result property="chemicalName"    column="chemical_name"    />
-        <result property="cabinetId"    column="cabinet_id"    />
-        <result property="applyNum"    column="apply_num"    />
-        <result property="tickStatus"    column="tick_status"    />
+        <result property="id" column="id"/>
+        <result property="hxpapplyId" column="hxpapply_id"/>
+        <result property="chemicalId" column="chemical_id"/>
+        <result property="chemicalName" column="chemical_name"/>
+        <result property="cabinetId" column="cabinet_id"/>
+        <result property="applyNum" column="apply_num"/>
+        <result property="tickStatus" column="tick_status"/>
     </resultMap>
 
     <sql id="selectActHxpapplyDetailVo">
         select id, hxpapply_id, chemical_id, chemical_name, cabinet_id, apply_num,tick_status from act_hxpapply_detail
     </sql>
+
     <sql id="selectActHxpapplyDetailListVo">
         select t.id, t.hxpapply_id, t.chemical_id, t.chemical_name, t.cabinet_id, t.apply_num, t.tick_status from act_hxpapply_detail as t
     </sql>
+
     <select id="selectActHxpapplyDetailList" parameterType="com.zd.chemical.domain.ActHxpapplyDetail" resultMap="ActHxpapplyDetailResult">
         <include refid="selectActHxpapplyDetailVo"/>
         <where>
@@ -78,29 +80,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertActHxpapplyDetail" parameterType="com.zd.chemical.domain.ActHxpapplyDetail" useGeneratedKeys="true" keyProperty="id">
         insert into act_hxpapply_detail
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="hxpapplyId != null">hxpapply_id,</if>
-
-    <if test="chemicalId != null">chemical_id,</if>
-
-    <if test="chemicalName != null">chemical_name,</if>
-
-    <if test="cabinetId != null">cabinet_id,</if>
-
-    <if test="applyNum != null">apply_num,</if>
-
-    <if test="remainingStorage != null">remaining_storage,</if>
-
-    <if test="tickStatus != null">tick_status,</if>
-
+            <if test="hxpapplyId != null">hxpapply_id,</if>
+            <if test="chemicalId != null">chemical_id,</if>
+            <if test="chemicalName != null">chemical_name,</if>
+            <if test="cabinetId != null">cabinet_id,</if>
+            <if test="applyNum != null">apply_num,</if>
+            <if test="remainingStorage != null">remaining_storage,</if>
+            <if test="tickStatus != null">tick_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="hxpapplyId != null">#{hxpapplyId},</if>
-    <if test="chemicalId != null">#{chemicalId},</if>
-    <if test="chemicalName != null">#{chemicalName},</if>
-    <if test="cabinetId != null">#{cabinetId},</if>
-    <if test="applyNum != null">#{applyNum},</if>
-    <if test="remainingStorage != null">#{remainingStorage},</if>
-    <if test="tickStatus != null">#{tickStatus},</if>
+            <if test="hxpapplyId != null">#{hxpapplyId},</if>
+            <if test="chemicalId != null">#{chemicalId},</if>
+            <if test="chemicalName != null">#{chemicalName},</if>
+            <if test="cabinetId != null">#{cabinetId},</if>
+            <if test="applyNum != null">#{applyNum},</if>
+            <if test="remainingStorage != null">#{remainingStorage},</if>
+            <if test="tickStatus != null">#{tickStatus},</if>
          </trim>
     </insert>
 

zd-modules/zd-chemical/src/main/resources/mapper/chemical/ActHxpapplyMapper.xml

@@ -5,17 +5,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.chemical.mapper.ActHxpapplyMapper">
 
     <resultMap type="com.zd.chemical.domain.ActHxpapply" id="ActHxpapplyResult">
-        <result property="id"    column="id"    />
-        <result property="applyNum"    column="apply_num"    />
-        <result property="applyReason"    column="apply_reason"    />
-        <result property="subId"    column="sub_id"    />
-        <result property="applyStatus"    column="apply_status"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="applyNum" column="apply_num"/>
+        <result property="applyReason" column="apply_reason"/>
+        <result property="subId" column="sub_id"/>
+        <result property="applyStatus" column="apply_status"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectActHxpapplyVo">
@@ -25,69 +25,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select t.id, t.apply_num, t.apply_reason, t.sub_id, t.apply_status, t.user_id, t.create_by, t.create_time, t.update_by, t.update_time, t.remark from act_hxpapply as t
     </sql>
     <select id="selectActHxpapplyList" parameterType="com.zd.chemical.domain.vo.ActHxpapplySearch" resultType="com.zd.chemical.domain.vo.ActHxpapplyListVo">
-        <!--SELECT xx.applyNum,xx.subscriber,xx.subName,xx.chemicalNames,xx.createTime,xx.overTime,xx.approvalContent,xx.approvalStatus,-->
-            <!--CASE WHEN xx.approvalStatus = 0 THEN-->
-            <!--(SELECT GROUP_CONCAT(ur.user_id,';',ur.nick_name) FROM sys_user ur WHERE FIND_IN_SET(ur.user_id,xx.currentApprover))-->
-            <!--ELSE ''-->
-            <!--END currentApprover,-->
-            <!--CASE WHEN xx.approvalStatus = 3 THEN ''-->
-            <!--ELSE (SELECT GROUP_CONCAT(ur.user_id,';',ur.nick_name) FROM sys_user ur WHERE FIND_IN_SET(ur.user_id,xx.historyApprover))-->
-            <!--END historyApprover,-->
-            <!--xx.currentApprover currentApproverIds-->
-            <!--FROM (-->
-            <!--SELECT ah.`apply_num` applyNum,-->
-            <!--su.nick_name subscriber,-->
-            <!--st.`name` subName,-->
-            <!--GROUP_CONCAT(hd.chemical_name) chemicalNames,-->
-            <!--ah.`create_time` createTime,-->
-            <!--ak.`over_time` overTime,-->
-            <!--CASE WHEN ak.approval_status=0 THEN '审批中'-->
-            <!--ELSE CASE WHEN ak.approval_status=1 THEN '已通过'-->
-            <!--ELSE CASE WHEN ak.approval_status=2 THEN '已拒绝'-->
-            <!--ELSE '已撤销'-->
-            <!--END-->
-            <!--END-->
-            <!--END approvalContent,-->
-            <!--ak.approval_status approvalStatus,-->
-            <!--(SELECT an.apply_user_ids FROM  act_applytask apk,act_applytask_node an WHERE an.applytask_id = apk.id AND apk.id = ak.id AND an.node_status = 0-->
-            <!--AND apk.approval_status=0 ORDER BY an.node_order ASC LIMIT 1) currentApprover,-->
-            <!--(SELECT an.apply_user_ids FROM  act_applytask apk,act_applytask_node an WHERE an.applytask_id = apk.id AND apk.id = ak.id AND (an.node_status = 1 OR an.node_status = 2)-->
-            <!--AND (apk.approval_status=0 OR apk.approval_status=1) ORDER BY an.node_order DESC LIMIT 1) historyApprover-->
-            <!--FROM act_hxpapply ah LEFT JOIN sys_user su ON su.user_id = ah.`user_id`-->
-            <!--LEFT JOIN lab_subject st ON st.id = ah.`sub_id`-->
-            <!--LEFT JOIN act_hxpapply_detail hd ON hd.hxpapply_id = ah.id-->
-            <!--LEFT JOIN act_applytask ak ON ak.`task_id` = ah.`id`-->
-            <!--<where>-->
-                <!--ah.apply_status in(1,3)-->
-                <!--<if test="searchValue != null ">-->
-                    <!--and (-->
-                    <!--ah.apply_num like concat('%', #{searchValue}, '%') or-->
-                    <!--su.nick_name like concat('%', #{searchValue}, '%') or-->
-                    <!--hd.chemical_name like concat('%', #{searchValue}, '%') or-->
-                    <!--st.name like concat('%', #{searchValue}, '%')-->
-                    <!--)-->
-                <!--</if>-->
-                <!--<if test="approvalStatus != null ">-->
-                    <!--and ak.approval_status = #{approvalStatus}-->
-                <!--</if>-->
-                <!--<if test="beginCreateTime != null and beginCreateTime != ''">&lt;!&ndash; 申请开始时间 &ndash;&gt;-->
-                    <!--AND date_format(ak.create_time,'%y%m%d') &gt;= date_format(#{beginCreateTime},'%y%m%d')-->
-                <!--</if>-->
-                <!--<if test="endCreateTime != null and endCreateTime != ''">&lt;!&ndash; 申请结束时间 &ndash;&gt;-->
-                    <!--AND date_format(ak.create_time,'%y%m%d') &lt;= date_format(#{endCreateTime},'%y%m%d')-->
-                <!--</if>-->
-
-                <!--<if test="beginOverTime != null and beginOverTime != ''">&lt;!&ndash; 完成开始时间 &ndash;&gt;-->
-                    <!--AND date_format(ak.over_time,'%y%m%d') &gt;= date_format(#{beginOverTime},'%y%m%d')-->
-                <!--</if>-->
-                <!--<if test="endOverTime != null and endOverTime != ''">&lt;!&ndash; 完成结束时间 &ndash;&gt;-->
-                    <!--AND date_format(ak.over_time,'%y%m%d') &lt;= date_format(#{endOverTime},'%y%m%d')-->
-                <!--</if>-->
-            <!--</where>-->
-            <!--GROUP BY ah.`id`-->
-        <!--)xx ORDER BY xx.createTime DESC-->
-
-
         SELECT xx1.* FROM (
             SELECT xx.id,xx.applyNum,xx.subscriber,xx.subName,xx.chemicalNames,xx.createTime,xx.overTime,xx.approvalContent,xx.approvalStatus,
             CASE WHEN xx.approvalStatus = 0 THEN
@@ -339,7 +276,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endCreateTime != null and endCreateTime != ''"><!-- 申请结束时间 -->
             AND date_format(ah.create_time,'%y%m%d') &lt;= date_format(#{endCreateTime},'%y%m%d')
             </if>
-
             <if test="beginOverTime != null and beginOverTime != ''"><!-- 完成开始时间 -->
             AND date_format(ah.over_time,'%y%m%d') &gt;= date_format(#{beginOverTime},'%y%m%d')
             </if>
@@ -352,8 +288,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         GROUP BY ah.`id`
         )xx ORDER BY xx.createTime DESC
-
-
     </select>
 
     <select id="getListByIds" resultMap="ActHxpapplyResult">
@@ -432,54 +366,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         )t1
         GROUP BY t1.`chemical_id`
         )x2 ON x1.chemical_id = x2.chemical_id
-
-
-      <!--  SELECT x1.chemical_id chemicalId,CONCAT((IFNULL(x1.applyNum,0)-IFNULL(x2.stockNum,0)),'g') restStock FROM (
-        SELECT hd.`chemical_id`,IFNULL(SUM(hd.`apply_num`),0) applyNum FROM act_hxpapply ah LEFT JOIN act_hxpapply_detail hd ON ah.`id` = hd.`hxpapply_id`
-        LEFT JOIN act_applytask ak ON ah.`id` = ak.`task_id`
-        LEFT JOIN lab_subject st ON ah.sub_id = st.id
-        <where>
-            ak.`approval_status`=1 AND hd.`tick_status`=1
-            <if test="deptId != null ">
-                and st.dept_id = #{deptId}
-            </if>
-            <if test="subId != null ">
-                and ah.sub_id = #{subId}
-            </if>
-            <if test="chemicalId != null ">
-                and hd.`chemical_id` = #{chemicalId}
-            </if>
-            <if test="cabinetId != null ">
-                and hd.`cabinet_id` = #{cabinetId}
-            </if>
-        </where>
-
-        GROUP BY hd.`chemical_id`
-        )x1 LEFT JOIN
-        (
-        SELECT cjc.`chemical_id`,SUM(s.usages-s.tare) stockNum FROM hxp_stock s
-        LEFT JOIN hxp_chemical_join_cabinet cjc ON s.`join_id` = cjc.`id`
-        LEFT JOIN lab_subject st ON s.sub_id = st.id
-        <where>
-            s.status = 1
-            <if test="deptId != null ">
-                and st.dept_id = #{deptId}
-            </if>
-            <if test="subId != null ">
-                and s.sub_id = #{subId}
-            </if>
-            <if test="chemicalId != null ">
-                and cjc.`chemical_id` = #{chemicalId}
-            </if>
-            <if test="cabinetId != null ">
-                and cjc.`cabinet_id` = #{cabinetId}
-            </if>
-        </where>
-        GROUP BY cjc.`chemical_id`
-        )x2 ON x1.chemical_id = x2.chemical_id-->
     </select>
 
-
     <select id="getRestStockClassif" resultType="com.zd.chemical.domain.vo.ActRestStockVo">
         SELECT 1 chemicalId,CONCAT(IFNULL(x1.stockNum,0), x1.chemical_unit) restStock FROM (
             SELECT cjc.`chemical_id`,SUM(s.usages-s.tare) stockNum, che.chemical_unit FROM hxp_stock s
@@ -595,49 +483,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         )x2 ON x1.chemical_id = x2.chemical_id
     </select>
 
-
-
     <select id="getRestStockByManyCabinet" parameterType="com.zd.chemical.domain.vo.ActRestStockManySearch" resultType="com.zd.chemical.domain.vo.ActRestStockManyVo">
-        <!--SELECT x1.cabinet_id cabinetId,CASE WHEN CONCAT((IFNULL(x1.applyNum,0)-IFNULL(x2.stockNum,0)))>0
-        THEN CONCAT((IFNULL(x1.applyNum,0)-IFNULL(x2.stockNum,0))) ELSE 0 END restStock FROM (
-        SELECT hd.`cabinet_id`,IFNULL(SUM(hd.`apply_num`),0) applyNum FROM act_hxpapply ah LEFT JOIN act_hxpapply_detail hd ON ah.`id` = hd.`hxpapply_id`
-        LEFT JOIN act_applytask ak ON ah.`id` = ak.`task_id`
-        LEFT JOIN lab_subject st ON ah.sub_id = st.id
-        <where>
-            ak.`approval_status`=1 AND hd.`tick_status`=1
-            <if test="chemicalId != null ">
-                and hd.`chemical_id` = #{chemicalId}
-            </if>
-
-            <if test="cabinetIds != null ">
-                and hd.`cabinet_id` in
-                <foreach item="id" collection="cabinetIds" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
-        </where>
-
-        GROUP BY hd.`cabinet_id`
-        )x1 LEFT JOIN
-        (
-        SELECT cjc.`cabinet_id`,SUM(cjc.chemical_amount-cjc.tare) stockNum FROM
-        hxp_chemical_join_cabinet cjc
-        <where>
-            cjc.`status` IN(0,1)
-            <if test="chemicalId != null ">
-                and cjc.`chemical_id` = #{chemicalId}
-            </if>
-            <if test="cabinetIds != null ">
-                and cjc.`cabinet_id` in
-                <foreach item="id" collection="cabinetIds" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
-        </where>
-        GROUP BY cjc.`cabinet_id`
-        )x2 ON x1.cabinet_id = x2.cabinet_id
-        -->
-
         SELECT x1.cabinet_id cabinetId,CASE WHEN CONCAT((IFNULL(x1.applyNum,0)-IFNULL(x2.stockNum,0)))>0
         THEN CONCAT((IFNULL(x1.applyNum,0)-IFNULL(x2.stockNum,0))) ELSE 0 END restStock FROM (
         SELECT hd.`cabinet_id`,IFNULL(SUM(hd.`apply_num`),0) applyNum FROM act_hxpapply ah LEFT JOIN act_hxpapply_detail hd ON ah.`id` = hd.`hxpapply_id`
@@ -688,8 +534,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         )x2 ON x1.cabinet_id = x2.cabinet_id
     </select>
 
-
-
     <select id="getRestStockByManyCabinetAndChemical" parameterType="com.zd.chemical.domain.vo.ActRestStockManySearch" resultType="com.zd.chemical.domain.vo.ActRestStockManyVo">
         SELECT x1.chemical_id chemicalId,x1.cabinet_id cabinetId,CASE WHEN CONCAT((IFNULL(x1.applyNum,0)-IFNULL(x2.stockNum,0)))>0
         THEN CONCAT((IFNULL(x1.applyNum,0)-IFNULL(x2.stockNum,0))) ELSE 0 END restStock FROM (
@@ -743,42 +587,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         )x2 ON x1.chemical_id = x2.chemical_id AND x1.cabinet_id = x2.cabinet_id
     </select>
 
-
     <insert id="insertActHxpapply" parameterType="com.zd.chemical.domain.ActHxpapply" useGeneratedKeys="true" keyProperty="id">
         insert into act_hxpapply
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="applyNum != null">apply_num,</if>
-
-    <if test="applyReason != null">apply_reason,</if>
-
-    <if test="subId != null">sub_id,</if>
-
-    <if test="applyStatus != null">apply_status,</if>
-
-    <if test="userId != null">user_id,</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="remark != null">remark,</if>
-
+            <if test="applyNum != null">apply_num,</if>
+            <if test="applyReason != null">apply_reason,</if>
+            <if test="subId != null">sub_id,</if>
+            <if test="applyStatus != null">apply_status,</if>
+            <if test="userId != null">user_id,</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="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="applyNum != null">#{applyNum},</if>
-    <if test="applyReason != null">#{applyReason},</if>
-    <if test="subId != null">#{subId},</if>
-    <if test="applyStatus != null">#{applyStatus},</if>
-    <if test="userId != null">#{userId},</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="remark != null">#{remark},</if>
+            <if test="applyNum != null">#{applyNum},</if>
+            <if test="applyReason != null">#{applyReason},</if>
+            <if test="subId != null">#{subId},</if>
+            <if test="applyStatus != null">#{applyStatus},</if>
+            <if test="userId != null">#{userId},</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="remark != null">#{remark},</if>
          </trim>
     </insert>
 

zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpAlarmConfigMapper.xml

@@ -5,15 +5,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.chemical.mapper.HxpAlarmConfigMapper">
 
     <resultMap type="com.zd.chemical.domain.HxpAlarmConfig" id="HxpAlarmConfigResult">
-        <result property="id"    column="id"    />
-        <result property="alarmDeptId"    column="alarm_dept_id"    />
-        <result property="alarmMode"    column="alarm_mode"    />
-        <result property="timeInterval"    column="time_interval"    />
-        <result property="alarmContent"    column="alarm_content"    />
-        <result property="alarmPhone"    column="alarm_phone"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createBy"    column="create_by"    />
+        <result property="id" column="id"/>
+        <result property="alarmDeptId" column="alarm_dept_id"/>
+        <result property="alarmMode" column="alarm_mode"/>
+        <result property="timeInterval" column="time_interval"/>
+        <result property="alarmContent" column="alarm_content"/>
+        <result property="alarmPhone" column="alarm_phone"/>
+        <result property="userId" column="user_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
     </resultMap>
 
     <sql id="selectHxpAlarmConfigVo">
@@ -41,32 +41,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertHxpAlarmConfig" parameterType="com.zd.chemical.domain.HxpAlarmConfig" useGeneratedKeys="true" keyProperty="id">
         insert into hxp_alarm_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="alarmDeptId != null">alarm_dept_id,</if>
-
-    <if test="alarmMode != null">alarm_mode,</if>
-
-    <if test="timeInterval != null">time_interval,</if>
-
-    <if test="alarmContent != null">alarm_content,</if>
-
-    <if test="alarmPhone != null">alarm_phone,</if>
-
-    <if test="userId != null">user_id,</if>
-
-    <if test="createTime != null">create_time,</if>
-
-    <if test="createBy != null">create_by,</if>
-
+            <if test="alarmDeptId != null">alarm_dept_id,</if>
+            <if test="alarmMode != null">alarm_mode,</if>
+            <if test="timeInterval != null">time_interval,</if>
+            <if test="alarmContent != null">alarm_content,</if>
+            <if test="alarmPhone != null">alarm_phone,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="alarmDeptId != null">#{alarmDeptId},</if>
-    <if test="alarmMode != null">#{alarmMode},</if>
-    <if test="timeInterval != null">#{timeInterval},</if>
-    <if test="alarmContent != null">#{alarmContent},</if>
-    <if test="alarmPhone != null">#{alarmPhone},</if>
-    <if test="userId != null">#{userId},</if>
-    <if test="createTime != null">#{createTime},</if>
-    <if test="createBy != null">#{createBy},</if>
+            <if test="alarmDeptId != null">#{alarmDeptId},</if>
+            <if test="alarmMode != null">#{alarmMode},</if>
+            <if test="timeInterval != null">#{timeInterval},</if>
+            <if test="alarmContent != null">#{alarmContent},</if>
+            <if test="alarmPhone != null">#{alarmPhone},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
          </trim>
     </insert>
 

zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpAlarmRecordMapper.xml

@@ -19,7 +19,6 @@
         <result property="liableUserIds" column="liable_user_ids"/>
         <result property="hasValid" column="has_valid"/>
         <result property="parentId" column="parent_id"/>
-
     </resultMap>
 
     <resultMap id="AioAlarmRecordResult" type="com.zd.chemical.domain.vo.AioAlarmRecordVo">
@@ -42,6 +41,7 @@
                parent_id
         from hxp_alarm_record
     </sql>
+
     <sql id="selectHxpAlarmRecordListVo">
         select t.id,
                t.alarm_content,
@@ -59,6 +59,7 @@
                t.parent_id
         from hxp_alarm_record as t
     </sql>
+
     <select id="selectHxpAlarmRecordList" parameterType="com.zd.chemical.domain.vo.HxpAlarmRecordSearch"
             resultType="com.zd.chemical.domain.vo.HxpAlarmRecordVo">
         SELECT ard.`id`,ard.alarm_time alarmTime,ard.`alarm_content` alarmContent,CASE WHEN ard.alarm_mode=1 THEN '系统通知'
@@ -70,6 +71,8 @@
         (SELECT ur.nick_name FROM sys_user ur WHERE ur.user_id = ard.handling_user_id) handlingUserName,
         CASE WHEN ard.handling_status = 1 THEN '待处理' ELSE '已处理' END operate,
         st.admin_id,
+        ( SELECT GROUP_CONCAT(ur.nick_name) FROM sys_user ur WHERE FIND_IN_SET(ur.user_id,st.safe_user_id)) safeUserNames,
+	    ( SELECT ur.nick_name FROM sys_user ur WHERE ur.user_id = st.admin_id ) adminNames,
         ard.handling_status handlingStatus,st.safe_user_id safeUserId,ard.alarm_mode alarmModeStatus,
         concat(TIMESTAMPDIFF(MINUTE, ard.alarm_time, ard.handling_time),'分',TIMESTAMPDIFF(SECOND, ard.alarm_time, ard.handling_time)%60,'秒') alarmDuration
         FROM hxp_alarm_record ard
@@ -107,29 +110,12 @@
     </select>
 
     <select id="selectHxpAlarmRecordUserInfo" resultType="map">
-        <!--select
-               <choose>
-                   <when test="type == 2">
-                       GROUP_CONCAT(nick_name,' ',phonenumber SEPARATOR '、')
-                   </when>
-                   <otherwise>
-                       GROUP_CONCAT(nick_name)
-                   </otherwise>
-               </choose>
-        from
-        (-->
             select user_id, nick_name, phonenumber from sys_user u where
             FIND_IN_SET(u.user_id, (select group_concat(DISTINCT CONCAT_WS(",", st.safe_user_id,ard.liable_user_ids,st.admin_id)) as safe_user_id
                                     FROM hxp_alarm_record ard
                                              left JOIN lab_subject st ON ard.sub_id = st.id
                                              left join sys_dept dt on dt.dept_id = st.dept_id
                                     where ard.alarm_mode = 1))
-        <!--) as u
-        <where>
-            <if test="userIds != null">
-                FIND_IN_SET(user_id, #{userIds})
-            </if>
-        </where>-->
     </select>
 
 
@@ -167,6 +153,7 @@
             left join sys_dept d on s.dept_id = d.dept_id
         where ar.has_valid = 1 and ar.id = #{id}
     </select>
+
     <select id="queryListByNOValid" resultType="com.zd.chemical.domain.HxpAlarmRecord">
         <include refid="selectHxpAlarmRecordListVo"/>
         <where>
@@ -188,35 +175,20 @@
         insert into hxp_alarm_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="alarmContent != null">alarm_content,</if>
-
             <if test="alarmType != null">alarm_type,</if>
-
             <if test="alarmMode != null">alarm_mode,</if>
-
             <if test="subId != null">sub_id,</if>
-
             <if test="terminalNum != null">terminal_num,</if>
-
             <if test="alarmTime != null">alarm_time,</if>
-
             <if test="handlingTime != null">handling_time,</if>
-
             <if test="handlingUserId != null">handling_user_id,</if>
-
             <if test="handlingStatus != null">handling_status,</if>
-
             <if test="handlingContent != null">handling_content,</if>
-
             <if test="liableUserIds != null">liable_user_ids,</if>
-
             <if test="hasValid != null">has_valid,</if>
-
             <if test="stockId != null">stock_id,</if>
-
             <if test="userecordId != null">userecord_id,</if>
-
             <if test="parentId != null">parent_id,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="alarmContent != null">#{alarmContent},</if>

zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpCabinetMapper.xml

@@ -5,17 +5,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.chemical.mapper.HxpCabinetMapper">
 
     <resultMap type="com.zd.chemical.domain.HxpCabinet" id="HxpCabinetResult">
-        <result property="id"    column="id"    />
-        <result property="cabinetNum"    column="cabinet_num"    />
-        <result property="cabinetName"    column="cabinet_name"    />
-        <result property="subId"    column="sub_id"    />
-        <result property="cabinetStatus"    column="cabinet_status"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="cabinetNum" column="cabinet_num"/>
+        <result property="cabinetName" column="cabinet_name"/>
+        <result property="subId" column="sub_id"/>
+        <result property="cabinetStatus" column="cabinet_status"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectHxpCabinetVo">
@@ -96,7 +96,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getCabinetByChemicalDetail" parameterType="com.zd.chemical.domain.vo.HxpCabinetInclusionChemicalVo" resultType="com.zd.chemical.domain.vo.HxpCabinetInclusionChemicalSon">
-
         select cjc.`join_num` joinNum,(SELECT he.name FROM lab_hardware he WHERE he.id = cjc.cabinetlock_id) lockName,
         (select ccy.`classify_name` from hxp_chemical_classify ccy where ccy.`id` = cl.`chemical_classify`) classifyName,
         (SELECT GROUP_CONCAT(CONCAT(dda.dict_label,'(',cl.chemical_unit,')')) FROM sys_dict_data dda WHERE dda.dict_type = 'chemical_shape' AND dda.dict_value = cl.chemical_shape) chemicalShape,
@@ -189,38 +188,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertHxpCabinet" parameterType="com.zd.chemical.domain.HxpCabinet" useGeneratedKeys="true" keyProperty="id">
         insert into hxp_cabinet
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="cabinetNum != null">cabinet_num,</if>
-
-    <if test="cabinetName != null">cabinet_name,</if>
-
-    <if test="subId != null">sub_id,</if>
-
-    <if test="cabinetStatus != null">cabinet_status,</if>
-
-    <if test="userId != null">user_id,</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="remark != null">remark,</if>
-
+            <if test="cabinetNum != null">cabinet_num,</if>
+            <if test="cabinetName != null">cabinet_name,</if>
+            <if test="subId != null">sub_id,</if>
+            <if test="cabinetStatus != null">cabinet_status,</if>
+            <if test="userId != null">user_id,</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="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="cabinetNum != null">#{cabinetNum},</if>
-    <if test="cabinetName != null">#{cabinetName},</if>
-    <if test="subId != null">#{subId},</if>
-    <if test="cabinetStatus != null">#{cabinetStatus},</if>
-    <if test="userId != null">#{userId},</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="remark != null">#{remark},</if>
+            <if test="cabinetNum != null">#{cabinetNum},</if>
+            <if test="cabinetName != null">#{cabinetName},</if>
+            <if test="subId != null">#{subId},</if>
+            <if test="cabinetStatus != null">#{cabinetStatus},</if>
+            <if test="userId != null">#{userId},</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="remark != null">#{remark},</if>
          </trim>
     </insert>
 

zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpCabinetlockLogMapper.xml

@@ -15,7 +15,6 @@
         <result property="userIds" column="user_ids"/>
         <result property="createTime" column="create_time"/>
         <result property="createBy" column="create_by"/>
-
         <result property="stockId" column="stock_id"/>
         <result property="userecordId" column="userecord_id"/>
     </resultMap>
@@ -35,6 +34,7 @@
                userecord_id
         from hxp_cabinetlock_log
     </sql>
+
     <sql id="selectHxpCabinetlockLogListVo">
         select t.id,
                t.cabinetlock_id,
@@ -50,6 +50,7 @@
                t.userecord_id
         from hxp_cabinetlock_log as t
     </sql>
+
     <select id="selectHxpCabinetlockLogList" parameterType="com.zd.chemical.domain.vo.HxpCabinetlockLogSearch"
             resultType="com.zd.chemical.domain.vo.HxpCabinetlockLogVo">
         select DISTINCT
@@ -113,6 +114,7 @@
         <include refid="selectHxpCabinetlockLogVo"/>
         where id = #{id}
     </select>
+
     <select id="selectByLockId" resultType="com.zd.chemical.domain.HxpCabinetlockLog">
         <include refid="selectHxpCabinetlockLogVo"/>
         where cabinetlock_id = (select id from lab_hardware where subject_id = #{subId} and lock_id = #{lockId} limit 1)
@@ -126,27 +128,16 @@
         insert into hxp_cabinetlock_log
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="cabinetlockId != null">cabinetlock_id,</if>
-
             <if test="unLockTime != null">un_lock_time,</if>
-
             <if test="closeLockTime != null">close_lock_time,</if>
-
             <if test="operationType != null">operation_type,</if>
-
             <if test="unLockVideo != null">un_lock_video,</if>
-
             <if test="closeLockVideo != null">close_lock_video,</if>
-
             <if test="userIds != null">user_ids,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="stockId != null">stock_id,</if>
             <if test="userecordId != null">userecord_id,</if>
-
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="cabinetlockId != null">#{cabinetlockId},</if>

zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpChemicalClassifyMapper.xml

@@ -5,15 +5,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.chemical.mapper.HxpChemicalClassifyMapper">
 
     <resultMap type="com.zd.chemical.domain.HxpChemicalClassify" id="HxpChemicalClassifyResult">
-        <result property="id"    column="id"    />
-        <result property="parentId"    column="parent_id"    />
-        <result property="ancestors"    column="ancestors"    />
-        <result property="classifyName"    column="classify_name"    />
-        <result property="hazardLevel"    column="hazard_level"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
+        <result property="id" column="id"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="ancestors" column="ancestors"/>
+        <result property="classifyName" column="classify_name"/>
+        <result property="hazardLevel" column="hazard_level"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectHxpChemicalClassifyVo">
@@ -40,32 +40,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertHxpChemicalClassify" parameterType="com.zd.chemical.domain.HxpChemicalClassify" useGeneratedKeys="true" keyProperty="id">
         insert into hxp_chemical_classify
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="parentId != null">parent_id,</if>
-
-    <if test="ancestors != null">ancestors,</if>
-
-    <if test="classifyName != null">classify_name,</if>
-
-    <if test="hazardLevel != null">hazard_level,</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="parentId != null">parent_id,</if>
+            <if test="ancestors != null">ancestors,</if>
+            <if test="classifyName != null">classify_name,</if>
+            <if test="hazardLevel != null">hazard_level,</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>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="parentId != null">#{parentId},</if>
-    <if test="ancestors != null">#{ancestors},</if>
-    <if test="classifyName != null">#{classifyName},</if>
-    <if test="hazardLevel != null">#{hazardLevel},</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="parentId != null">#{parentId},</if>
+            <if test="ancestors != null">#{ancestors},</if>
+            <if test="classifyName != null">#{classifyName},</if>
+            <if test="hazardLevel != null">#{hazardLevel},</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>
          </trim>
     </insert>
 

zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpChemicalJoinCabinetMapper.xml

@@ -5,18 +5,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.chemical.mapper.HxpChemicalJoinCabinetMapper">
 
     <resultMap type="com.zd.chemical.domain.HxpChemicalJoinCabinet" id="HxpChemicalJoinCabinetResult">
-        <result property="id"    column="id"    />
-        <result property="joinNum"    column="join_num"    />
-        <result property="subId"    column="sub_id"    />
-        <result property="chemicalId"    column="chemical_id"    />
-        <result property="cabinetId"    column="cabinet_id"    />
-        <result property="chemicalAmount"    column="chemical_amount"    />
-        <result property="chemicalAmountUnit"    column="chemical_amount_unit"    />
-        <result property="expireTime"    column="expire_time"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="status"    column="status"    />
+        <result property="id" column="id"/>
+        <result property="joinNum" column="join_num"/>
+        <result property="subId" column="sub_id"/>
+        <result property="chemicalId" column="chemical_id"/>
+        <result property="cabinetId" column="cabinet_id"/>
+        <result property="chemicalAmount" column="chemical_amount"/>
+        <result property="chemicalAmountUnit" column="chemical_amount_unit"/>
+        <result property="expireTime" column="expire_time"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="status" column="status"/>
     </resultMap>
 
     <sql id="selectHxpChemicalJoinCabinetVo">
@@ -155,8 +155,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where chemical_id = #{id}
     </select>
 
-
-
     <select id="selectChemicalListById" parameterType="com.zd.chemical.domain.HxpChemicalJoinCabinet" resultType="com.zd.chemical.domain.HxpChemicalJoinCabinet">
         SELECT
         jo.id joinId,
@@ -179,44 +177,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertHxpChemicalJoinCabinet" parameterType="com.zd.chemical.domain.HxpChemicalJoinCabinet" useGeneratedKeys="true" keyProperty="id">
         insert into hxp_chemical_join_cabinet
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="joinNum != null">join_num,</if>
-
-    <if test="subId != null">sub_id,</if>
-
-    <if test="chemicalId != null">chemical_id,</if>
-
-    <if test="cabinetId != null">cabinet_id,</if>
-
-    <if test="cabinetlockId != null">cabinetlock_id,</if>
-
-    <if test="chemicalAmount != null">chemical_amount,</if>
-
-    <if test="chemicalAmountUnit != null">chemical_amount_unit,</if>
-
-    <if test="expireTime != null">expire_time,</if>
-
-    <if test="userId != null">user_id,</if>
-
-    <if test="createBy != null">create_by,</if>
-
-    <if test="createTime != null">create_time,</if>
-
-    <if test="tare != null">tare,</if>
-
+            <if test="joinNum != null">join_num,</if>
+            <if test="subId != null">sub_id,</if>
+            <if test="chemicalId != null">chemical_id,</if>
+            <if test="cabinetId != null">cabinet_id,</if>
+            <if test="cabinetlockId != null">cabinetlock_id,</if>
+            <if test="chemicalAmount != null">chemical_amount,</if>
+            <if test="chemicalAmountUnit != null">chemical_amount_unit,</if>
+            <if test="expireTime != null">expire_time,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="tare != null">tare,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="joinNum != null">#{joinNum},</if>
-    <if test="subId != null">#{subId},</if>
-    <if test="chemicalId != null">#{chemicalId},</if>
-    <if test="cabinetId != null">#{cabinetId},</if>
-    <if test="cabinetlockId != null">#{cabinetlockId},</if>
-    <if test="chemicalAmount != null">#{chemicalAmount},</if>
-    <if test="chemicalAmountUnit != null">#{chemicalAmountUnit},</if>
-    <if test="expireTime != null">#{expireTime},</if>
-    <if test="userId != null">#{userId},</if>
-    <if test="createBy != null">#{createBy},</if>
-    <if test="createTime != null">#{createTime},</if>
-    <if test="tare != null">#{tare},</if>
+            <if test="joinNum != null">#{joinNum},</if>
+            <if test="subId != null">#{subId},</if>
+            <if test="chemicalId != null">#{chemicalId},</if>
+            <if test="cabinetId != null">#{cabinetId},</if>
+            <if test="cabinetlockId != null">#{cabinetlockId},</if>
+            <if test="chemicalAmount != null">#{chemicalAmount},</if>
+            <if test="chemicalAmountUnit != null">#{chemicalAmountUnit},</if>
+            <if test="expireTime != null">#{expireTime},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="tare != null">#{tare},</if>
          </trim>
     </insert>
 

zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpChemicalMapper.xml

@@ -28,7 +28,6 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
-
         <result property="criticality" column="criticality"/>
     </resultMap>
 
@@ -139,55 +138,30 @@
         insert into hxp_chemical
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="chemicalNum != null">chemical_num,</if>
-
             <if test="chemicalName != null">chemical_name,</if>
-
             <if test="chemicalClassify != null">chemical_classify,</if>
-
             <if test="classifyAttribute != null">classify_attribute,</if>
-
             <if test="chemicalShape != null">chemical_shape,</if>
-
             <if test="labelType != null">label_type,</if>
-
             <if test="measuringMethod != null">measuring_method,</if>
-
             <if test="chemicalUnit != null">chemical_unit,</if>
-
             <if test="verification != null">verification,</if>
-
             <if test="anotherName != null">another_name,</if>
-
             <if test="casNum != null">cas_num,</if>
-
             <if test="factory != null">factory,</if>
-
             <if test="purity != null">purity,</if>
-
             <if test="collectHour != null">collect_hour,</if>
-
             <if test="collectMinute != null">collect_minute,</if>
-
             <if test="userId != null">user_id,</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="remark != null">remark,</if>
-
             <if test="chemicalNamePinyin != null">chemical_name_pinyin,</if>
-
             <if test="chemicalNameChar != null">chemical_name_char,</if>
-
             <if test="anotherNamePinyin != null">another_name_pinyin,</if>
-
             <if test="anotherNameChar != null">another_name_char,</if>
-
             <if test="criticality != null">criticality,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -213,13 +187,9 @@
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
             <if test="chemicalNamePinyin != null">#{chemicalNamePinyin},</if>
-
             <if test="chemicalNameChar != null">#{chemicalNameChar},</if>
-
             <if test="anotherNamePinyin != null">#{anotherNamePinyin},</if>
-
             <if test="anotherNameChar != null">#{anotherNameChar},</if>
-
             <if test="criticality != null">#{criticality},</if>
         </trim>
     </insert>
@@ -249,12 +219,10 @@
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
-
             <if test="chemicalNamePinyin != null">chemical_name_pinyin = #{chemicalNamePinyin},</if>
             <if test="chemicalNameChar != null">chemical_name_char = #{chemicalNameChar},</if>
             <if test="anotherNamePinyin != null">another_name_pinyin = #{anotherNamePinyin},</if>
             <if test="anotherNameChar != null">another_name_char = #{anotherNameChar},</if>
-
             <if test="criticality != null">criticality = #{criticality},</if>
 
         </trim>
@@ -280,7 +248,6 @@
         </foreach>
     </delete>
 
-
     <select id="chemicalUsageCount" parameterType="com.zd.chemical.domain.HxpChemical"
             resultType="com.zd.chemical.domain.vo.HxpHomeChemicalVo">
         SELECT
@@ -427,35 +394,6 @@
         )x2 ON FIND_IN_SET( x1.dict_value, x2.classify_attribute )
         GROUP BY x1.dict_value
         )xx2
-
-        <!--SELECT xx.* FROM (SELECT x1.dict_label classifyAttribute,CONCAT(CASE WHEN x2.chemical_name IS NULL THEN 0 ELSE COUNT(0) END,'')-->
-        <!--chemicalMix FROM (-->
-        <!--select xx1.* from(SELECT dda.`dict_label`,dda.dict_value-->
-        <!--FROM sys_dict_data dda-->
-        <!--WHERE dda.dict_type = 'hxp_classifyattribute'-->
-        <!--ORDER BY dda.`dict_sort`-->
-        <!--)xx1-->
-        <!--union all-->
-        <!--select '其他' dict_label,99 dict_value from dual-->
-        <!--)x1-->
-        <!--LEFT JOIN-->
-        <!--(-->
-        <!--select xx.chemical_name,case when xx.classify_attribute='' or xx.classify_attribute is null then 99 else-->
-        <!--xx.classify_attribute end classify_attribute from (-->
-        <!--SELECT cl.chemical_name,cl.classify_attribute-->
-        <!--FROM hxp_stock sk-->
-        <!--INNER JOIN hxp_chemical_join_cabinet cjc ON sk.join_id= cjc.id-->
-        <!--INNER JOIN hxp_chemical cl ON cjc.`chemical_id` = cl.`id`-->
-        <!--LEFT JOIN sys_user ur on cl.user_id = ur.user_id-->
-        <!--<where>-->
-            <!--&lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
-            <!--${params.dataScope}-->
-        <!--</where>-->
-        <!--GROUP BY cl.chemical_num-->
-        <!--)xx-->
-        <!--)x2 ON FIND_IN_SET( x1.dict_value, x2.classify_attribute )-->
-        <!--GROUP BY x1.dict_value-->
-        <!--)xx where xx.chemicalMix>0 order by xx.chemicalMix desc-->
     </select>
 
     <select id="stockTotal" parameterType="com.zd.chemical.domain.HxpChemical" resultType="java.lang.Long">
@@ -526,6 +464,5 @@
             ) s
             group by s.subId
         ) t
-
     </select>
 </mapper>

zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpClassifyConfigMapper.xml

@@ -5,14 +5,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.chemical.mapper.HxpClassifyConfigMapper">
 
     <resultMap type="com.zd.chemical.domain.HxpClassifyConfig" id="HxpClassifyConfigResult">
-        <result property="id"    column="id"    />
-        <result property="joinClassifyId"    column="join_classify_id"    />
-        <result property="joinStatus"    column="join_status"    />
-        <result property="outStatus"    column="out_status"    />
-        <result property="collectStatus"    column="collect_status"    />
-        <result property="returnStatus"    column="return_status"    />
-        <result property="labelType"    column="label_type"    />
-        <result property="printCode"    column="print_code"    />
+        <result property="id" column="id"/>
+        <result property="joinClassifyId" column="join_classify_id"/>
+        <result property="joinStatus" column="join_status"/>
+        <result property="outStatus" column="out_status"/>
+        <result property="collectStatus" column="collect_status"/>
+        <result property="returnStatus" column="return_status"/>
+        <result property="labelType" column="label_type"/>
+        <result property="printCode" column="print_code"/>
     </resultMap>
 
     <sql id="selectHxpClassifyConfigVo">
@@ -40,29 +40,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertHxpClassifyConfig" parameterType="com.zd.chemical.domain.HxpClassifyConfig" useGeneratedKeys="true" keyProperty="id">
         insert into hxp_classify_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="joinClassifyId != null">join_classify_id,</if>
-
-    <if test="joinStatus != null">join_status,</if>
-
-    <if test="outStatus != null">out_status,</if>
-
-    <if test="collectStatus != null">collect_status,</if>
-
-    <if test="returnStatus != null">return_status,</if>
-
-    <if test="labelType != null">label_type,</if>
-
-    <if test="printCode != null">print_code,</if>
-
+            <if test="joinClassifyId != null">join_classify_id,</if>
+            <if test="joinStatus != null">join_status,</if>
+            <if test="outStatus != null">out_status,</if>
+            <if test="collectStatus != null">collect_status,</if>
+            <if test="returnStatus != null">return_status,</if>
+            <if test="labelType != null">label_type,</if>
+            <if test="printCode != null">print_code,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="joinClassifyId != null">#{joinClassifyId},</if>
-    <if test="joinStatus != null">#{joinStatus},</if>
-    <if test="outStatus != null">#{outStatus},</if>
-    <if test="collectStatus != null">#{collectStatus},</if>
-    <if test="returnStatus != null">#{returnStatus},</if>
-    <if test="labelType != null">#{labelType},</if>
-    <if test="printCode != null">#{printCode},</if>
+            <if test="joinClassifyId != null">#{joinClassifyId},</if>
+            <if test="joinStatus != null">#{joinStatus},</if>
+            <if test="outStatus != null">#{outStatus},</if>
+            <if test="collectStatus != null">#{collectStatus},</if>
+            <if test="returnStatus != null">#{returnStatus},</if>
+            <if test="labelType != null">#{labelType},</if>
+            <if test="printCode != null">#{printCode},</if>
          </trim>
     </insert>
 

zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpSmartTerminalConfigMapper.xml

@@ -5,11 +5,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.chemical.mapper.HxpSmartTerminalConfigMapper">
 
     <resultMap type="com.zd.chemical.domain.HxpSmartTerminalConfig" id="HxpSmartTerminalConfigResult">
-        <result property="id"    column="id"    />
-        <result property="terminalId"    column="terminal_id"    />
-        <result property="subId"    column="sub_id"    />
-        <result property="ringTime"    column="ring_time"    />
-        <result property="dealTime"    column="deal_time"    />
+        <result property="id" column="id"/>
+        <result property="terminalId" column="terminal_id"/>
+        <result property="subId" column="sub_id"/>
+        <result property="ringTime" column="ring_time"/>
+        <result property="dealTime" column="deal_time"/>
     </resultMap>
 
     <sql id="selectHxpSmartTerminalConfigVo">
@@ -38,20 +38,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertHxpSmartTerminalConfig" parameterType="com.zd.chemical.domain.HxpSmartTerminalConfig" useGeneratedKeys="true" keyProperty="id">
         insert into hxp_smart_terminal_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="terminalId != null">terminal_id,</if>
-
-    <if test="subId != null">sub_id,</if>
-
-    <if test="ringTime != null">ring_time,</if>
-
-    <if test="dealTime != null">deal_time,</if>
-
+            <if test="terminalId != null">terminal_id,</if>
+            <if test="subId != null">sub_id,</if>
+            <if test="ringTime != null">ring_time,</if>
+            <if test="dealTime != null">deal_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="terminalId != null">#{terminalId},</if>
-    <if test="subId != null">#{subId},</if>
-    <if test="ringTime != null">#{ringTime},</if>
-    <if test="dealTime != null">#{dealTime},</if>
+            <if test="terminalId != null">#{terminalId},</if>
+            <if test="subId != null">#{subId},</if>
+            <if test="ringTime != null">#{ringTime},</if>
+            <if test="dealTime != null">#{dealTime},</if>
          </trim>
     </insert>
 

zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpSmartTerminalMapper.xml

@@ -124,33 +124,19 @@
         insert into hxp_smart_terminal
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="terminalNum != null">terminal_num,</if>
-
             <if test="subId != null">sub_id,</if>
-
             <if test="terminalStatus != null">terminal_status,</if>
-
             <if test="status != null">status,</if>
-
             <if test="terminalType != null">terminal_type,</if>
-
             <if test="relayNum != null">relay_num,</if>
-
             <if test="routeNum != null">route_num,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="ipAddress != null">ip_address,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="remark != null">remark,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="terminalNum != null">#{terminalNum},</if>

zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpStockMapper.xml

@@ -429,8 +429,6 @@
                 case when sk.out_two_user is not null then '、' else '' end,
                 ifnull((SELECT ur.nick_name FROM sys_user ur WHERE ur.user_id = sk.out_two_user), "")) verify,
                 ll.close_lock_video
-
-
         FROM hxp_stock sk LEFT JOIN hxp_chemical_join_cabinet cjc ON sk.join_id = cjc.id
         LEFT JOIN hxp_chemical cl ON cjc.chemical_id = cl.id
         LEFT JOIN hxp_cabinet ct ON ct.id = cjc.cabinet_id
@@ -589,8 +587,6 @@
                st.safe_user_id as safeUserId
         FROM hxp_stock sk LEFT JOIN lab_subject st ON sk.sub_id = st.`id`
         WHERE sk.status = 1 AND DATE_FORMAT(sk.expiration_time,'%Y-%m-%d') < DATE_FORMAT(NOW(),'%Y-%m-%d')
-
-
     </select>
 
     <insert id="insertHxpStock" parameterType="com.zd.chemical.domain.HxpStock" useGeneratedKeys="true"
@@ -598,82 +594,44 @@
         insert into hxp_stock
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="joinId != null">join_id,</if>
-
             <if test="chemicalNum != null">chemical_num,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="chemicalName != null">chemical_name,</if>
-
             <if test="createBy != null and createBy != ''">create_by,</if>
-
             <if test="cabinetNum != null">cabinet_num,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="cabinetName != null">cabinet_name,</if>
-
             <if test="updateBy != null and updateBy != ''">update_by,</if>
-
             <if test="chemicalClassify != null">chemical_classify,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="remark != null">remark,</if>
-
             <if test="status != null">status,</if>
-
             <if test="chemicalShape != null">chemical_shape,</if>
-
             <if test="labelType != null">label_type,</if>
-
             <if test="printCode != null">print_code,</if>
-
             <if test="joinType != null">join_type,</if>
-
             <if test="joinUserId != null">join_user_id,</if>
-
             <if test="joinTime != null">join_time,</if>
-
             <if test="expirationTime != null">expiration_time,</if>
-
             <if test="measuringMethod != null">measuring_method,</if>
-
             <if test="chemicalUnit != null and chemicalUnit != ''">chemical_unit,</if>
-
             <if test="verification != null">verification,</if>
-
             <if test="anotherName != null and anotherName != ''">another_name,</if>
-
             <if test="casNum != null and casNum != ''">cas_num,</if>
-
             <if test="factory != null and factory != ''">factory,</if>
-
             <if test="purity != null and purity != ''">purity,</if>
-
             <if test="joinOneUser != null">join_one_user,</if>
-
             <if test="joinTwoUser != null">join_two_user,</if>
-
             <if test="joinVideo != null">join_video,</if>
-
             <if test="tagCode != null">tag_code,</if>
-
             <if test="rfidCode != null">rfid_code,</if>
-
             <if test="usages != null">usages,</if>
-
             <if test="outUserId != null">out_user_id,</if>
-
             <if test="outOneUser != null">out_one_user,</if>
             <if test="outTwoUser != null">out_two_user,</if>
-
             <if test="outTime != null">out_time,</if>
-
             <if test="outUsages != null">out_usages,</if>
-
             <if test="subId != null">sub_id,</if>
-
             <if test="tare != null">tare,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -739,7 +697,6 @@
             <if test="chemicalShape != null">chemical_shape = #{chemicalShape},</if>
             <if test="labelType != null">label_type = #{labelType},</if>
             <if test="printCode != null">print_code = #{printCode},</if>
-
             <if test="joinType != null">join_type = #{joinType},</if>
             <if test="joinUserId != null">join_user_id = #{joinUserId},</if>
             <if test="joinTime != null">join_time = #{joinTime},</if>
@@ -756,13 +713,10 @@
             <if test="joinVideo != null">join_video = #{joinVideo},</if>
             <if test="tagCode != null">tag_code = #{tagCode},</if>
             <if test="rfidCode != null">rfid_code = #{rfidCode},</if>
-
             <if test="usages != null">usages = #{usages},</if>
             <if test="outUserId != null">out_user_id = #{outUserId},</if>
-
             <if test="outOneUser != null">out_one_user = #{outOneUser},</if>
             <if test="outTwoUser != null">out_two_user = #{outTwoUser},</if>
-
             <if test="outTime != null">out_time = #{outTime},</if>
             <if test="outUsages != null">out_usages = #{outUsages},</if>
             <if test="subId != null">sub_id = #{subId},</if>

zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpUserecordMapper.xml

@@ -22,13 +22,10 @@
         <result property="collectNowNum" column="collect_now_num"/>
         <result property="collectStockNum" column="collect_stock_num"/>
         <result property="useStatus" column="use_status"/>
-
         <result property="backOneUser" column="back_one_user"/>
         <result property="backTwoUser" column="back_two_user"/>
-
         <result property="outVideo" column="out_video"/>
         <result property="returnVideo" column="return_video"/>
-
     </resultMap>
 
     <sql id="selectHxpUserecordVo">
@@ -238,7 +235,6 @@
 
     </select>
 
-
     <resultMap type="com.zd.chemical.domain.vo.HxpUserecordDetailVo" id="HxpUserecordDetailResult">
         <result property="id" column="id"/>
         <result property="chemicalName" column="chemicalName"/>
@@ -352,46 +348,27 @@
         insert into hxp_userecord
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="stockId != null">stock_id,</if>
-
             <if test="outOneUser != null">out_one_user,</if>
-
             <if test="outTwoUser != null">out_two_user,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="collectTime != null">collect_time,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="returnTime != null">return_time,</if>
-
             <if test="returnStockNum != null">return_stock_num,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="returnType != null">return_type,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="remark != null">remark,</if>
-
             <if test="collectNowNum != null">collect_now_num,</if>
-
             <if test="collectStockNum != null">collect_stock_num,</if>
-
             <if test="useStatus != null">use_status,</if>
-
             <if test="backOneUser != null">back_one_user,</if>
             <if test="backTwoUser != null">back_two_user,</if>
-
             <if test="lossAmount != null">loss_amount,</if>
             <if test="outType != null">out_type,</if>
-
             <if test="outVideo != null">out_video,</if>
             <if test="returnVideo != null">return_video,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stockId != null">#{stockId},</if>
@@ -410,13 +387,10 @@
             <if test="collectNowNum != null">#{collectNowNum},</if>
             <if test="collectStockNum != null">#{collectStockNum},</if>
             <if test="useStatus != null">#{useStatus},</if>
-
             <if test="backOneUser != null">#{backOneUser},</if>
             <if test="backTwoUser != null">#{backTwoUser},</if>
-
             <if test="lossAmount != null">#{lossAmount},</if>
             <if test="outType != null">#{outType},</if>
-
             <if test="outVideo != null">#{outVideo},</if>
             <if test="returnVideo != null">#{returnVideo},</if>
         </trim>
@@ -441,10 +415,8 @@
             <if test="collectNowNum != null">collect_now_num = #{collectNowNum},</if>
             <if test="collectStockNum != null">collect_stock_num = #{collectStockNum},</if>
             <if test="useStatus != null">use_status = #{useStatus},</if>
-
             <if test="backOneUser != null">back_one_user = #{backOneUser},</if>
             <if test="backTwoUser != null">back_two_user = #{backTwoUser},</if>
-
             <if test="outVideo != null">out_video = #{outVideo},</if>
             <if test="returnVideo != null">return_video = #{returnVideo},</if>
         </trim>

zd-modules/zd-chemical/src/main/resources/mapper/chemical/SydSmsLogMapper.xml

@@ -16,7 +16,6 @@
         <result property="updateTime" column="update_time"/>
         <result property="purpose" column="purpose"/>
         <result property="lockApplyId" column="lock_apply_id"/>
-
     </resultMap>
 
     <sql id="selectSydSmsLogVo">
@@ -78,27 +77,16 @@
     <insert id="insertSydSmsLog" parameterType="com.zd.chemical.domain.SydSmsLog">
         insert into syd_sms_log
         <trim prefix="(" suffix=")" suffixOverrides=",">
-
             <if test="phone != null and phone != ''">phone,</if>
-
             <if test="content != null">content,</if>
-
             <if test="uuid != null">uuid,</if>
-
             <if test="status != null">status,</if>
-
             <if test="reply != null">reply,</if>
-
             <if test="replyContent != null">reply_content,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="purpose != null">purpose,</if>
-
             <if test="lockApplyId != null">lock_apply_id,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="phone != null and phone != ''">#{phone},</if>

zd-modules/zd-exam/src/main/resources/mapper/exam/ElCategoryMapper.xml

@@ -86,29 +86,17 @@
         insert into el_category
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="title != null and title != ''">title,</if>
-
             <if test="parentId != null">parent_id,</if>
-
             <if test="level != null">level,</if>
-
             <if test="type != null">type,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="remark != null">remark,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="title != null and title != ''">#{title},</if>

zd-modules/zd-exam/src/main/resources/mapper/exam/ElChapterLearnRecordMapper.xml

@@ -138,43 +138,24 @@
         insert into el_chapter_learn_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="userId != null">user_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="remark != null">remark,</if>
-
             <if test="courseId != null">course_id,</if>
-
             <if test="chapterId != null">chapter_id,</if>
-
             <if test="joinUserId != null">join_user_id,</if>
-
             <if test="status != null">status,</if>
-
             <if test="progress != null">progress,</if>
-
             <if test="duration != null">duration,</if>
-
             <if test="totalEff != null">total_eff,</if>
-
             <if test="currentExer != null">current_exer,</if>
-
             <if test="startTime != null">start_time,</if>
-
             <if test="lastTime != null">last_time,</if>
-
             <if test="watchTime != null">watch_time,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>

zd-modules/zd-exam/src/main/resources/mapper/exam/ElConvertRecordMapper.xml

@@ -99,35 +99,20 @@
         insert into el_convert_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="userId != null">user_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="remark != null">remark,</if>
-
             <if test="type != null">type,</if>
-
             <if test="businessId != null">business_id,</if>
-
             <if test="businessNum != null">business_num,</if>
-
             <if test="status != null">status,</if>
-
             <if test="useNum != null">use_num,</if>
-
             <if test="convertNum != null">convert_num,</if>
-
             <if test="parentId != null">parent_id,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>

zd-modules/zd-exam/src/main/resources/mapper/exam/ElCourcesAccessRecordMapper.xml

@@ -68,25 +68,15 @@
         insert into el_course_access_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="userId != null">user_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="remark != null">remark,</if>
-
             <if test="courseId != null">course_id,</if>
-
             <if test="joinUserId != null">join_user_id,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>

zd-modules/zd-exam/src/main/resources/mapper/exam/ElCourseChapterMapper.xml

@@ -178,39 +178,22 @@
         insert into el_course_chapter
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="userId != null">user_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="remark != null">remark,</if>
-
             <if test="courseId != null">course_id,</if>
-
             <if test="title != null and title != ''">title,</if>
-
             <if test="parentId != null">parent_id,</if>
-
             <if test="position != null">position,</if>
-
             <if test="resourcesId != null">resources_id,</if>
-
             <if test="chapterData != null">chapter_data,</if>
-
             <if test="description != null and description != ''">description,</if>
-
             <if test="free != null">free,</if>
-
             <if test="type != null">type,</if>
-
             <if test="allowdownload != null">allowdownload,</if>
             <if test="duration != null">duration,</if>
             <if test="isAssess != null">is_assess,</if>

zd-modules/zd-exam/src/main/resources/mapper/exam/ElCourseChapterQuAnswerMapper.xml

@@ -71,23 +71,14 @@
             useGeneratedKeys="true" keyProperty="id">
         insert into el_course_chapter_qu_answer
         <trim prefix="(" suffix=")" suffixOverrides=",">
-
             <if test="courseChapterId != null">course_chapter_id,</if>
-
             <if test="courseChapterQuId != null">course_chapter_qu_id,</if>
-
             <if test="answerId != null">answer_id,</if>
-
             <if test="quId != null">qu_id,</if>
-
             <if test="isRight != null">is_right,</if>
-
             <if test="checked != null">checked,</if>
-
             <if test="sort != null">sort,</if>
-
             <if test="abc != null and abc != ''">abc,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="courseChapterId != null">#{courseChapterId},</if>

zd-modules/zd-exam/src/main/resources/mapper/exam/ElCourseChapterQuMapper.xml

@@ -104,37 +104,21 @@
         insert into el_course_chapter_qu
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="courseChapterId != null">course_chapter_id,</if>
-
             <if test="quId != null">qu_id,</if>
-
             <if test="quType != null">qu_type,</if>
-
             <if test="answered != null">answered,</if>
-
             <if test="answer != null">answer,</if>
-
             <if test="sort != null">sort,</if>
-
             <if test="score != null">score,</if>
-
             <if test="actualScore != null">actual_score,</if>
-
             <if test="isRight != null">is_right,</if>
-
             <if test="userId != null">user_id,</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="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="courseChapterId != null">#{courseChapterId},</if>

zd-modules/zd-exam/src/main/resources/mapper/exam/ElCourseMapper.xml

@@ -133,10 +133,8 @@
             <if test="videoDraggable != null ">and t.video_draggable = #{videoDraggable}</if>
             <if test="points != null ">and t.points = #{points}</if>
             <if test="settings != null  and settings != ''">and t.settings = #{settings}</if>
-
             <if test="scopeType != null and scopeType != ''">and find_in_set(#{scopeType}, t.scope_type)</if>
             <if test="deptIds != null and deptIds != ''">and find_in_set(#{deptIds}, t.dept_ids)</if>
-
             <if test="type != null ">and t.type = #{type}</if>
             <if test="beginTime != null and beginTime != ''">
                 AND date_format(t.create_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
@@ -203,60 +201,34 @@
         insert into el_course
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="userId != null">user_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="remark != null">remark,</if>
-
             <if test="cateId != null">cate_id,</if>
-
             <if test="title != null and title != ''">title,</if>
-
             <if test="pri != null">pri,</if>
-
             <if test="level != null">level,</if>
-
             <if test="orderRest != null">order_rest,</if>
-
             <if test="duration != null">duration,</if>
-
             <if test="label != null">label,</if>
-
             <if test="effectiveTime != null">effective_time,</if>
-
             <if test="ceType != null">ce_type,</if>
-
             <if test="ceTime != null">ce_time,</if>
-
             <if test="keywords != null">keywords,</if>
-
             <if test="img != null">img,</if>
-
             <if test="description != null">description,</if>
-
             <if test="status != null">status,</if>
-
             <if test="videoDraggable != null">video_draggable,</if>
-
             <if test="points != null">points,</if>
             <if test="machinePoints != null">machine_points,</if>
-
             <if test="settings != null">settings,</if>
             <if test="scopeType != null">scope_type,</if>
             <if test="deptIds != null">dept_ids,</if>
-
             <if test="type != null">type,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>

zd-modules/zd-exam/src/main/resources/mapper/exam/ElExamCertRelationMapper.xml

@@ -45,11 +45,8 @@
         insert into el_exam_cert_relation
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="examId != null">exam_id,</if>
-
             <if test="certId != null">cert_id,</if>
-
             <if test="createTime != null">create_time,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="examId != null">#{examId},</if>

zd-modules/zd-exam/src/main/resources/mapper/exam/ElExamClassifyMapper.xml

@@ -74,24 +74,15 @@
         insert into el_exam_classify
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="userId != null">user_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="remark != null">remark,</if>
-
             <if test="title != null and title != ''">title,</if>
             <if test="type != null">type,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>

zd-modules/zd-exam/src/main/resources/mapper/exam/ElExamMapper.xml

@@ -28,13 +28,10 @@
         <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
         <result property="deptId" column="dept_id" jdbcType="INTEGER"/>
         <result property="deptName" column="dept_name" jdbcType="VARCHAR"/>
-
         <result property="classifyIds" column="classify_ids" />
         <result property="courseIds" column="course_ids" />
-
         <result property="preFaceVerify" column="pre_face_verify" />
         <result property="endFaceVerify" column="end_face_verify" />
-
         <association property="classifyNames" column="classify_ids" javaType="string"
                      select="com.zd.exam.mapper.ElExamClassifyMapper.queryTitleyByIds"/>
 
@@ -209,9 +206,7 @@
             <!-- 数据范围过滤 -->
             ${params.dataScope}
         </where>
-
     </select>
-    <!-- (ex.open_type=1 OR (ex.open_type=3 and uc.user_id= #{userId}))-->
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">

zd-modules/zd-exam/src/main/resources/mapper/exam/ElExamQuAnswerMapper.xml

@@ -66,19 +66,12 @@
         insert into el_exam_qu_answer
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="examQuId != null">exam_qu_id,</if>
-
             <if test="answerId != null">answer_id,</if>
-
             <if test="quId != null">qu_id,</if>
-
             <if test="isRight != null">is_right,</if>
-
             <if test="checked != null">checked,</if>
-
             <if test="sort != null">sort,</if>
-
             <if test="abc != null and abc != ''">abc,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="examQuId != null">#{examQuId},</if>

zd-modules/zd-exam/src/main/resources/mapper/exam/ElExamQuMapper.xml

@@ -22,7 +22,6 @@
         <result property="updateTime" column="update_time"/>
         <result property="deptId" column="dept_id"/>
         <result property="deptName" column="dept_name"/>
-
         <result property="content" column="content"/>
         <result property="analysis" column="analysis"/>
     </resultMap>
@@ -124,37 +123,21 @@
         insert into el_exam_qu
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="examRepoId != null">exam_repo_id,</if>
-
             <if test="quId != null">qu_id,</if>
-
             <if test="quType != null">qu_type,</if>
-
             <if test="answered != null">answered,</if>
-
             <if test="answer != null">answer,</if>
-
             <if test="sort != null">sort,</if>
-
             <if test="score != null">score,</if>
-
             <if test="actualScore != null">actual_score,</if>
-
             <if test="isRight != null">is_right,</if>
-
             <if test="userId != null">user_id,</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="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="examRepoId != null">#{examRepoId},</if>

zd-modules/zd-exam/src/main/resources/mapper/exam/ElPassConfigdetailMapper.xml

@@ -5,25 +5,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.exam.mapper.ElPassConfigdetailMapper">
 
     <resultMap type="com.zd.exam.domain.ElPassConfigdetail" id="ElPassConfigdetailResult">
-        <result property="id"    column="id"    />
-        <result property="markconfigId"    column="markconfig_id"    />
-        <result property="beginScore"    column="begin_score"    />
-        <result property="endScore"    column="end_score"    />
-        <result property="warningStatus"    column="warning_status"    />
-        <result property="interviewStatus"    column="interview_status"    />
-        <result property="testStatus"    column="test_status"    />
-        <result property="learnStatus"    column="learn_status"    />
-        <result property="practiceStatus"    column="practice_status"    />
-        <result property="handleDay"    column="handle_day"    />
-        <result property="learnHour"    column="learn_hour"    />
-        <result property="learnMinute"    column="learn_minute"    />
-        <result property="numberTopics"    column="number_topics"    />
-        <result property="numberAccuracy"    column="number_accuracy"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="markconfigId" column="markconfig_id"/>
+        <result property="beginScore" column="begin_score"/>
+        <result property="endScore" column="end_score"/>
+        <result property="warningStatus" column="warning_status"/>
+        <result property="interviewStatus" column="interview_status"/>
+        <result property="testStatus" column="test_status"/>
+        <result property="learnStatus" column="learn_status"/>
+        <result property="practiceStatus" column="practice_status"/>
+        <result property="handleDay" column="handle_day"/>
+        <result property="learnHour" column="learn_hour"/>
+        <result property="learnMinute" column="learn_minute"/>
+        <result property="numberTopics" column="number_topics"/>
+        <result property="numberAccuracy" column="number_accuracy"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectElPassConfigdetailVo">
@@ -59,62 +59,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertElPassConfigdetail" parameterType="com.zd.exam.domain.ElPassConfigdetail" useGeneratedKeys="true" keyProperty="id">
         insert into el_pass_configdetail
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="markconfigId != null">markconfig_id,</if>
-
-    <if test="beginScore != null">begin_score,</if>
-
-    <if test="endScore != null">end_score,</if>
-
-    <if test="warningStatus != null">warning_status,</if>
-
-    <if test="interviewStatus != null">interview_status,</if>
-
-    <if test="testStatus != null">test_status,</if>
-
-    <if test="learnStatus != null">learn_status,</if>
-
-    <if test="practiceStatus != null">practice_status,</if>
-
-    <if test="handleDay != null">handle_day,</if>
-
-    <if test="learnHour != null">learn_hour,</if>
-
-    <if test="learnMinute != null">learn_minute,</if>
-
-    <if test="numberTopics != null">number_topics,</if>
-
-    <if test="numberAccuracy != null">number_accuracy,</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="remark != null">remark,</if>
-
+            <if test="markconfigId != null">markconfig_id,</if>
+            <if test="beginScore != null">begin_score,</if>
+            <if test="endScore != null">end_score,</if>
+            <if test="warningStatus != null">warning_status,</if>
+            <if test="interviewStatus != null">interview_status,</if>
+            <if test="testStatus != null">test_status,</if>
+            <if test="learnStatus != null">learn_status,</if>
+            <if test="practiceStatus != null">practice_status,</if>
+            <if test="handleDay != null">handle_day,</if>
+            <if test="learnHour != null">learn_hour,</if>
+            <if test="learnMinute != null">learn_minute,</if>
+            <if test="numberTopics != null">number_topics,</if>
+            <if test="numberAccuracy != null">number_accuracy,</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="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="markconfigId != null">#{markconfigId},</if>
-    <if test="beginScore != null">#{beginScore},</if>
-    <if test="endScore != null">#{endScore},</if>
-    <if test="warningStatus != null">#{warningStatus},</if>
-    <if test="interviewStatus != null">#{interviewStatus},</if>
-    <if test="testStatus != null">#{testStatus},</if>
-    <if test="learnStatus != null">#{learnStatus},</if>
-    <if test="practiceStatus != null">#{practiceStatus},</if>
-    <if test="handleDay != null">#{handleDay},</if>
-    <if test="learnHour != null">#{learnHour},</if>
-    <if test="learnMinute != null">#{learnMinute},</if>
-    <if test="numberTopics != null">#{numberTopics},</if>
-    <if test="numberAccuracy != null">#{numberAccuracy},</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="remark != null">#{remark},</if>
+            <if test="markconfigId != null">#{markconfigId},</if>
+            <if test="beginScore != null">#{beginScore},</if>
+            <if test="endScore != null">#{endScore},</if>
+            <if test="warningStatus != null">#{warningStatus},</if>
+            <if test="interviewStatus != null">#{interviewStatus},</if>
+            <if test="testStatus != null">#{testStatus},</if>
+            <if test="learnStatus != null">#{learnStatus},</if>
+            <if test="practiceStatus != null">#{practiceStatus},</if>
+            <if test="handleDay != null">#{handleDay},</if>
+            <if test="learnHour != null">#{learnHour},</if>
+            <if test="learnMinute != null">#{learnMinute},</if>
+            <if test="numberTopics != null">#{numberTopics},</if>
+            <if test="numberAccuracy != null">#{numberAccuracy},</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="remark != null">#{remark},</if>
          </trim>
     </insert>
 

zd-modules/zd-exam/src/main/resources/mapper/exam/ElPassMarkconfigMapper.xml

@@ -5,16 +5,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.exam.mapper.ElPassMarkconfigMapper">
 
     <resultMap type="com.zd.exam.domain.ElPassMarkconfig" id="ElPassMarkconfigResult">
-        <result property="id"    column="id"    />
-        <result property="passMark"    column="pass_mark"    />
-        <result property="gainSafeCert"    column="gain_safe_cert"    />
-        <result property="gainSubSafeCert"    column="gain_sub_safe_cert"    />
-        <result property="blackScore"    column="black_score"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="passMark" column="pass_mark"/>
+        <result property="gainSafeCert" column="gain_safe_cert"/>
+        <result property="gainSubSafeCert" column="gain_sub_safe_cert"/>
+        <result property="blackScore" column="black_score"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectElPassMarkconfigVo">
@@ -41,35 +41,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertElPassMarkconfig" parameterType="com.zd.exam.domain.ElPassMarkconfig" useGeneratedKeys="true" keyProperty="id">
         insert into el_pass_markconfig
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="passMark != null">pass_mark,</if>
-
-    <if test="gainSafeCert != null">gain_safe_cert,</if>
-
-    <if test="gainSubSafeCert != null">gain_sub_safe_cert,</if>
-
-    <if test="blackScore != null">black_score,</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="remark != null">remark,</if>
-
+            <if test="passMark != null">pass_mark,</if>
+            <if test="gainSafeCert != null">gain_safe_cert,</if>
+            <if test="gainSubSafeCert != null">gain_sub_safe_cert,</if>
+            <if test="blackScore != null">black_score,</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="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="passMark != null">#{passMark},</if>
-    <if test="gainSafeCert != null">#{gainSafeCert},</if>
-    <if test="gainSubSafeCert != null">#{gainSubSafeCert},</if>
-    <if test="blackScore != null">#{blackScore},</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="remark != null">#{remark},</if>
+            <if test="passMark != null">#{passMark},</if>
+            <if test="gainSafeCert != null">#{gainSafeCert},</if>
+            <if test="gainSubSafeCert != null">#{gainSubSafeCert},</if>
+            <if test="blackScore != null">#{blackScore},</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="remark != null">#{remark},</if>
          </trim>
     </insert>
 

zd-modules/zd-exam/src/main/resources/mapper/exam/ElPointsLoginfoMapper.xml

@@ -5,19 +5,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.exam.mapper.ElPointsLogInfoMapper">
 
     <resultMap type="com.zd.exam.domain.ElPointsLoginfo" id="ElPointsLoginfoResult">
-        <result property="id"    column="id"    />
-        <result property="pointsId"    column="points_id"    />
-        <result property="pointsType"    column="points_type"    />
-        <result property="points"    column="points"    />
-        <result property="surplusPoints"    column="surplus_points"    />
-        <result property="channelType"    column="channel_type"    />
-        <result property="channelSource"    column="channel_source"    />
-        <result property="messageContent"    column="message_content"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="pointsId" column="points_id"/>
+        <result property="pointsType" column="points_type"/>
+        <result property="points" column="points"/>
+        <result property="surplusPoints" column="surplus_points"/>
+        <result property="channelType" column="channel_type"/>
+        <result property="channelSource" column="channel_source"/>
+        <result property="messageContent" column="message_content"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectElPointsLoginfoVo">

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/LabMessageListener.java

@@ -1,5 +1,6 @@
 package com.zd.laboratory.event;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 import com.zd.laboratory.api.constant.RiskPlanConstants;
 import com.zd.laboratory.api.entity.SensorFunctionStatus;
@@ -29,6 +30,7 @@ public class LabMessageListener implements ApplicationListener<SensorLabMessageE
     public void onApplicationEvent(SensorLabMessageEvent sensorLabMessageEvent) {
         SubFunction<SensorFunctionStatus> message = sensorLabMessageEvent.getMessage();
         log.info("监听传感器入口——实验室Id======{}",message.getSubId());
+        log.info("监听传感器入口——传感器param==={}", JSON.toJSONString(message));
         //触发事件
         //没有实验室Id 不处理
         if (message.getSubId() == null) {

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabRiskPlanServiceImpl.java

@@ -765,7 +765,9 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 log.info("录制视频结束返回结果打印={}", JSON.toJSONString(r));
                 if (r.getCode() == HttpStatus.SUCCESS) {
                     com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(JSON.toJSONString(r.getData()));
-                    recordVideo = jsonObject.getString("data");
+                    if(jsonObject.getInteger("code") == HttpStatus.SUCCESS){
+                        recordVideo = jsonObject.getString("data");
+                    }
                 } else {
                     log.info("结束录制视频失败！");
                 }
@@ -776,7 +778,12 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             log.error("远程调用结束录制视频接口失败！{}", e);
         }
         //更新风险概要  recordVideo - 视频记录存放地址
-        String handlePerson = tokenService.getLoginUser().getNickName();
+        String handlePerson = "";
+        if(!Objects.isNull(tokenService.getLoginUser())){
+            handlePerson = tokenService.getLoginUser().getNickName();
+        }else {
+            handlePerson = "SYSTEM";
+        }
         labRiskPlanAbnormalDescService.updateLabRiskPlanAbnormalDesc(groupId, handlePerson, recordVideo);
     }
 
@@ -978,17 +985,26 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 R deviceList = remoteSpeakService.getDeviceList(1, 100, floorId, subjectId);
                 log.info("远程调用喇叭列表返回内容： deviceList={}", JSON.toJSONString(deviceList));
                 if (deviceList.getCode() == 200) {
+                    log.info("调用喇叭1");
                     List<Map<String, Object>> mapList = (List<Map<String, Object>>) deviceList.getData();
+                    log.info("调用喇叭2={}",JSON.toJSONString(mapList));
                     for (Map<String, Object> map : mapList) {
                         if (StringUtils.isNotNull(map.get("deviceSn")) && StringUtils.isNotNull(map.get("port"))) {
+                            log.info("调用喇叭3");
                             List<PlayVo> playVoList = new ArrayList<>();
                             PlayVo playVo = new PlayVo();
+                            log.info("调用喇叭4");
                             playVo.setSn(map.get("deviceSn") + "");
+                            log.info("调用喇叭5");
                             playVo.setDeviceIp(map.get("deviceIp") + "");
+                            log.info("调用喇叭6");
                             playVo.setPort(Integer.parseInt(map.get("port") + ""));
+                            log.info("调用喇叭7");
                             ParamVo paramVo = new ParamVo();
                             paramVo.setVol(Integer.parseInt(map.get("deviceVol").toString()));
+                            log.info("调用喇叭8");
                             playVo.setParams(paramVo);
+                            log.info("调用喇叭9");
                             playVoList.add(playVo);
                             log.info("远程调用喇叭播放音乐！url={},playVoList={}", audioSyntheses.get(0).getNewMusicUrl(), JSON.toJSONString(playVoList));
                             R r = remoteSpeakService.textParseUrlAppIps(audioSyntheses.get(0).getNewMusicUrl(), playVoList);
@@ -1004,7 +1020,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 log.info("合成音乐列表为空，此预案不触发音乐！riskPlanId={}", riskPlanId);
             }
         } catch (Exception e) {
-            log.error("开启喇叭失败！！！！！:" + e);
+            log.info("开启喇叭失败！={}",e);
         }
     }
 
@@ -1150,7 +1166,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             if (newPlanAbnormalLogList.size() > 0) {
                 LabRiskPlanAbnormalLog checkLog = newPlanAbnormalLogList.get(0);
                 //判断如果当前传感器匹配预案和日志表的预案相同，则不插入日志。过滤重复预案
-                if (!labRiskPlanLevel.getRiskPlanId().equals(checkLog.getRiskPlanId())) {
+                if (!labRiskPlanLevel.getId().equals(checkLog.getRiskPlanLevelId())) {
                     //这里调用旧预案结束动作的方法
                     overRiskPlanAction(checkLog.getRiskPlanId(), checkLog.getSubjectId());
                     groupId = labRiskPlanAbnormalGroup.getId();

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabSubjectManagerService.java

@@ -3,7 +3,6 @@ package com.zd.laboratory.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.zd.chemical.api.fegin.RemoteChemicalAlarmService;
@@ -19,10 +18,8 @@ import com.zd.laboratory.api.vo.HardwareCVO;
 import com.zd.laboratory.api.vo.LabSubClassVO;
 import com.zd.laboratory.api.vo.SenseValVO;
 import com.zd.laboratory.config.HardwareFunctionStatusConfig;
-import com.zd.laboratory.domain.LabSubject;
 import com.zd.laboratory.domain.*;
 import com.zd.laboratory.domain.dto.LabSubListQuery;
-import com.zd.laboratory.domain.vo.LabSubjectVO;
 import com.zd.laboratory.domain.vo.*;
 import com.zd.laboratory.mapper.*;
 import com.zd.laboratory.mqtt.entiy.EquipmentStatus;
@@ -147,12 +144,15 @@ public class LabSubjectManagerService {
         if (labHardware.getBit() == null) {
             logger.error("硬件不存在或未关联继电器！id：{},名称:{}", labHardware.getId(), labHardware.getName());
             return ResultData.fail(StrUtil.format("未关联继电器位！id：{}，名称：{}", labHardware.getId(), labHardware.getName()));
-
         }
         if(labHardware.getIsPcfire() == 1){
             logger.error("一键灭火设备不进行开关操作！");
             return ResultData.fail("一键灭火设备不进行开关操作！");
         }
+        if(labHardware.getType().equals(HardwareTypeEnum.AI_VENTILATION) && labHardware.getPcType() == 1){
+            logger.error("通风橱设备不进行开关操作！");
+            return ResultData.fail("通风橱设备不进行开关操作！");
+        }
 
         //新老继电器调用方法
         Symbol.command command = null;

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

@@ -63,27 +63,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertAlarmLog" parameterType="com.zd.algorithm.api.alarm.entity.AlarmLog" useGeneratedKeys="true" keyProperty="id">
         insert into alarm_log
         <trim prefix="(" suffix=")" suffixOverrides=",">
-        <if test="createTime != null">create_time,</if>
-        <if test="updateTime != null">update_time,</if>
-        <if test="phone != null">phone,</if>
-
-        <if test="status != null">status,</if>
-
-        <if test="notice != null">notice,</if>
-
-        <if test="method != null">method,</if>
-
-        <if test="isBack != null">is_back,</if>
-
-         </trim>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="phone != null">phone,</if>
+            <if test="status != null">status,</if>
+            <if test="notice != null">notice,</if>
+            <if test="method != null">method,</if>
+            <if test="isBack != null">is_back,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-        <if test="createTime != null">#{createTime},</if>
-        <if test="updateTime != null">#{updateTime},</if>
-        <if test="phone != null">#{phone},</if>
-        <if test="status != null">#{status},</if>
-        <if test="notice != null">#{notice},</if>
-        <if test="method != null">#{method},</if>
-        <if test="isBack != null">#{isBack},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="status != null">#{status},</if>
+            <if test="notice != null">#{notice},</if>
+            <if test="method != null">#{method},</if>
+            <if test="isBack != null">#{isBack},</if>
          </trim>
     </insert>
 

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

@@ -21,12 +21,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          ORDER BY la.id desc
     </select>
 
-
     <select id="getId"  resultType="com.zd.model.entity.Algorithm">
         select * from lab_algorithm where id=#{id}
     </select>
 
-
     <insert id="insertBatchAlgorithm" parameterType="com.zd.model.entity.Algorithm" >
         insert into lab_algorithm
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -55,7 +53,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </insert>
 
-
     <update id="update" parameterType="com.zd.model.entity.Algorithm">
         update lab_algorithm set algorithm_type=#{algorithmType},algorithm_name=#{algorithmName} where id=#{id}
     </update>

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

@@ -5,17 +5,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.ApkFileUpLoadMapper">
 
     <resultMap type="com.zd.laboratory.onemachine.domain.ApkUpload" id="ApkUploadResult">
-        <result property="id"    column="id"    />
-        <result property="apkName"    column="apk_name"    />
-        <result property="apkFileUpload"    column="apk_file_upload"    />
-        <result property="version"    column="version"    />
-        <result property="versionName"    column="version_name"    />
-        <result property="onepcType"    column="onepc_type"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="apkName" column="apk_name"/>
+        <result property="apkFileUpload" column="apk_file_upload"/>
+        <result property="version" column="version"/>
+        <result property="versionName" column="version_name"/>
+        <result property="onepcType" column="onepc_type"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <select id="selectApkFileUpLoadList" parameterType="com.zd.laboratory.onemachine.domain.ApkUploadVo" resultType="com.zd.laboratory.onemachine.domain.ApkUploadVo">
@@ -25,7 +25,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-
     <insert id="insertApkFileUpLoad" parameterType="com.zd.laboratory.onemachine.domain.ApkUpload" useGeneratedKeys="true" keyProperty="id">
         insert into apk_upload
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -54,7 +53,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
-
     <delete id="deleteApkUploadByIds" >
         delete from apk_upload where id = #{id}
     </delete>

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

@@ -5,15 +5,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.ApkLogMapper">
 
     <resultMap type="com.zd.laboratory.onemachine.domain.ApkLog" id="ApkLogResult">
-        <result property="id"    column="id"    />
-        <result property="onepcHardwareNum"    column="onepc_hardware_num"    />
-        <result property="apkUploadId"    column="apk_upload_id"    />
-        <result property="logStatus"    column="log_status"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="onepcHardwareNum" column="onepc_hardware_num"/>
+        <result property="apkUploadId" column="apk_upload_id"/>
+        <result property="logStatus" column="log_status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <select id="selectApkLogList" parameterType="com.zd.laboratory.onemachine.domain.ApkLogVo" resultType="com.zd.laboratory.onemachine.domain.ApkLogVo">

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

@@ -5,18 +5,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.ApkMachineconfigMapper">
 
     <resultMap type="com.zd.laboratory.domain.ApkMachineconfig" id="ApkMachineconfigResult">
-        <result property="id"    column="id"    />
-        <result property="hardwareNum"    column="hardware_num"    />
-        <result property="baseUrl"    column="base_url"    />
-        <result property="signinBaseUrl"    column="signin_base_url"    />
-        <result property="mqttUrl"    column="mqtt_url"    />
-        <result property="mqttName"    column="mqtt_name"    />
-        <result property="mqttPwd"    column="mqtt_pwd"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="hardwareNum" column="hardware_num"/>
+        <result property="baseUrl" column="base_url"/>
+        <result property="signinBaseUrl" column="signin_base_url"/>
+        <result property="mqttUrl" column="mqtt_url"/>
+        <result property="mqttName" column="mqtt_name"/>
+        <result property="mqttPwd" column="mqtt_pwd"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectApkMachineconfigVo">
@@ -50,41 +50,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertApkMachineconfig" parameterType="com.zd.laboratory.domain.ApkMachineconfig" useGeneratedKeys="true" keyProperty="id">
         insert into apk_machineconfig
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="hardwareNum != null">hardware_num,</if>
-
-    <if test="baseUrl != null">base_url,</if>
-
-    <if test="signinBaseUrl != null">signin_base_url,</if>
-
-    <if test="mqttUrl != null">mqtt_url,</if>
-
-    <if test="mqttName != null">mqtt_name,</if>
-
-    <if test="mqttPwd != null">mqtt_pwd,</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="remark != null">remark,</if>
-
+            <if test="hardwareNum != null">hardware_num,</if>
+            <if test="baseUrl != null">base_url,</if>
+            <if test="signinBaseUrl != null">signin_base_url,</if>
+            <if test="mqttUrl != null">mqtt_url,</if>
+            <if test="mqttName != null">mqtt_name,</if>
+            <if test="mqttPwd != null">mqtt_pwd,</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="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="hardwareNum != null">#{hardwareNum},</if>
-    <if test="baseUrl != null">#{baseUrl},</if>
-    <if test="signinBaseUrl != null">#{signinBaseUrl},</if>
-    <if test="mqttUrl != null">#{mqttUrl},</if>
-    <if test="mqttName != null">#{mqttName},</if>
-    <if test="mqttPwd != null">#{mqttPwd},</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="remark != null">#{remark},</if>
+            <if test="hardwareNum != null">#{hardwareNum},</if>
+            <if test="baseUrl != null">#{baseUrl},</if>
+            <if test="signinBaseUrl != null">#{signinBaseUrl},</if>
+            <if test="mqttUrl != null">#{mqttUrl},</if>
+            <if test="mqttName != null">#{mqttName},</if>
+            <if test="mqttPwd != null">#{mqttPwd},</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="remark != null">#{remark},</if>
          </trim>
     </insert>
 

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

@@ -5,33 +5,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabAbnormalMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabAbnormal" id="LabAbnormalResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="type"    column="type"    />
-        <result property="abnormalReason"    column="abnormal_reason"    />
-        <result property="hardwareId"    column="hardware_id"    />
-        <result property="sensorId"    column="sensor_id"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="type" column="type"/>
+        <result property="abnormalReason" column="abnormal_reason"/>
+        <result property="hardwareId" column="hardware_id"/>
+        <result property="sensorId" column="sensor_id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="createTime" column="create_time"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabAbnormalVO" id="LabAbnormalVOResult">
-        <result property="subjectName"    column="subject_name"    />
-        <result property="lastAbnormalTime"    column="last_abnormal_time"    />
-        <result property="equipmentType"    column="equipment_type"    />
-        <result property="abnormalCount"    column="abnormal_count"    />
-        <result property="startAbnormalTime"    column="start_abnormal_time"    />
+        <result property="subjectName" column="subject_name"/>
+        <result property="lastAbnormalTime" column="last_abnormal_time"/>
+        <result property="equipmentType" column="equipment_type"/>
+        <result property="abnormalCount" column="abnormal_count"/>
+        <result property="startAbnormalTime" column="start_abnormal_time"/>
 
     </resultMap>
 
     <sql id="selectLabAbnormalVo">
         select
           a.id,
           a.name,
@@ -60,8 +59,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <sql id="selectLabEquipmentVo">
-
-
         SELECT xx.* FROM (
         SELECT DISTINCT
           h.id,
@@ -83,9 +80,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           FROM
             sys_dept d,lab_subject s
           WHERE d.dept_id = s.dept_id AND s.id = h.`subject_id`) dept_name,
-         <!-- (SELECT a.abnormal_reason FROM lab_abnormal a WHERE a.hardware_id = h.`id` ORDER BY a.create_time DESC LIMIT 1) abnormal_reason,
-          (SELECT a.create_time FROM lab_abnormal a WHERE a.hardware_id = h.`id` ORDER BY a.create_time DESC LIMIT 1) last_abnormal_time,
-          -->
           1 equipment_type,
           h.`create_time`,
           h.operate
@@ -107,9 +101,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           FROM
             sys_dept d,lab_subject s
           WHERE d.dept_id = s.dept_id AND s.id = so.`subject_id`) dept_name,
-        <!--(SELECT a.abnormal_reason FROM lab_abnormal a WHERE a.sensor_id = so.`id` ORDER BY a.create_time DESC LIMIT 1) abnormal_reason,
-        (SELECT a.create_time FROM lab_abnormal a WHERE a.sensor_id = so.`id` ORDER BY a.create_time DESC LIMIT 1) last_abnormal_time,
-        -->
         2 equipment_type,
         so.`create_time`,
         so.sense_state operate
@@ -267,7 +258,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </delete>
 
-
     <select id="getAbnormalCount" parameterType="com.zd.laboratory.domain.LabAbnormal" resultMap="LabAbnormalVOResult">
         SELECT COUNT(1) abnormal_count,MAX(a.create_time) last_abnormal_time,MIN(a.create_time) start_abnormal_time FROM lab_abnormal a
         <where>
@@ -290,25 +280,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         group by date
         order by date) c on d.date = c.date
-
         order by d.date
-
-        <!--select date_format(create_time,'%Y%m%d') as date, count(1) as count
-        from lab_abnormal la,
-        (SELECT @s :=@s + 1 as 'index', DATE(DATE_SUB(CURRENT_DATE, INTERVAL @s DAY)) AS date FROM mysql.help_topic,(SELECT @s := -1) temp WHERE @s &lt; 6 ORDER BY date) d
-        where date_format(la.create_time, '%Y-%m-%d') = d.date
-        <where>
-            <if test="type == 1">
-                and create_time >= DATE_SUB(NOW(),INTERVAL 7 DAY)
-            </if>
-            <if test="type == 2">
-                and create_time >= DATE_SUB(NOW(),INTERVAL 30 DAY)
-            </if>
-            <if test="subjectId != null and subjectId != ''">
-                and subject_id = #{subjectId}
-            </if>
-        </where>
-        group by date
-        order by date-->
     </select>
 </mapper>

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

@@ -5,59 +5,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabApprovalMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabApproval" id="LabApprovalResult">
-        <result property="id"    column="id"    />
-        <result property="joinUserId"    column="join_user_id"    />
-        <result property="buildId"    column="build_id"    />
-        <result property="subjectId"    column="subject_id"    />
-        <result property="recordContent"    column="record_content"    />
-        <result property="securityGroupId"    column="security_group_id"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="passedDate"    column="passed_date"    />
-        <result property="failedDate"    column="failed_date"    />
-        <result property="expirationDate"    column="expiration_date"    />
-        <result property="failedReason"    column="failed_reason"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="joinUserId" column="join_user_id"/>
+        <result property="buildId" column="build_id"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="recordContent" column="record_content"/>
+        <result property="securityGroupId" column="security_group_id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="passedDate" column="passed_date"/>
+        <result property="failedDate" column="failed_date"/>
+        <result property="expirationDate" column="expiration_date"/>
+        <result property="failedReason" column="failed_reason"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.dto.LabApprovalAndDetailDTO" id="LabApprovalAndDetailResult">
-        <result property="id"    column="id"    />
-        <result property="joinUserId"    column="join_user_id"    />
-        <result property="buildId"    column="build_id"    />
-        <result property="subjectId"    column="subject_id"    />
-        <result property="recordContent"    column="record_content"    />
-        <result property="securityGroupId"    column="security_group_id"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="passedDate"    column="passed_date"    />
-        <result property="failedDate"    column="failed_date"    />
-        <result property="expirationDate"    column="expiration_date"    />
-        <result property="failedReason"    column="failed_reason"    />
-        <result property="remark"    column="remark"    />
-
+        <result property="id" column="id"/>
+        <result property="joinUserId" column="join_user_id"/>
+        <result property="buildId" column="build_id"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="recordContent" column="record_content"/>
+        <result property="securityGroupId" column="security_group_id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="passedDate" column="passed_date"/>
+        <result property="failedDate" column="failed_date"/>
+        <result property="expirationDate" column="expiration_date"/>
+        <result property="failedReason" column="failed_reason"/>
+        <result property="remark" column="remark"/>
 
         <collection property="approvalDetails" column="id" ofType="com.zd.laboratory.domain.LabApprovalDetail"
                     select="com.zd.laboratory.mapper.LabApprovalDetailMapper.selectLabApprovalDetailByApprovalId"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabApprovalVO" id="LabApprovalResultVO">
-        <result property="fail"    column="fail"/>
-        <result property="passed"    column="passed"/>
-        <result property="reviewed"    column="reviewed"/>
-        <result property="nickName"    column="nick_name"/>
-        <result property="effectiveTime"    column="effective_time"/>
-        <result property="effectiveTimeStr"    column="effective_time_str"/>
-        <result property="configureName"    column="configure_name"/>
+        <result property="fail" column="fail"/>
+        <result property="passed" column="passed"/>
+        <result property="reviewed" column="reviewed"/>
+        <result property="nickName" column="nick_name"/>
+        <result property="effectiveTime" column="effective_time"/>
+        <result property="effectiveTimeStr" column="effective_time_str"/>
+        <result property="configureName" column="configure_name"/>
     </resultMap>
 
     <sql id="selectLabApprovalVo">
@@ -316,7 +315,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
         GROUP BY exam_id) exam
-
         union all
         select '安全准入办理人数' as name, 2 as type, ifnull(sum(count),0) as count
         from
@@ -331,6 +329,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
         GROUP BY security_group_id) approval
-
     </select>
 </mapper>

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

@@ -5,17 +5,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabAudioSynthesisMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabAudioSynthesis" id="LabAudioSynthesisResult">
-        <result property="id"    column="id"    />
-        <result property="riskPlanId"    column="risk_plan_id"    />
-        <result property="sceneType"    column="scene_type"    />
-        <result property="musicUrl"    column="music_url"    />
-        <result property="musicVolume"    column="music_volume"    />
-        <result property="bgmusicUrl"    column="bgmusic_url"    />
-        <result property="bgmusicVolume"    column="bgmusic_volume"    />
-        <result property="newMusicUrl"    column="new_music_url"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
+        <result property="id" column="id"/>
+        <result property="riskPlanId" column="risk_plan_id"/>
+        <result property="sceneType" column="scene_type"/>
+        <result property="musicUrl" column="music_url"/>
+        <result property="musicVolume" column="music_volume"/>
+        <result property="bgmusicUrl" column="bgmusic_url"/>
+        <result property="bgmusicVolume" column="bgmusic_volume"/>
+        <result property="newMusicUrl" column="new_music_url"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
     </resultMap>
 
     <sql id="selectLabAudioSynthesisVo">
@@ -56,38 +56,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabAudioSynthesis" parameterType="com.zd.laboratory.domain.LabAudioSynthesis" useGeneratedKeys="true" keyProperty="id">
         insert into lab_audio_synthesis
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="riskPlanId != null">risk_plan_id,</if>
-
-    <if test="sceneType != null">scene_type,</if>
-
-    <if test="musicUrl != null">music_url,</if>
-
-    <if test="musicVolume != null">music_volume,</if>
-
-    <if test="bgmusicUrl != null">bgmusic_url,</if>
-
-    <if test="bgmusicVolume != null">bgmusic_volume,</if>
-
-    <if test="newMusicUrl != null">new_music_url,</if>
-
-    <if test="userId != null">user_id,</if>
-
-    <if test="createBy != null">create_by,</if>
-
-    <if test="createTime != null">create_time,</if>
-
+            <if test="riskPlanId != null">risk_plan_id,</if>
+            <if test="sceneType != null">scene_type,</if>
+            <if test="musicUrl != null">music_url,</if>
+            <if test="musicVolume != null">music_volume,</if>
+            <if test="bgmusicUrl != null">bgmusic_url,</if>
+            <if test="bgmusicVolume != null">bgmusic_volume,</if>
+            <if test="newMusicUrl != null">new_music_url,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="riskPlanId != null">#{riskPlanId},</if>
-    <if test="sceneType != null">#{sceneType},</if>
-    <if test="musicUrl != null">#{musicUrl},</if>
-    <if test="musicVolume != null">#{musicVolume},</if>
-    <if test="bgmusicUrl != null">#{bgmusicUrl},</if>
-    <if test="bgmusicVolume != null">#{bgmusicVolume},</if>
-    <if test="newMusicUrl != null">#{newMusicUrl},</if>
-    <if test="userId != null">#{userId},</if>
-    <if test="createBy != null">#{createBy},</if>
-    <if test="createTime != null">#{createTime},</if>
+            <if test="riskPlanId != null">#{riskPlanId},</if>
+            <if test="sceneType != null">#{sceneType},</if>
+            <if test="musicUrl != null">#{musicUrl},</if>
+            <if test="musicVolume != null">#{musicVolume},</if>
+            <if test="bgmusicUrl != null">#{bgmusicUrl},</if>
+            <if test="bgmusicVolume != null">#{bgmusicVolume},</if>
+            <if test="newMusicUrl != null">#{newMusicUrl},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
          </trim>
     </insert>
 

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

@@ -174,16 +174,13 @@
         SELECT sar.join_user_id AS user_id, COUNT(DISTINCT sar.join_user_id) AS online,MAX(sar.`create_time`) createTime  FROM lab_subject a LEFT JOIN lab_subject_access_record sar ON sar.subject_id = a.id
         WHERE  sar.access_status  = 1 and sar.init_flag = 0
         <!--AND sar.init_flag = 0-->
-
         <if test="subId != null and subId != ''">
             and a.id = #{subId}
         </if>
-
         GROUP BY sar.join_user_id
         ) a
         WHERE a.online>0) su LEFT JOIN sys_user u ON su.user_id = u.user_id
         LEFT JOIN sys_dept d ON u.dept_id = d.dept_id
-
     </select>
 
 </mapper>

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

@@ -5,26 +5,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabBlackdetailMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabBlackdetail" id="LabBlackdetailResult">
-        <result property="id"    column="id"    />
-        <result property="blackId"    column="black_id"    />
-        <result property="reason"    column="reason"    />
-        <result property="treatmentMethod"    column="treatment_method"    />
-        <result property="learnStatus"    column="learn_status"    />
-        <result property="testStatus"    column="test_status"    />
-        <result property="practiceStatus"    column="practice_status"    />
-        <result property="overStatus"    column="over_status"    />
-        <result property="handleDay"    column="handle_day"    />
-        <result property="creditScore"    column="credit_score"    />
-        <result property="numberTopics"    column="number_topics"    />
-        <result property="numberAccuracy"    column="number_accuracy"    />
-        <result property="learnTime"    column="learn_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-        <result property="surplusCreditScore"    column="surplus_credit_score"    />
-
+        <result property="id" column="id"/>
+        <result property="blackId" column="black_id"/>
+        <result property="reason" column="reason"/>
+        <result property="treatmentMethod" column="treatment_method"/>
+        <result property="learnStatus" column="learn_status"/>
+        <result property="testStatus" column="test_status"/>
+        <result property="practiceStatus" column="practice_status"/>
+        <result property="overStatus" column="over_status"/>
+        <result property="handleDay" column="handle_day"/>
+        <result property="creditScore" column="credit_score"/>
+        <result property="numberTopics" column="number_topics"/>
+        <result property="numberAccuracy" column="number_accuracy"/>
+        <result property="learnTime" column="learn_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="surplusCreditScore" column="surplus_credit_score"/>
     </resultMap>
 
     <sql id="selectLabBlackdetailVo">
@@ -90,62 +89,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabBlackdetail" parameterType="com.zd.laboratory.domain.LabBlackdetail" useGeneratedKeys="true" keyProperty="id">
         insert into lab_blackdetail
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="blackId != null">black_id,</if>
-
-    <if test="reason != null">reason,</if>
-
-    <if test="treatmentMethod != null">treatment_method,</if>
-
-    <if test="learnStatus != null">learn_status,</if>
-
-    <if test="testStatus != null">test_status,</if>
-
-    <if test="practiceStatus != null">practice_status,</if>
-
-    <if test="overStatus != null">over_status,</if>
-
-    <if test="handleDay != null">handle_day,</if>
-
-    <if test="creditScore != null">credit_score,</if>
-
-    <if test="numberTopics != null">number_topics,</if>
-
-    <if test="numberAccuracy != null">number_accuracy,</if>
-
-    <if test="learnTime != null">learn_time,</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="remark != null">remark,</if>
-
-    <if test="surplusCreditScore != null">surplus_credit_score,</if>
-
+            <if test="blackId != null">black_id,</if>
+            <if test="reason != null">reason,</if>
+            <if test="treatmentMethod != null">treatment_method,</if>
+            <if test="learnStatus != null">learn_status,</if>
+            <if test="testStatus != null">test_status,</if>
+            <if test="practiceStatus != null">practice_status,</if>
+            <if test="overStatus != null">over_status,</if>
+            <if test="handleDay != null">handle_day,</if>
+            <if test="creditScore != null">credit_score,</if>
+            <if test="numberTopics != null">number_topics,</if>
+            <if test="numberAccuracy != null">number_accuracy,</if>
+            <if test="learnTime != null">learn_time,</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="remark != null">remark,</if>
+            <if test="surplusCreditScore != null">surplus_credit_score,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="blackId != null">#{blackId},</if>
-    <if test="reason != null">#{reason},</if>
-    <if test="treatmentMethod != null">#{treatmentMethod},</if>
-    <if test="learnStatus != null">#{learnStatus},</if>
-    <if test="testStatus != null">#{testStatus},</if>
-    <if test="practiceStatus != null">#{practiceStatus},</if>
-    <if test="overStatus != null">#{overStatus},</if>
-    <if test="handleDay != null">#{handleDay},</if>
-    <if test="creditScore != null">#{creditScore},</if>
-    <if test="numberTopics != null">#{numberTopics},</if>
-    <if test="numberAccuracy != null">#{numberAccuracy},</if>
-    <if test="learnTime != null">#{learnTime},</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="remark != null">#{remark},</if>
-    <if test="surplusCreditScore != null">#{surplusCreditScore},</if>
+            <if test="blackId != null">#{blackId},</if>
+            <if test="reason != null">#{reason},</if>
+            <if test="treatmentMethod != null">#{treatmentMethod},</if>
+            <if test="learnStatus != null">#{learnStatus},</if>
+            <if test="testStatus != null">#{testStatus},</if>
+            <if test="practiceStatus != null">#{practiceStatus},</if>
+            <if test="overStatus != null">#{overStatus},</if>
+            <if test="handleDay != null">#{handleDay},</if>
+            <if test="creditScore != null">#{creditScore},</if>
+            <if test="numberTopics != null">#{numberTopics},</if>
+            <if test="numberAccuracy != null">#{numberAccuracy},</if>
+            <if test="learnTime != null">#{learnTime},</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="remark != null">#{remark},</if>
+            <if test="surplusCreditScore != null">#{surplusCreditScore},</if>
          </trim>
     </insert>
 

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

@@ -5,22 +5,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabBlacklistMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabBlacklist" id="LabBlacklistResult">
-        <result property="id"    column="id"    />
-        <result property="joinUserId"    column="join_user_id"    />
-        <result property="blacklistStatus"    column="blacklist_status"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="userId"    column="user_id"    />
-        <result property="remark"    column="remark"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="penaltyType"    column="penalty_type"    />
-        <result property="reason"    column="reason"    />
-
-        <result property="creditScore"    column="credit_score"    />
-
+        <result property="id" column="id"/>
+        <result property="joinUserId" column="join_user_id"/>
+        <result property="blacklistStatus" column="blacklist_status"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="userId" column="user_id"/>
+        <result property="remark" column="remark"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="penaltyType" column="penalty_type"/>
+        <result property="reason" column="reason"/>
+        <result property="creditScore" column="credit_score"/>
     </resultMap>
 
     <sql id="selectLabBlacklistVo">

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

@@ -5,20 +5,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabBuildFloorLayoutMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabBuildFloorLayout" id="LabBuildFloorLayoutResult">
-        <result property="id"    column="id"    />
-        <result property="buildId"    column="build_id"    />
-        <result property="floorId"    column="floor_id"    />
-        <result property="subId"    column="sub_id"    />
-        <result property="roomNum"    column="room_num"    />
-        <result property="roomName"    column="room_name"    />
-        <result property="roomType"    column="room_type"    />
-        <result property="pointName"    column="point_name"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="buildId" column="build_id"/>
+        <result property="floorId" column="floor_id"/>
+        <result property="subId" column="sub_id"/>
+        <result property="roomNum" column="room_num"/>
+        <result property="roomName" column="room_name"/>
+        <result property="roomType" column="room_type"/>
+        <result property="pointName" column="point_name"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectLabBuildFloorLayoutVo">
@@ -182,33 +182,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabBuildFloorLayout" parameterType="com.zd.laboratory.domain.LabBuildFloorLayout" useGeneratedKeys="true" keyProperty="id">
         insert into lab_build_floor_layout
         <trim prefix="(" suffix=")" suffixOverrides=",">
-
             <if test="buildId != null">build_id,</if>
-
             <if test="floorId != null">floor_id,</if>
-
             <if test="subId != null">sub_id,</if>
-
             <if test="roomNum != null">room_num,</if>
-
             <if test="roomName != null">room_name,</if>
-
             <if test="roomType != null">room_type,</if>
-
             <if test="pointName != null">point_name,</if>
-
             <if test="userId != null">user_id,</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="remark != null">remark,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="buildId != null">#{buildId},</if>

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

@@ -5,18 +5,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabBuildFloorMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabBuildFloor" id="LabBuildFloorResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="type"    column="type"    />
-        <result property="imgUrl"    column="img_url"    />
-        <result property="parentId"    column="parent_id"    />
-        <result property="sortNo"    column="sort_no"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="type" column="type"/>
+        <result property="imgUrl" column="img_url"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="sortNo" column="sort_no"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectLabBuildFloorVo">
@@ -120,29 +120,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabBuildFloor" parameterType="com.zd.laboratory.domain.LabBuildFloor" useGeneratedKeys="true" keyProperty="id">
         insert into lab_build_floor
         <trim prefix="(" suffix=")" suffixOverrides=",">
-
             <if test="name != null">name,</if>
-
             <if test="type != null">type,</if>
-
             <if test="imgUrl != null">img_url,</if>
-
             <if test="parentId != null">parent_id,</if>
-
             <if test="sortNo != null">sort_no,</if>
-
             <if test="userId != null">user_id,</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="remark != null">remark,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>

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

@@ -5,45 +5,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabBuildingMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabBuilding" id="LabBuildingResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="type"    column="type"    />
-        <result property="url"    column="url"    />
-        <result property="parentId"    column="parent_id"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="type" column="type"/>
+        <result property="url" column="url"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="createTime" column="create_time"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabBuildingVO" id="LabBuildingResultVO">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="type"    column="type"    />
-        <result property="url"    column="url"    />
-        <result property="parentId"    column="parent_id"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="type" column="type"/>
+        <result property="url" column="url"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="createTime" column="create_time"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabBuildingInfoVO" id="LabBuildingAndDetail">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="type"    column="type"    />
-        <result property="url"    column="url"    />
-        <result property="parentId"    column="parent_id"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="type" column="type"/>
+        <result property="url" column="url"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
 
         <collection property="layouts" column="id" ofType="com.zd.laboratory.domain.vo.LabSubjectLayoutVo"
                     select="com.zd.laboratory.mapper.LabSubjectLayoutMapper.queryLayoutByFloorId"/>

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

@@ -3,12 +3,12 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zd.laboratory.mapper.LabCeditScoreSiteMapper">
-    
+
     <resultMap type="com.zd.laboratory.domain.LabCeditScoreSite" id="LabCeditScoreSiteResult">
-        <result property="id"    column="id"    />
-        <result property="passScore"    column="pass_score"    />
-        <result property="getCondition"    column="get_condition"    />
-        <result property="getQualifications"    column="get_qualifications"    />
+        <result property="id" column="id"/>
+        <result property="passScore" column="pass_score"/>
+        <result property="getCondition" column="get_condition"/>
+        <result property="getQualifications" column="get_qualifications"/>
     </resultMap>
 
     <sql id="selectLabCeditScoreSiteVo">

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

@@ -85,33 +85,19 @@
         insert into lab_check_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="userId != null">user_id,</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="remark != null">remark,</if>
-
             <if test="checkSmsMsg != null">check_sms_msg,</if>
-
             <if test="checkAioMsg != null">check_aio_msg,</if>
-
             <if test="checkAppMsg != null">check_app_msg,</if>
-
             <if test="rectifySmsMsg != null">rectify_sms_msg,</if>
-
             <if test="rectifyAioMsg != null">rectify_aio_msg,</if>
-
             <if test="rectifyAppMsg != null">rectify_app_msg,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deptId != null">#{deptId},</if>

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

@@ -88,28 +88,17 @@
         insert into lab_check_machine_msg
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="userId != null">user_id,</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="remark != null">remark,</if>
-
             <if test="checkRecordId != null">check_record_id,</if>
-
             <if test="checkMsg != null">check_msg,</if>
-
             <if test="type != null">type,</if>
             <if test="status != null">status,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deptId != null">#{deptId},</if>

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

@@ -165,29 +165,18 @@
         insert into lab_check_option
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="userId != null">user_id,</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="remark != null">remark,</if>
-
             <if test="code != null and code != ''">code,</if>
-
             <if test="name != null and name != ''">name,</if>
-
             <if test="parentId != null">parent_id,</if>
             <if test="type != null">type,</if>
             <if test="level != null">level,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deptId != null">#{deptId},</if>

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

@@ -5,69 +5,69 @@
 <mapper namespace="com.zd.laboratory.mapper.LabCheckRecordDetailsMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabCheckRecordDetails" id="LabCheckRecordDetailsResult">
-        <result property="id"    column="id"    />
-        <result property="checkId"    column="check_id"    />
-        <result property="jcxId"    column="jcx_id"    />
-        <result property="jcxName"    column="jcx_name"    />
-        <result property="yhMs"    column="yh_ms"    />
-        <result property="yhImg"    column="yh_img"    />
-        <result property="yhZghImg"    column="yh_zgh_img"    />
-        <result property="zgYyfx"    column="zg_yyfx"    />
-        <result property="zgCs"    column="zg_cs"    />
-        <result property="zgMs"    column="zg_ms"    />
-        <result property="zmClImg"    column="zm_cl_img"    />
-        <result property="zmClMs"    column="zm_cl_ms"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="isLingshi"    column="is_lingshi"    />
-        <result property="isZg"    column="is_zg"    />
-
-        <result property="jcxNum"    column="jcx_num"    />
-        <result property="jcxSstkNum"    column="jcx_sstk_num"    />
-        <result property="jcxSstkMs"    column="jcx_sstk_ms"    />
-        <result property="zgTime"    column="zg_time"    />
-        <result property="zgUserName"    column="zg_user_name"    />
-        <result property="zgUserId"    column="zg_user_id"    />
-        <result property="spTime"    column="sp_time"    />
-        <result property="spUserName"    column="sp_user_name"    />
-        <result property="spUserId"    column="sp_user_id"    />
-        <result property="spStatus"    column="sp_status"    />
-        <result property="spMs"    column="sp_ms"    />
-        <result property="voice"    column="voice"    />
-        <result property="isZgStatus"    column="is_zg_status"    />
+        <result property="id" column="id"/>
+        <result property="checkId" column="check_id"/>
+        <result property="jcxId" column="jcx_id"/>
+        <result property="jcxName" column="jcx_name"/>
+        <result property="yhMs" column="yh_ms"/>
+        <result property="yhImg" column="yh_img"/>
+        <result property="yhZghImg" column="yh_zgh_img"/>
+        <result property="zgYyfx" column="zg_yyfx"/>
+        <result property="zgCs" column="zg_cs"/>
+        <result property="zgMs" column="zg_ms"/>
+        <result property="zmClImg" column="zm_cl_img"/>
+        <result property="zmClMs" column="zm_cl_ms"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="isLingshi" column="is_lingshi"/>
+        <result property="isZg" column="is_zg"/>
+
+        <result property="jcxNum" column="jcx_num"/>
+        <result property="jcxSstkNum" column="jcx_sstk_num"/>
+        <result property="jcxSstkMs" column="jcx_sstk_ms"/>
+        <result property="zgTime" column="zg_time"/>
+        <result property="zgUserName" column="zg_user_name"/>
+        <result property="zgUserId" column="zg_user_id"/>
+        <result property="spTime" column="sp_time"/>
+        <result property="spUserName" column="sp_user_name"/>
+        <result property="spUserId" column="sp_user_id"/>
+        <result property="spStatus" column="sp_status"/>
+        <result property="spMs" column="sp_ms"/>
+        <result property="voice" column="voice"/>
+        <result property="isZgStatus" column="is_zg_status"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabCheckRecordDetailsVO" id="LabCheckRecordDetailsResultVO">
-        <result property="id"    column="id"    />
-        <result property="checkId"    column="check_id"    />
-        <result property="jcxId"    column="jcx_id"    />
-        <result property="jcxName"    column="jcx_name"    />
-        <result property="yhMs"    column="yh_ms"    />
-        <result property="yhImg"    column="yh_img"    />
-        <result property="yhZghImg"    column="yh_zgh_img"    />
-        <result property="zgYyfx"    column="zg_yyfx"    />
-        <result property="zgCs"    column="zg_cs"    />
-        <result property="zgMs"    column="zg_ms"    />
-        <result property="zmClImg"    column="zm_cl_img"    />
-        <result property="zmClMs"    column="zm_cl_ms"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="isLingshi"    column="is_lingshi"    />
-        <result property="isZg"    column="is_zg"    />
-
-        <result property="jcxNum"    column="jcx_num"    />
-        <result property="jcxSstkNum"    column="jcx_sstk_num"    />
-        <result property="jcxSstkMs"    column="jcx_sstk_ms"    />
-        <result property="zgTime"    column="zg_time"    />
-        <result property="zgUserName"    column="zg_user_name"    />
-        <result property="zgUserId"    column="zg_user_id"    />
-        <result property="spTime"    column="sp_time"    />
-        <result property="spUserName"    column="sp_user_name"    />
-        <result property="spUserId"    column="sp_user_id"    />
-        <result property="spStatus"    column="sp_status"    />
-        <result property="spMs"    column="sp_ms"    />
-        <result property="voice"    column="voice"    />
-        <result property="isZgStatus"    column="is_zg_status"    />
+        <result property="id" column="id"/>
+        <result property="checkId" column="check_id"/>
+        <result property="jcxId" column="jcx_id"/>
+        <result property="jcxName" column="jcx_name"/>
+        <result property="yhMs" column="yh_ms"/>
+        <result property="yhImg" column="yh_img"/>
+        <result property="yhZghImg" column="yh_zgh_img"/>
+        <result property="zgYyfx" column="zg_yyfx"/>
+        <result property="zgCs" column="zg_cs"/>
+        <result property="zgMs" column="zg_ms"/>
+        <result property="zmClImg" column="zm_cl_img"/>
+        <result property="zmClMs" column="zm_cl_ms"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="isLingshi" column="is_lingshi"/>
+        <result property="isZg" column="is_zg"/>
+
+        <result property="jcxNum" column="jcx_num"/>
+        <result property="jcxSstkNum" column="jcx_sstk_num"/>
+        <result property="jcxSstkMs" column="jcx_sstk_ms"/>
+        <result property="zgTime" column="zg_time"/>
+        <result property="zgUserName" column="zg_user_name"/>
+        <result property="zgUserId" column="zg_user_id"/>
+        <result property="spTime" column="sp_time"/>
+        <result property="spUserName" column="sp_user_name"/>
+        <result property="spUserId" column="sp_user_id"/>
+        <result property="spStatus" column="sp_status"/>
+        <result property="spMs" column="sp_ms"/>
+        <result property="voice" column="voice"/>
+        <result property="isZgStatus" column="is_zg_status"/>
     </resultMap>
 
     <sql id="selectLabCheckRecordDetailsVo">
@@ -77,6 +77,7 @@
                sp_user_name,sp_user_id,sp_status,sp_ms,voice,is_zg_status
         from lab_check_record_details
     </sql>
+
     <sql id="selectLabCheckRecordDetailsListVo">
         select t.id, t.check_id,t.jcx_num, t.jcx_id, t.jcx_name,t.jcx_sstk_num,t.jcx_sstk_ms, t.yh_ms, t.yh_img,
                t.yh_zgh_img, t.zg_yyfx, t.zg_cs, t.zg_ms, t.zm_cl_img, t.zm_cl_ms,
@@ -86,38 +87,39 @@
               (select REPLACE(GROUP_CONCAT(name),',','-') 	from lab_check_option where FIND_IN_SET(id, jcx_id)) allCheckOptionName
         from lab_check_record_details as t
     </sql>
+
     <select id="selectLabCheckRecordDetailsList" parameterType="com.zd.laboratory.domain.vo.LabCheckRecordDetailsVO" resultType="com.zd.laboratory.domain.vo.LabCheckRecordDetailsVO">
         <include refid="selectLabCheckRecordDetailsListVo"/>
         <where>
-            <if test="checkId != null "> and check_id = #{checkId}</if>
-            <if test="jcxId != null  and jcxId != ''"> and jcx_id = #{jcxId}</if>
-            <if test="jcxNum != null  and jcxNum != ''"> and jcx_num = #{jcxNum}</if>
-            <if test="jcxName != null  and jcxName != ''"> and jcx_name like concat('%', #{jcxName}, '%')</if>
-            <if test="yhMs != null  and yhMs != ''"> and yh_ms = #{yhMs}</if>
-            <if test="yhImg != null  and yhImg != ''"> and yh_img = #{yhImg}</if>
-            <if test="yhZghImg != null  and yhZghImg != ''"> and yh_zgh_img = #{yhZghImg}</if>
-            <if test="zgYyfx != null  and zgYyfx != ''"> and zg_yyfx = #{zgYyfx}</if>
-            <if test="zgCs != null  and zgCs != ''"> and zg_cs = #{zgCs}</if>
-            <if test="zgMs != null  and zgMs != ''"> and zg_ms = #{zgMs}</if>
-            <if test="zmClImg != null  and zmClImg != ''"> and zm_cl_img = #{zmClImg}</if>
-            <if test="zmClMs != null  and zmClMs != ''"> and zm_cl_ms = #{zmClMs}</if>
-            <if test="createTime != null  and createTime != ''"> and create_time = #{createTime}</if>
-            <if test="updateTime != null  and updateTime != ''"> and update_time = #{updateTime}</if>
-            <if test="isLingshi != null  "> and is_lingshi = #{isLingshi}</if>
-            <if test="isZg != null  "> and is_zg = #{isZg}</if>
-
-            <if test="jcxSstkNum != null  and jcxSstkNum != ''"> and jcx_sstk_num = #{jcxSstkNum}</if>
-            <if test="jcxSstkMs != null  and jcxSstkMs != ''"> and jcx_sstk_ms = #{jcxSstkMs}</if>
-            <if test="zgTime != null  "> and zg_time = #{zgTime}</if>
-            <if test="zgUserName != null  and zgUserName != ''"> and zg_user_name = #{zgUserName}</if>
-            <if test="zgUserId != null  "> and zg_user_id = #{zgUserId}</if>
-            <if test="spTime != null  "> and sp_time = #{spTime}</if>
-            <if test="spUserName != null  and spUserName != ''"> and sp_user_name = #{spUserName}</if>
-            <if test="spUserId != null  "> and sp_user_id = #{spUserId}</if>
-            <if test="spStatus != null  "> and sp_status = #{spStatus}</if>
-            <if test="spMs != null  and spMs != ''"> and sp_ms = #{spMs}</if>
-            <if test="voice != null  and voice != ''"> and voice = #{voice}</if>
-            <if test="isZgStatus != null "> and is_zg_status = #{isZgStatus}</if>
+            <if test="checkId != null ">and check_id = #{checkId}</if>
+            <if test="jcxId != null  and jcxId != ''">and jcx_id = #{jcxId}</if>
+            <if test="jcxNum != null  and jcxNum != ''">and jcx_num = #{jcxNum}</if>
+            <if test="jcxName != null  and jcxName != ''">and jcx_name like concat('%', #{jcxName}, '%')</if>
+            <if test="yhMs != null  and yhMs != ''">and yh_ms = #{yhMs}</if>
+            <if test="yhImg != null  and yhImg != ''">and yh_img = #{yhImg}</if>
+            <if test="yhZghImg != null  and yhZghImg != ''">and yh_zgh_img = #{yhZghImg}</if>
+            <if test="zgYyfx != null  and zgYyfx != ''">and zg_yyfx = #{zgYyfx}</if>
+            <if test="zgCs != null  and zgCs != ''">and zg_cs = #{zgCs}</if>
+            <if test="zgMs != null  and zgMs != ''">and zg_ms = #{zgMs}</if>
+            <if test="zmClImg != null  and zmClImg != ''">and zm_cl_img = #{zmClImg}</if>
+            <if test="zmClMs != null  and zmClMs != ''">and zm_cl_ms = #{zmClMs}</if>
+            <if test="createTime != null  and createTime != ''">and create_time = #{createTime}</if>
+            <if test="updateTime != null  and updateTime != ''">and update_time = #{updateTime}</if>
+            <if test="isLingshi != null  ">and is_lingshi = #{isLingshi}</if>
+            <if test="isZg != null  ">and is_zg = #{isZg}</if>
+
+            <if test="jcxSstkNum != null  and jcxSstkNum != ''">and jcx_sstk_num = #{jcxSstkNum}</if>
+            <if test="jcxSstkMs != null  and jcxSstkMs != ''">and jcx_sstk_ms = #{jcxSstkMs}</if>
+            <if test="zgTime != null  ">and zg_time = #{zgTime}</if>
+            <if test="zgUserName != null  and zgUserName != ''">and zg_user_name = #{zgUserName}</if>
+            <if test="zgUserId != null  ">and zg_user_id = #{zgUserId}</if>
+            <if test="spTime != null  ">and sp_time = #{spTime}</if>
+            <if test="spUserName != null  and spUserName != ''">and sp_user_name = #{spUserName}</if>
+            <if test="spUserId != null  ">and sp_user_id = #{spUserId}</if>
+            <if test="spStatus != null  ">and sp_status = #{spStatus}</if>
+            <if test="spMs != null  and spMs != ''">and sp_ms = #{spMs}</if>
+            <if test="voice != null  and voice != ''">and voice = #{voice}</if>
+            <if test="isZgStatus != null ">and is_zg_status = #{isZgStatus}</if>
         </where>
         order by t.create_time desc
     </select>
@@ -167,37 +169,21 @@
         insert into lab_check_record_details
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="checkId != null">check_id,</if>
-
             <if test="jcxId != null">jcx_id,</if>
-
             <if test="jcxNum != null">jcx_num,</if>
-
             <if test="jcxName != null">jcx_name,</if>
-
             <if test="yhMs != null">yh_ms,</if>
-
             <if test="yhImg != null">yh_img,</if>
-
             <if test="yhZghImg != null">yh_zgh_img,</if>
-
             <if test="zgYyfx != null">zg_yyfx,</if>
-
             <if test="zgCs != null">zg_cs,</if>
-
             <if test="zgMs != null">zg_ms,</if>
-
             <if test="zmClImg != null">zm_cl_img,</if>
-
             <if test="zmClMs != null">zm_cl_ms,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="isLingshi != null">is_lingshi,</if>
-
             <if test="isZg != null">is_zg,</if>
-
             <if test="jcxSstkNum != null">jcx_sstk_num,</if>
             <if test="jcxSstkMs != null">jcx_sstk_ms,</if>
             <if test="zgTime != null">zg_time,</if>
@@ -318,23 +304,6 @@
 
     <!-- 大屏安全检查列表安全隐患项统计-->
     <select id="selectLabCheckRecordCountIndex" parameterType="com.zd.laboratory.domain.vo.LabCheckRecordDetailsVO" resultMap="LabCheckRecordDetailsResultVO">
-        <!--select sum(s.zs) checkZs,sum(s.yzg) checkYzg,sum(s.zs-s.yzg) checkWzg from (
-        select t.check_id,t.name,t.classified_name,t.type_name,count(1) zs,IFNULL(case when t.is_zg=0 then count(1) end,0) yzg ,IFNULL(case when t.is_zg=1 then count(1) end,0) wzg from (
-        select lv.*,lsc.classified_name,type.type_name from (
-        select ck.*,sub.name,sub.level,sub.type_id from (
-        select ds.*,cr.laboratory_id,cr.create_time ct  from lab_check_record_details ds,lab_check_record cr
-        where  ds.check_id= cr.id
-        <if test="ids != null">
-            and  cr.id in
-            <foreach item="id" collection="ids" open="(" separator="," close=")">
-                #{id}
-            </foreach>
-        </if>
-        ) ck,lab_subject sub where ck.laboratory_id=sub.id
-        ) lv,lab_safe_classified lsc, lab_safe_classtype type where lv.level=lsc.id and lv.type_id=type.id
-        ) t GROUP BY t.check_id, t.name,t.classified_name,t.type_name order by t.check_id desc
-        ) s-->
-
         select count(1) checkZs,
         count((select sum(1) from lab_check_record_details crd where crd.id = ds.id and crd.is_zg=0)) checkYzg,
         count((select sum(1) from lab_check_record_details crd where crd.id = ds.id and crd.is_zg=1)) checkWzg

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

@@ -5,25 +5,25 @@
 <mapper namespace="com.zd.laboratory.mapper.LabCheckRecordDetailslogMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabCheckRecordDetailslog" id="LabCheckRecordDetailslogResult">
-        <result property="id"    column="id"    />
-        <result property="checkId"    column="check_id"    />
-        <result property="checkDetailsId"    column="check_details_id"    />
-        <result property="zgTime"    column="zg_time"    />
-        <result property="zgUserName"    column="zg_user_name"    />
-        <result property="zgUserId"    column="zg_user_id"    />
-        <result property="zgMs"    column="zg_ms"    />
-        <result property="yhZghImg"    column="yh_zgh_img"    />
-        <result property="spTime"    column="sp_time"    />
-        <result property="spUserName"    column="sp_user_name"    />
-        <result property="spUserId"    column="sp_user_id"    />
-        <result property="spStatus"    column="sp_status"    />
-        <result property="spSm"    column="sp_sm"    />
-        <result property="applyTime"    column="apply_time"    />
-        <result property="applyUserName"    column="apply_user_name"    />
-        <result property="applyUserId"    column="apply_user_id"    />
-        <result property="applyYhImg"    column="apply_yh_img"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="checkId" column="check_id"/>
+        <result property="checkDetailsId" column="check_details_id"/>
+        <result property="zgTime" column="zg_time"/>
+        <result property="zgUserName" column="zg_user_name"/>
+        <result property="zgUserId" column="zg_user_id"/>
+        <result property="zgMs" column="zg_ms"/>
+        <result property="yhZghImg" column="yh_zgh_img"/>
+        <result property="spTime" column="sp_time"/>
+        <result property="spUserName" column="sp_user_name"/>
+        <result property="spUserId" column="sp_user_id"/>
+        <result property="spStatus" column="sp_status"/>
+        <result property="spSm" column="sp_sm"/>
+        <result property="applyTime" column="apply_time"/>
+        <result property="applyUserName" column="apply_user_name"/>
+        <result property="applyUserId" column="apply_user_id"/>
+        <result property="applyYhImg" column="apply_yh_img"/>
+        <result property="createTime" column="create_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectLabCheckRecordDetailslogVo">
@@ -64,41 +64,23 @@
         insert into lab_check_record_detailslog
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="checkId != null">check_id,</if>
-
             <if test="checkDetailsId != null">check_details_id,</if>
-
             <if test="zgTime != null">zg_time,</if>
-
             <if test="zgUserName != null">zg_user_name,</if>
-
             <if test="zgUserId != null">zg_user_id,</if>
-
             <if test="zgMs != null">zg_ms,</if>
-
             <if test="yhZghImg != null">yh_zgh_img,</if>
-
             <if test="spTime != null">sp_time,</if>
-
             <if test="spUserName != null">sp_user_name,</if>
-
             <if test="spUserId != null">sp_user_id,</if>
-
             <if test="spStatus != null">sp_status,</if>
-
             <if test="spSm != null">sp_sm,</if>
-
             <if test="applyTime != null">apply_time,</if>
-
             <if test="applyUserName != null">apply_user_name,</if>
-
             <if test="applyUserId != null">apply_user_id,</if>
-
             <if test="applyYhImg != null">apply_yh_img,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="remark != null">remark,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="checkId != null">#{checkId},</if>

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

@@ -5,67 +5,67 @@
 <mapper namespace="com.zd.laboratory.mapper.LabCheckRecordMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabCheckRecord" id="LabCheckRecordResult">
-        <result property="id"    column="id"    />
-        <result property="checkNum"    column="check_num"    />
-        <result property="laboratoryName"    column="laboratory_name"    />
-        <result property="laboratoryId"    column="laboratory_id"    />
-        <result property="buildingName"    column="building_name"    />
-        <result property="buildingId"    column="building_id"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="jcDw"    column="jc_dw"    />
-        <result property="jcDwName"    column="jc_dw_name"    />
-        <result property="jcRyxm"    column="jc_ryxm"    />
-        <result property="fjNumber"    column="fj_number"    />
-        <result property="fzrId"    column="fzr_id"    />
-        <result property="fzrName"    column="fzr_name"    />
-        <result property="fzrLxfs"    column="fzr_lxfs"    />
-        <result property="zgJg"    column="zg_jg"    />
-        <result property="fbYy"    column="fb_yy"    />
-        <result property="zgStatus"    column="zg_status"    />
-        <result property="zgType"    column="zg_type"    />
-        <result property="isZgStatus"    column="is_zg_status"    />
-        <result property="isCg"    column="is_cg"    />
-        <result property="zgjzTime"    column="zgjz_time"    />
-        <result property="zgbhTime"    column="zgbh_time"    />
-        <result property="zgqrTime"    column="zgqr_time"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createUserId"    column="create_user_id"    />
-        <result property="firstTime"    column="first_time"    />
-        <result property="zgWcsj"    column="zg_wcsj"    />
-        <result property="isFabu"    column="is_fabu"    />
+        <result property="id" column="id"/>
+        <result property="checkNum" column="check_num"/>
+        <result property="laboratoryName" column="laboratory_name"/>
+        <result property="laboratoryId" column="laboratory_id"/>
+        <result property="buildingName" column="building_name"/>
+        <result property="buildingId" column="building_id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="jcDw" column="jc_dw"/>
+        <result property="jcDwName" column="jc_dw_name"/>
+        <result property="jcRyxm" column="jc_ryxm"/>
+        <result property="fjNumber" column="fj_number"/>
+        <result property="fzrId" column="fzr_id"/>
+        <result property="fzrName" column="fzr_name"/>
+        <result property="fzrLxfs" column="fzr_lxfs"/>
+        <result property="zgJg" column="zg_jg"/>
+        <result property="fbYy" column="fb_yy"/>
+        <result property="zgStatus" column="zg_status"/>
+        <result property="zgType" column="zg_type"/>
+        <result property="isZgStatus" column="is_zg_status"/>
+        <result property="isCg" column="is_cg"/>
+        <result property="zgjzTime" column="zgjz_time"/>
+        <result property="zgbhTime" column="zgbh_time"/>
+        <result property="zgqrTime" column="zgqr_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createUserId" column="create_user_id"/>
+        <result property="firstTime" column="first_time"/>
+        <result property="zgWcsj" column="zg_wcsj"/>
+        <result property="isFabu" column="is_fabu"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabCheckRecordVO" id="LabCheckRecordResultVO">
-        <result property="id"    column="id"    />
-        <result property="checkNum"    column="check_num"    />
-        <result property="laboratoryName"    column="laboratory_name"    />
-        <result property="laboratoryId"    column="laboratory_id"    />
-        <result property="buildingName"    column="building_name"    />
-        <result property="buildingId"    column="building_id"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="jcDw"    column="jc_dw"    />
-        <result property="jcDwName"    column="jc_dw_name"    />
-        <result property="jcRyxm"    column="jc_ryxm"    />
-        <result property="fjNumber"    column="fj_number"    />
-        <result property="fzrId"    column="fzr_id"    />
-        <result property="fzrName"    column="fzr_name"    />
-        <result property="fzrLxfs"    column="fzr_lxfs"    />
-        <result property="zgJg"    column="zg_jg"    />
-        <result property="fbYy"    column="fb_yy"    />
-        <result property="zgStatus"    column="zg_status"    />
-        <result property="zgType"    column="zg_type"    />
-        <result property="isZgStatus"    column="is_zg_status"    />
-        <result property="isCg"    column="is_cg"    />
-        <result property="zgjzTime"    column="zgjz_time"    />
-        <result property="zgbhTime"    column="zgbh_time"    />
-        <result property="zgqrTime"    column="zgqr_time"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createUserId"    column="create_user_id"    />
-        <result property="firstTime"    column="first_time"    />
-        <result property="zgWcsj"    column="zg_wcsj"    />
-        <result property="isFabu"    column="is_fabu"    />
+        <result property="id" column="id"/>
+        <result property="checkNum" column="check_num"/>
+        <result property="laboratoryName" column="laboratory_name"/>
+        <result property="laboratoryId" column="laboratory_id"/>
+        <result property="buildingName" column="building_name"/>
+        <result property="buildingId" column="building_id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="jcDw" column="jc_dw"/>
+        <result property="jcDwName" column="jc_dw_name"/>
+        <result property="jcRyxm" column="jc_ryxm"/>
+        <result property="fjNumber" column="fj_number"/>
+        <result property="fzrId" column="fzr_id"/>
+        <result property="fzrName" column="fzr_name"/>
+        <result property="fzrLxfs" column="fzr_lxfs"/>
+        <result property="zgJg" column="zg_jg"/>
+        <result property="fbYy" column="fb_yy"/>
+        <result property="zgStatus" column="zg_status"/>
+        <result property="zgType" column="zg_type"/>
+        <result property="isZgStatus" column="is_zg_status"/>
+        <result property="isCg" column="is_cg"/>
+        <result property="zgjzTime" column="zgjz_time"/>
+        <result property="zgbhTime" column="zgbh_time"/>
+        <result property="zgqrTime" column="zgqr_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createUserId" column="create_user_id"/>
+        <result property="firstTime" column="first_time"/>
+        <result property="zgWcsj" column="zg_wcsj"/>
+        <result property="isFabu" column="is_fabu"/>
     </resultMap>
 
     <sql id="selectLabCheckRecordVo">
@@ -81,6 +81,7 @@
                from (select z.*,z.`create_user_id` user_id from lab_check_record z) t
                left join sys_dept d on t.dept_id = d.dept_id
     </sql>
+
     <sql id="selectLabCheckRecordListVo">
         select t.id,t.check_num, t.laboratory_name, t.laboratory_id, t.building_name, t.building_id,
                dept_id,dept_name,
@@ -89,6 +90,7 @@
                t.zgjz_time, t.zgbh_time, t.zgqr_time, t.create_time,t.create_user_id,
                t.first_time,t.zg_wcsj,t.is_fabu from lab_check_record as t
     </sql>
+
     <select id="selectLabCheckRecordList" parameterType="com.zd.laboratory.domain.LabCheckRecord" resultMap="LabCheckRecordResultVO">
         <include refid="selectLabCheckRecordVo"/>
         <where>
@@ -168,59 +170,32 @@
         insert into lab_check_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="checkNum != null">check_num,</if>
-
             <if test="laboratoryName != null">laboratory_name,</if>
-
             <if test="laboratoryId != null">laboratory_id,</if>
-
             <if test="buildingName != null">building_name,</if>
-
             <if test="buildingId != null">building_id,</if>
-
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="jcDw != null">jc_dw,</if>
-
             <if test="jcDwName != null">jc_dw_name,</if>
-
             <if test="jcRyxm != null">jc_ryxm,</if>
-
             <if test="fjNumber != null">fj_number,</if>
-
             <if test="fzrId != null">fzr_id,</if>
-
             <if test="fzrName != null">fzr_name,</if>
-
             <if test="fzrLxfs != null">fzr_lxfs,</if>
-
             <if test="zgJg != null">zg_jg,</if>
-
             <if test="fbYy != null">fb_yy,</if>
-
             <if test="zgStatus != null">zg_status,</if>
-
             <if test="zgType != null">zg_type,</if>
-
             <if test="isZgStatus != null">is_zg_status,</if>
-
             <if test="isCg != null">is_cg,</if>
-
             <if test="zgjzTime != null">zgjz_time,</if>
-
             <if test="zgbhTime != null">zgbh_time,</if>
-
             <if test="zgqrTime != null">zgqr_time,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="createUserId != null">create_user_id,</if>
-
             <if test="firstTime != null">first_time,</if>
-
             <if test="zgWcsj != null">zg_wcsj,</if>
-
             <if test="isFabu != null">is_fabu,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -439,7 +414,6 @@
     update lab_check_record set first_time= now() where id=#{id}
     </update>
 
-
     <update id="updateLabCheckRecordByIds">
         update lab_check_record set is_fabu=1 where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">

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

@@ -5,27 +5,27 @@
 <mapper namespace="com.zd.laboratory.mapper.LabCheckRecordReleaseMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabCheckRecordRelease" id="LabCheckRecordReleaseResult">
-        <result property="id"    column="id"    />
-        <result property="checkId"    column="check_id"    />
-        <result property="releaseDescribe"    column="release_describe"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="checkId" column="check_id"/>
+        <result property="releaseDescribe" column="release_describe"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="createTime" column="create_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabCheckRecordReleaseVO" id="LabCheckRecordReleaseResultVO">
-        <result property="id"    column="id"    />
-        <result property="checkId"    column="check_id"    />
-        <result property="releaseDescribe"    column="release_describe"    />
-        <result property="userId"    column="user_id"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="checkId" column="check_id"/>
+        <result property="releaseDescribe" column="release_describe"/>
+        <result property="userId" column="user_id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectLabCheckRecordReleaseVo">
@@ -56,23 +56,14 @@
     <insert id="insertLabCheckRecordRelease" parameterType="com.zd.laboratory.domain.LabCheckRecordRelease">
         insert into lab_check_record_release
         <trim prefix="(" suffix=")" suffixOverrides=",">
-
             <if test="checkId != null">check_id,</if>
-
             <if test="releaseDescribe != null">release_describe,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="remark != null">remark,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="checkId != null">#{checkId},</if>

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

@@ -5,7 +5,6 @@
 <mapper namespace="com.zd.laboratory.mapper.LabConfigMapper">
 
     <sql id="config"  >
-
         select id ,app_cover from lab_config
     </sql>
 

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

@@ -72,31 +72,18 @@
         insert into lab_content_machine_msg
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="userId != null">user_id,</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="remark != null">remark,</if>
-
             <if test="contentId != null">content_id,</if>
-
             <if test="subId != null">sub_id,</if>
-
             <if test="contentMsg != null">content_msg,</if>
-
             <if test="type != null">type,</if>
-
             <if test="status != null">status,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deptId != null">#{deptId},</if>

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

@@ -5,29 +5,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabControlMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabControl" id="LabControlResult">
-        <result property="id"    column="id"    />
-        <result property="triggerModes"    column="trigger_modes"    />
-        <result property="controlType"    column="control_type"    />
-        <result property="joinUserId"    column="join_user_id"    />
-        <result property="userName"    column="user_name"    />
-        <result property="operation"    column="operation"    />
-        <result property="hardwareId"    column="hardware_id"    />
-        <result property="subjectId"    column="subject_id"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="remark"    column="remark"    />
-        <result property="hardwareType"    column="hardware_type"    />
+        <result property="id" column="id"/>
+        <result property="triggerModes" column="trigger_modes"/>
+        <result property="controlType" column="control_type"/>
+        <result property="joinUserId" column="join_user_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="operation" column="operation"/>
+        <result property="hardwareId" column="hardware_id"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="createTime" column="create_time"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="remark" column="remark"/>
+        <result property="hardwareType" column="hardware_type"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabControlVO" id="LabControlVOResult">
-        <result property="subjectName"    column="subject_name"    />
-        <result property="hardwareType"    column="hardware_type"  typeHandler="org.apache.ibatis.type.EnumOrdinalTypeHandler"  />
-<!--        <result property="hardwareTypeEnum"    column="hardware_type_enum"    />-->
+        <result property="subjectName" column="subject_name"/>
+        <result property="hardwareType" column="hardware_type"
+                typeHandler="org.apache.ibatis.type.EnumOrdinalTypeHandler"/>
+        <!--        <result property="hardwareTypeEnum"    column="hardware_type_enum"    />-->
 
     </resultMap>
 
@@ -50,11 +51,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           cl.update_by,
           cl.remark,
           cl.hardware_type,
           (select s.name from lab_subject s where s.id = subject_id) subject_name,
           dt.dept_name
         from
@@ -216,223 +212,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ${params.dataScope}
         </where>
         )x2 ON x1.yearMonth = x2.yearMonth
-
         GROUP BY x1.yearMonth
-
-        <!--SELECT '' hardware_type_enum,-->
-            <!--CONCAT(MONTH(DATE_SUB(CURDATE(),INTERVAL 11 MONTH)),'月') month_one,-->
-            <!--CONCAT(MONTH(DATE_SUB(CURDATE(),INTERVAL 10 MONTH)),'月') month_two,-->
-            <!--CONCAT(MONTH(DATE_SUB(CURDATE(),INTERVAL 9 MONTH)),'月') month_three,-->
-            <!--CONCAT(MONTH(DATE_SUB(CURDATE(),INTERVAL 8 MONTH)),'月') month_four,-->
-            <!--CONCAT(MONTH(DATE_SUB(CURDATE(),INTERVAL 7 MONTH)),'月') month_five,-->
-            <!--CONCAT(MONTH(DATE_SUB(CURDATE(),INTERVAL 6 MONTH)),'月') month_six,-->
-            <!--CONCAT(MONTH(DATE_SUB(CURDATE(),INTERVAL 5 MONTH)),'月') month_seven,-->
-            <!--CONCAT(MONTH(DATE_SUB(CURDATE(),INTERVAL 4 MONTH)),'月') month_eight,-->
-            <!--CONCAT(MONTH(DATE_SUB(CURDATE(),INTERVAL 3 MONTH)),'月') month_nine,-->
-            <!--CONCAT(MONTH(DATE_SUB(CURDATE(),INTERVAL 2 MONTH)),'月') month_ten,-->
-            <!--CONCAT(MONTH(DATE_SUB(CURDATE(),INTERVAL 1 MONTH)),'月') month_eleven,-->
-            <!--CONCAT(MONTH(CURDATE()),'月') month_twelve-->
-            <!--FROM DUAL-->
-
-            <!--UNION ALL-->
-
-            <!--select x1.hardware_type_enum,ifnull(x2.month_one,0) month_one,ifnull(x2.month_two,0) month_two,IFNULL(x2.month_three,0) month_three,IFNULL(x2.month_four,0) month_four,-->
-            <!--IFNULL(x2.month_five,0) month_five,IFNULL(x2.month_six,0) month_six,IFNULL(x2.month_seven,0) month_seven,IFNULL(x2.month_eight,0) month_eight,-->
-            <!--IFNULL(x2.month_nine,0) month_nine,IFNULL(x2.month_ten,0) month_ten,IFNULL(x2.month_eleven,0) month_eleven,IFNULL(x2.month_twelve,0) month_twelve from (-->
-            <!--select 0 hardware_type_enum from dual-->
-            <!--union all-->
-            <!--SELECT 3 hardware_type_enum FROM DUAL-->
-            <!--UNION ALL-->
-            <!--SELECT 4 hardware_type_enum FROM DUAL-->
-            <!--UNION ALL-->
-            <!--SELECT 5 hardware_type_enum FROM DUAL-->
-        <!--)x1 left join (-->
-        <!--SELECT x1.type hardware_type_enum,x1.month_one,x1.month_two,x1.month_three,x1.month_four,x1.month_five,x1.month_six,x1.month_seven,-->
-            <!--x1.month_eight,x1.month_nine,x1.month_ten,x1.month_eleven,x1.month_twelve-->
-            <!--FROM (-->
-
-            <!--SELECT c.`risk_status` type,COUNT(1) month_one,0 month_two,0 month_three,0 month_four,0 month_five,0 month_six,0 month_seven-->
-            <!--,0 month_eight,0 month_nine,0 month_ten,0 month_eleven,0 month_twelve-->
-            <!--FROM lab_risk_plan_abnormal_log c,lab_subject s-->
-            <!--<where>-->
-                <!--AND c.subject_id = s.id AND c.`risk_status` in(0,3,4,5)-->
-                <!--AND DATE_FORMAT(DATE_SUB(CURDATE(),INTERVAL 11 MONTH), '%Y%m') = DATE_FORMAT(c.create_time, '%Y%m')-->
-                <!--<if test="deptId != null ">-->
-                    <!--and (s.`build_id` =#{deptId} OR s.`build_id` IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET(#{deptId},-->
-                    <!--ancestors) ))-->
-                <!--</if>-->
-                <!--GROUP BY c.`risk_status`-->
-            <!--</where>-->
-
-            <!--UNION ALL-->
-
-            <!--SELECT c.`risk_status` type,0 month_one,COUNT(1) month_two,0 month_three,0 month_four,0 month_five,0 month_six,0 month_seven-->
-            <!--,0 month_eight,0 month_nine,0 month_ten,0 month_eleven,0 month_twelve-->
-            <!--FROM lab_risk_plan_abnormal_log c,lab_subject s-->
-            <!--<where>-->
-                <!--AND c.subject_id = s.id AND c.`risk_status` in(0,3,4,5)-->
-                <!--AND DATE_FORMAT(DATE_SUB(CURDATE(),INTERVAL 10 MONTH), '%Y%m') = DATE_FORMAT(c.create_time, '%Y%m')-->
-                <!--<if test="deptId != null ">-->
-                    <!--and (s.`build_id` =#{deptId} OR s.`build_id` IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET(#{deptId},-->
-                    <!--ancestors) ))-->
-                <!--</if>-->
-                <!--GROUP BY c.`risk_status`-->
-            <!--</where>-->
-
-            <!--UNION ALL-->
-
-            <!--SELECT c.`risk_status` type,0 month_one,0 month_two,COUNT(1) month_three,0 month_four,0 month_five,0 month_six,0 month_seven-->
-            <!--,0 month_eight,0 month_nine,0 month_ten,0 month_eleven,0 month_twelve-->
-            <!--FROM lab_risk_plan_abnormal_log c,lab_subject s-->
-            <!--<where>-->
-                <!--AND c.subject_id = s.id AND c.`risk_status` in(0,3,4,5)-->
-                <!--AND DATE_FORMAT(DATE_SUB(CURDATE(),INTERVAL 9 MONTH), '%Y%m') = DATE_FORMAT(c.create_time, '%Y%m')-->
-                <!--<if test="deptId != null ">-->
-                    <!--and (s.`build_id` =#{deptId} OR s.`build_id` IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET(#{deptId},-->
-                    <!--ancestors) ))-->
-                <!--</if>-->
-                <!--GROUP BY c.`risk_status`-->
-            <!--</where>-->
-
-            <!--UNION ALL-->
-
-            <!--SELECT c.`risk_status` type,0 month_one,0 month_two,0 month_three,COUNT(1) month_four,0 month_five,0 month_six,0 month_seven-->
-            <!--,0 month_eight,0 month_nine,0 month_ten,0 month_eleven,0 month_twelve-->
-            <!--FROM lab_risk_plan_abnormal_log c,lab_subject s-->
-            <!--<where>-->
-                <!--AND c.subject_id = s.id AND c.`risk_status` in(0,3,4,5)-->
-                <!--AND DATE_FORMAT(DATE_SUB(CURDATE(),INTERVAL 8 MONTH), '%Y%m') = DATE_FORMAT(c.create_time, '%Y%m')-->
-                <!--<if test="deptId != null ">-->
-                    <!--and (s.`build_id` =#{deptId} OR s.`build_id` IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET(#{deptId},-->
-                    <!--ancestors) ))-->
-                <!--</if>-->
-                <!--GROUP BY c.`risk_status`-->
-            <!--</where>-->
-
-            <!--UNION ALL-->
-
-            <!--SELECT c.`risk_status` type,0 month_one,0 month_two,0 month_three,0 month_four,COUNT(1) month_five,0 month_six,0 month_seven-->
-            <!--,0 month_eight,0 month_nine,0 month_ten,0 month_eleven,0 month_twelve-->
-            <!--FROM lab_risk_plan_abnormal_log c,lab_subject s-->
-            <!--<where>-->
-                <!--AND c.subject_id = s.id AND c.`risk_status` in(0,3,4,5)-->
-                <!--AND DATE_FORMAT(DATE_SUB(CURDATE(),INTERVAL 7 MONTH), '%Y%m') = DATE_FORMAT(c.create_time, '%Y%m')-->
-                <!--<if test="deptId != null ">-->
-                    <!--and (s.`build_id` =#{deptId} OR s.`build_id` IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET(#{deptId},-->
-                    <!--ancestors) ))-->
-                <!--</if>-->
-                <!--GROUP BY c.`risk_status`-->
-            <!--</where>-->
-
-            <!--UNION ALL-->
-
-            <!--SELECT c.`risk_status` type,0 month_one,0 month_two,0 month_three,0 month_four,0 month_five,COUNT(1) month_six,0 month_seven-->
-            <!--,0 month_eight,0 month_nine,0 month_ten,0 month_eleven,0 month_twelve-->
-            <!--FROM lab_risk_plan_abnormal_log c,lab_subject s-->
-            <!--<where>-->
-                <!--AND c.subject_id = s.id AND c.`risk_status` in(0,3,4,5)-->
-                <!--AND DATE_FORMAT(DATE_SUB(CURDATE(),INTERVAL 6 MONTH), '%Y%m') = DATE_FORMAT(c.create_time, '%Y%m')-->
-                <!--<if test="deptId != null ">-->
-                    <!--and (s.`build_id` =#{deptId} OR s.`build_id` IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET(#{deptId},-->
-                    <!--ancestors) ))-->
-                <!--</if>-->
-                <!--GROUP BY c.`risk_status`-->
-            <!--</where>-->
-
-
-            <!--UNION ALL-->
-
-            <!--SELECT c.`risk_status` type,0 month_one,0 month_two,0 month_three,0 month_four,0 month_five,0 month_six,COUNT(1) month_seven-->
-            <!--,0 month_eight,0 month_nine,0 month_ten,0 month_eleven,0 month_twelve-->
-            <!--FROM lab_risk_plan_abnormal_log c,lab_subject s-->
-            <!--<where>-->
-                <!--AND c.subject_id = s.id AND c.`risk_status` in(0,3,4,5)-->
-                <!--AND DATE_FORMAT(DATE_SUB(CURDATE(),INTERVAL 5 MONTH), '%Y%m') = DATE_FORMAT(c.create_time, '%Y%m')-->
-                <!--<if test="deptId != null ">-->
-                    <!--and (s.`build_id` =#{deptId} OR s.`build_id` IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET(#{deptId},-->
-                    <!--ancestors) ))-->
-                <!--</if>-->
-                <!--GROUP BY c.`risk_status`-->
-            <!--</where>-->
-
-            <!--UNION ALL-->
-
-            <!--SELECT c.`risk_status` type,0 month_one,0 month_two,0 month_three,0 month_four,0 month_five,0 month_six,0 month_seven-->
-            <!--,COUNT(1) month_eight,0 month_nine,0 month_ten,0 month_eleven,0 month_twelve-->
-            <!--FROM lab_risk_plan_abnormal_log c,lab_subject s-->
-            <!--<where>-->
-                <!--AND c.subject_id = s.id AND c.`risk_status` in(0,3,4,5)-->
-                <!--AND DATE_FORMAT(DATE_SUB(CURDATE(),INTERVAL 4 MONTH), '%Y%m') = DATE_FORMAT(c.create_time, '%Y%m')-->
-                <!--<if test="deptId != null ">-->
-                    <!--and (s.`build_id` =#{deptId} OR s.`build_id` IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET(#{deptId},-->
-                    <!--ancestors) ))-->
-                <!--</if>-->
-                <!--GROUP BY c.`risk_status`-->
-            <!--</where>-->
-
-            <!--UNION ALL-->
-
-            <!--SELECT c.`risk_status` type,0 month_one,0 month_two,0 month_three,0 month_four,0 month_five,0 month_six,0 month_seven-->
-            <!--,0 month_eight,COUNT(1) month_nine,0 month_ten,0 month_eleven,0 month_twelve-->
-            <!--FROM lab_risk_plan_abnormal_log c,lab_subject s-->
-            <!--<where>-->
-                <!--AND c.subject_id = s.id AND c.`risk_status` in(0,3,4,5)-->
-                <!--AND DATE_FORMAT(DATE_SUB(CURDATE(),INTERVAL 3 MONTH), '%Y%m') = DATE_FORMAT(c.create_time, '%Y%m')-->
-                <!--<if test="deptId != null ">-->
-                    <!--and (s.`build_id` =#{deptId} OR s.`build_id` IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET(#{deptId},-->
-                    <!--ancestors) ))-->
-                <!--</if>-->
-                <!--GROUP BY c.`risk_status`-->
-            <!--</where>-->
-
-            <!--UNION ALL-->
-
-            <!--SELECT c.`risk_status` type,0 month_one,0 month_two,0 month_three,0 month_four,0 month_five,0 month_six,0 month_seven-->
-            <!--,0 month_eight,0 month_nine,COUNT(1) month_ten,0 month_eleven,0 month_twelve-->
-            <!--FROM lab_risk_plan_abnormal_log c,lab_subject s-->
-            <!--<where>-->
-                <!--AND c.subject_id = s.id AND c.`risk_status` in(0,3,4,5)-->
-                <!--AND DATE_FORMAT(DATE_SUB(CURDATE(),INTERVAL 2 MONTH), '%Y%m') = DATE_FORMAT(c.create_time, '%Y%m')-->
-                <!--<if test="deptId != null ">-->
-                    <!--and (s.`build_id` =#{deptId} OR s.`build_id` IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET(#{deptId},-->
-                    <!--ancestors) ))-->
-                <!--</if>-->
-                <!--GROUP BY c.`risk_status`-->
-            <!--</where>-->
-
-            <!--UNION ALL-->
-
-            <!--SELECT c.`risk_status` type,0 month_one,0 month_two,0 month_three,0 month_four,0 month_five,0 month_six,0 month_seven-->
-            <!--,0 month_eight,0 month_nine,0 month_ten,COUNT(1) month_eleven,0 month_twelve-->
-            <!--FROM lab_risk_plan_abnormal_log c,lab_subject s-->
-            <!--<where>-->
-                <!--AND c.subject_id = s.id AND c.`risk_status` in(0,3,4,5)-->
-                <!--AND DATE_FORMAT(DATE_SUB(CURDATE(),INTERVAL 1 MONTH), '%Y%m') = DATE_FORMAT(c.create_time, '%Y%m')-->
-                <!--<if test="deptId != null ">-->
-                    <!--and (s.`build_id` =#{deptId} OR s.`build_id` IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET(#{deptId},-->
-                    <!--ancestors) ))-->
-                <!--</if>-->
-                <!--GROUP BY c.`risk_status`-->
-            <!--</where>-->
-
-            <!--UNION ALL-->
-
-            <!--SELECT c.`risk_status` type,0 month_one,0 month_two,0 month_three,0 month_four,0 month_five,0 month_six,0 month_seven-->
-            <!--,0 month_eight,0 month_nine,0 month_ten,0 month_eleven,COUNT(1) month_twelve-->
-            <!--FROM lab_risk_plan_abnormal_log c,lab_subject s-->
-            <!--<where>-->
-                <!--AND c.subject_id = s.id AND c.`risk_status` in(0,3,4,5)-->
-                <!--AND DATE_FORMAT(CURDATE(), '%Y%m') = DATE_FORMAT(c.create_time, '%Y%m')-->
-                <!--<if test="deptId != null ">-->
-                    <!--and (s.`build_id` =#{deptId} OR s.`build_id` IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET(#{deptId},-->
-                    <!--ancestors) ))-->
-                <!--</if>-->
-                <!--GROUP BY c.`risk_status`-->
-            <!--</where>-->
-
-            <!--)x1 GROUP BY x1.type-->
-        <!--)x2 on x1.hardware_type_enum = x2.hardware_type_enum-->
-
     </select>
 
 
@@ -477,13 +257,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTimeStr != null and endTimeStr != ''"><!-- 结束时间检索 -->
                 AND date_format(gp.create_time,'%y%m%d') &lt;= date_format(#{endTimeStr},'%y%m%d')
             </if>
-            <!--<if test="(beginTimeStr == null or beginTimeStr == '') and (endTimeStr == null or endTimeStr == '')">-->
-                <!--AND DATE_FORMAT(gp.`create_time`,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')-->
-            <!--</if>-->
             <!-- 数据范围过滤 -->
             ${params.dataScope}
         </where>
         ORDER BY gp.create_time DESC
-
     </select>
 </mapper>

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

@@ -5,19 +5,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabExitLightMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabExitLight" id="LabExitLightResult">
-        <result property="id"    column="id"    />
-        <result property="subjectId"    column="subject_id"    />
-        <result property="buildId"    column="build_id"    />
-        <result property="relayCode"    column="relay_code"    />
-        <result property="relayBit"    column="relay_bit"    />
-        <result property="lightDirection"    column="light_direction"    />
-        <result property="lightStatus"    column="light_status"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="buildId" column="build_id"/>
+        <result property="relayCode" column="relay_code"/>
+        <result property="relayBit" column="relay_bit"/>
+        <result property="lightDirection" column="light_direction"/>
+        <result property="lightStatus" column="light_status"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectLabExitLightVo">
@@ -98,51 +98,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabExitLight" parameterType="com.zd.laboratory.domain.LabExitLight" useGeneratedKeys="true" keyProperty="id">
         insert into lab_exit_light
         <trim prefix="(" suffix=")" suffixOverrides=",">
-
-    <if test="subjectId != null">subject_id,</if>
-
-    <if test="buildId != null">build_id,</if>
-
-    <if test="relayCode != null">relay_code,</if>
-
-    <if test="relayBit != null">relay_bit,</if>
-
-    <if test="lightDirection != null">light_direction,</if>
-
-    <if test="lightStatus != null">light_status,</if>
-
-    <if test="configName != null">config_name,</if>
-
-    <if test="configStatus != null">config_status,</if>
-
-    <if test="userId != null">user_id,</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="remark != null">remark,</if>
-
+            <if test="subjectId != null">subject_id,</if>
+            <if test="buildId != null">build_id,</if>
+            <if test="relayCode != null">relay_code,</if>
+            <if test="relayBit != null">relay_bit,</if>
+            <if test="lightDirection != null">light_direction,</if>
+            <if test="lightStatus != null">light_status,</if>
+            <if test="configName != null">config_name,</if>
+            <if test="configStatus != null">config_status,</if>
+            <if test="userId != null">user_id,</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="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="subjectId != null">#{subjectId},</if>
-    <if test="buildId != null">#{buildId},</if>
-    <if test="relayCode != null">#{relayCode},</if>
-    <if test="relayBit != null">#{relayBit},</if>
-    <if test="lightDirection != null">#{lightDirection},</if>
-    <if test="lightStatus != null">#{lightStatus},</if>
-    <if test="configName != null">#{configName},</if>
-    <if test="configStatus != null">#{configStatus},</if>
-    <if test="userId != null">#{userId},</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="remark != null">#{remark},</if>
+            <if test="subjectId != null">#{subjectId},</if>
+            <if test="buildId != null">#{buildId},</if>
+            <if test="relayCode != null">#{relayCode},</if>
+            <if test="relayBit != null">#{relayBit},</if>
+            <if test="lightDirection != null">#{lightDirection},</if>
+            <if test="lightStatus != null">#{lightStatus},</if>
+            <if test="configName != null">#{configName},</if>
+            <if test="configStatus != null">#{configStatus},</if>
+            <if test="userId != null">#{userId},</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="remark != null">#{remark},</if>
          </trim>
     </insert>
 

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

@@ -5,16 +5,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabExitLineJoinMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabExitLineJoin" id="LabExitLineJoinResult">
-        <result property="id"    column="id"    />
-        <result property="lineId"    column="line_id"    />
-        <result property="subjectId"    column="subject_id"    />
-        <result property="lightId"    column="light_id"    />
-        <result property="lightOrder"    column="light_order"    />
-        <result property="lightDirection"    column="light_direction"    />
-        <result property="lightLeft"    column="light_left"    />
-        <result property="lightTop"    column="light_top"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
+        <result property="id" column="id"/>
+        <result property="lineId" column="line_id"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="lightId" column="light_id"/>
+        <result property="lightOrder" column="light_order"/>
+        <result property="lightDirection" column="light_direction"/>
+        <result property="lightLeft" column="light_left"/>
+        <result property="lightTop" column="light_top"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
     </resultMap>
 
     <sql id="selectLabExitLineJoinVo">
@@ -141,35 +141,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabExitLineJoin" parameterType="com.zd.laboratory.domain.LabExitLineJoin" useGeneratedKeys="true" keyProperty="id">
         insert into lab_exit_line_join
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="lineId != null">line_id,</if>
-
-    <if test="subjectId != null">subject_id,</if>
-
-    <if test="lightId != null">light_id,</if>
-
-    <if test="lightOrder != null">light_order,</if>
-
-    <if test="lightDirection != null">light_direction,</if>
-
-    <if test="lightLeft != null">light_left,</if>
-
-    <if test="lightTop != null">light_top,</if>
-
-    <if test="createBy != null">create_by,</if>
-
-    <if test="createTime != null">create_time,</if>
-
+            <if test="lineId != null">line_id,</if>
+            <if test="subjectId != null">subject_id,</if>
+            <if test="lightId != null">light_id,</if>
+            <if test="lightOrder != null">light_order,</if>
+            <if test="lightDirection != null">light_direction,</if>
+            <if test="lightLeft != null">light_left,</if>
+            <if test="lightTop != null">light_top,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="lineId != null">#{lineId},</if>
-    <if test="subjectId != null">#{subjectId},</if>
-    <if test="lightId != null">#{lightId},</if>
-    <if test="lightOrder != null">#{lightOrder},</if>
-    <if test="lightDirection != null">#{lightDirection},</if>
-    <if test="lightLeft != null">#{lightLeft},</if>
-    <if test="lightTop != null">#{lightTop},</if>
-    <if test="createBy != null">#{createBy},</if>
-    <if test="createTime != null">#{createTime},</if>
+            <if test="lineId != null">#{lineId},</if>
+            <if test="subjectId != null">#{subjectId},</if>
+            <if test="lightId != null">#{lightId},</if>
+            <if test="lightOrder != null">#{lightOrder},</if>
+            <if test="lightDirection != null">#{lightDirection},</if>
+            <if test="lightLeft != null">#{lightLeft},</if>
+            <if test="lightTop != null">#{lightTop},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
          </trim>
     </insert>
 

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

@@ -5,16 +5,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabExitLineMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabExitLine" id="LabExitLineResult">
-        <result property="id"    column="id"    />
-        <result property="lineDeptId"    column="line_dept_id"    />
-        <result property="buildId"    column="build_id"    />
-        <result property="lightDirection"    column="light_direction"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="lineDeptId" column="line_dept_id"/>
+        <result property="buildId" column="build_id"/>
+        <result property="lightDirection" column="light_direction"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectLabExitLineVo">
@@ -69,36 +69,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabExitLine" parameterType="com.zd.laboratory.domain.LabExitLine" useGeneratedKeys="true" keyProperty="id">
         insert into lab_exit_line
         <trim prefix="(" suffix=")" suffixOverrides=",">
-
-    <if test="lineDeptId != null">line_dept_id,</if>
-
-    <if test="buildId != null">build_id,</if>
-
-    <if test="lightDirection != null">light_direction,</if>
-
-    <if test="userId != null">user_id,</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="remark != null">remark,</if>
-
+            <if test="lineDeptId != null">line_dept_id,</if>
+            <if test="buildId != null">build_id,</if>
+            <if test="lightDirection != null">light_direction,</if>
+            <if test="userId != null">user_id,</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="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="lineDeptId != null">#{lineDeptId},</if>
-    <if test="buildId != null">#{buildId},</if>
-    <if test="lightDirection != null">#{lightDirection},</if>
-    <if test="userId != null">#{userId},</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="remark != null">#{remark},</if>
+            <if test="lineDeptId != null">#{lineDeptId},</if>
+            <if test="buildId != null">#{buildId},</if>
+            <if test="lightDirection != null">#{lightDirection},</if>
+            <if test="userId != null">#{userId},</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="remark != null">#{remark},</if>
          </trim>
     </insert>
 

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

@@ -5,21 +5,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabExitLineVertexMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabExitLineVertex" id="LabExitLineVertexResult">
-        <result property="id"    column="id"    />
-        <result property="buildId"    column="build_id"    />
-        <result property="floorId"    column="floor_id"    />
-        <result property="relationalData"    column="relational_data"    />
-        <result property="layoutData"    column="layout_data"    />
-        <result property="layoutJoinData"    column="layout_join_data"    />
-        <result property="imgUrl"    column="img_url"    />
-        <result property="canvasWidth"    column="canvas_width"    />
-        <result property="canvasHeight"    column="canvas_height"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="buildId" column="build_id"/>
+        <result property="floorId" column="floor_id"/>
+        <result property="relationalData" column="relational_data"/>
+        <result property="layoutData" column="layout_data"/>
+        <result property="layoutJoinData" column="layout_join_data"/>
+        <result property="imgUrl" column="img_url"/>
+        <result property="canvasWidth" column="canvas_width"/>
+        <result property="canvasHeight" column="canvas_height"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectLabExitLineVertexVo">
@@ -42,13 +42,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-
     <select id="selectLabExitLineVertexById"  resultType="com.zd.laboratory.domain.LabExitLineVertex">
         <include refid="selectLabExitLineVertexVo"/>
         where id = #{id}
     </select>
 
-
     <select id="getExitLineVertexList" parameterType="com.zd.laboratory.domain.LabExitLineVertex" resultType="com.zd.laboratory.domain.vo.LabExitLineVertexDetailVo">
         <include refid="selectLabExitLineListVo"/>
         <where>
@@ -71,51 +69,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabExitLineVertex" parameterType="com.zd.laboratory.domain.LabExitLineVertex" useGeneratedKeys="true" keyProperty="id">
         insert into lab_exit_line_vertex
         <trim prefix="(" suffix=")" suffixOverrides=",">
-
-    <if test="buildId != null">build_id,</if>
-
-    <if test="floorId != null">floor_id,</if>
-
-    <if test="relationalData != null">relational_data,</if>
-
-    <if test="layoutData != null">layout_data,</if>
-
-    <if test="layoutJoinData != null">layout_join_data,</if>
-
-    <if test="imgUrl != null">img_url,</if>
-
-    <if test="canvasWidth != null">canvas_width,</if>
-
-    <if test="canvasHeight != null">canvas_height,</if>
-
-    <if test="userId != null">user_id,</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="remark != null">remark,</if>
-
+            <if test="buildId != null">build_id,</if>
+            <if test="floorId != null">floor_id,</if>
+            <if test="relationalData != null">relational_data,</if>
+            <if test="layoutData != null">layout_data,</if>
+            <if test="layoutJoinData != null">layout_join_data,</if>
+            <if test="imgUrl != null">img_url,</if>
+            <if test="canvasWidth != null">canvas_width,</if>
+            <if test="canvasHeight != null">canvas_height,</if>
+            <if test="userId != null">user_id,</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="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="buildId != null">#{buildId},</if>
-    <if test="floorId != null">#{floorId},</if>
-    <if test="relationalData != null">#{relationalData},</if>
-    <if test="layoutData != null">#{layoutData},</if>
-    <if test="layoutJoinData != null">#{layoutJoinData},</if>
-    <if test="imgUrl != null">#{imgUrl},</if>
-    <if test="canvasWidth != null">#{canvasWidth},</if>
-    <if test="canvasHeight != null">#{canvasHeight},</if>
-    <if test="userId != null">#{userId},</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="remark != null">#{remark},</if>
+            <if test="buildId != null">#{buildId},</if>
+            <if test="floorId != null">#{floorId},</if>
+            <if test="relationalData != null">#{relationalData},</if>
+            <if test="layoutData != null">#{layoutData},</if>
+            <if test="layoutJoinData != null">#{layoutJoinData},</if>
+            <if test="imgUrl != null">#{imgUrl},</if>
+            <if test="canvasWidth != null">#{canvasWidth},</if>
+            <if test="canvasHeight != null">#{canvasHeight},</if>
+            <if test="userId != null">#{userId},</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="remark != null">#{remark},</if>
          </trim>
     </insert>