chemical模块.xml优化，冗余代码移除

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 '系统通知'
@@ -107,29 +108,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 +151,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 +173,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>