airbottle模块.xml优化

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">