lab模块**Mapper.xml优化，冗余代码移除

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -85,33 +85,19 @@
         insert into lab_check_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="remark != null">remark,</if>
-
             <if test="checkSmsMsg != null">check_sms_msg,</if>
-
             <if test="checkAioMsg != null">check_aio_msg,</if>
-
             <if test="checkAppMsg != null">check_app_msg,</if>
-
             <if test="rectifySmsMsg != null">rectify_sms_msg,</if>
-
             <if test="rectifyAioMsg != null">rectify_aio_msg,</if>
-
             <if test="rectifyAppMsg != null">rectify_app_msg,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deptId != null">#{deptId},</if>

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

@@ -88,28 +88,17 @@
         insert into lab_check_machine_msg
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="remark != null">remark,</if>
-
             <if test="checkRecordId != null">check_record_id,</if>
-
             <if test="checkMsg != null">check_msg,</if>
-
             <if test="type != null">type,</if>
             <if test="status != null">status,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deptId != null">#{deptId},</if>

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -72,31 +72,18 @@
         insert into lab_content_machine_msg
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="remark != null">remark,</if>
-
             <if test="contentId != null">content_id,</if>
-
             <if test="subId != null">sub_id,</if>
-
             <if test="contentMsg != null">content_msg,</if>
-
             <if test="type != null">type,</if>
-
             <if test="status != null">status,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deptId != null">#{deptId},</if>

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

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

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

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

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

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

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

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

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

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

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

@@ -5,21 +5,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabExitPointRelayMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabExitPointRelay" id="LabExitPointRelayResult">
-        <result property="id"    column="id"    />
-        <result property="buildId"    column="build_id"    />
-        <result property="floorId"    column="floor_id"    />
-        <result property="pointName"    column="point_name"    />
-        <result property="relayType"    column="relay_type"    />
-        <result property="relayCode"    column="relay_code"    />
-        <result property="relayBit"    column="relay_bit"    />
-        <result property="configName"    column="config_name"    />
-        <result property="configStatus"    column="config_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="buildId" column="build_id"/>
+        <result property="floorId" column="floor_id"/>
+        <result property="pointName" column="point_name"/>
+        <result property="relayType" column="relay_type"/>
+        <result property="relayCode" column="relay_code"/>
+        <result property="relayBit" column="relay_bit"/>
+        <result property="configName" column="config_name"/>
+        <result property="configStatus" column="config_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="selectLabExitPointRelayVo">
@@ -43,35 +43,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabExitPointRelay" parameterType="com.zd.laboratory.domain.LabExitPointRelay" useGeneratedKeys="true" keyProperty="id">
         insert into lab_exit_point_relay
         <trim prefix="(" suffix=")" suffixOverrides=",">
-
             <if test="buildId != null">build_id,</if>
-
             <if test="floorId != null">floor_id,</if>
-
             <if test="pointName != null">point_name,</if>
-
             <if test="relayType != null">relay_type,</if>
-
             <if test="relayCode != null">relay_code,</if>
-
             <if test="relayBit != null">relay_bit,</if>
-
             <if test="configName != null">config_name,</if>
-
             <if test="configStatus != null">config_status,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="remark != null">remark,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="buildId != null">#{buildId},</if>
@@ -91,7 +76,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
     </insert>
 
-
     <update id="updateLabExitPointRelay" parameterType="com.zd.laboratory.domain.LabExitPointRelay">
         update lab_exit_point_relay
         <trim prefix="SET" suffixOverrides=",">

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

@@ -192,33 +192,19 @@
         insert into lab_grade_manage
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="remark != null">remark,</if>
-
             <if test="level != null">level,</if>
-
             <if test="typeId != null">type_id,</if>
-
             <if test="subIds != null">sub_ids,</if>
-
             <if test="name != null">name,</if>
-
             <if test="moldId != null">mold_id,</if>
-
             <if test="status != null">status,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deptId != null">#{deptId},</if>

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

@@ -80,29 +80,17 @@
         insert into lab_grade_manage_record_detail
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="remark != null">remark,</if>
-
             <if test="manageRecordId != null">manage_record_id,</if>
-
             <if test="imgUrl != null">img_url,</if>
-
             <if test="imgName != null">img_name,</if>
-
             <if test="imgType != null">img_type,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deptId != null">#{deptId},</if>

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

@@ -156,7 +156,6 @@
            ifnull(r.remark, "") as ruleRemark, re.status, re.carry_time, ru.is_upload, re.end_date, re.cycle_count,
            ru.is_all,
            CASE
-
                WHEN ru.cycle = '一天' THEN
                    '日管控'
                WHEN ru.cycle = '一周' THEN
@@ -173,16 +172,6 @@
                END AS ruleType,
            case when re.STATUS is not null and re.STATUS = 0
                     then 1 end as isExpired
-
         from lab_grade_manage_record re
             left join lab_grade_manage_rule r on re.rule_id = r.id
             left join lab_grade_manage_rule_user ru on re.rule_user_id = ru.id and re.cycle_count = ru.cycle_count
@@ -368,9 +357,7 @@
     </select>
 
     <select id="queryManageWorkCharts" resultType="com.zd.laboratory.domain.vo.LabManageWorkChartVo">
-
         select t.update_time as currentDate, count(t.id) as planNum, t.cycle
-
         from
         (SELECT DISTINCT
         substring_index( substring_index( mru.user_ids, ',', t2.help_topic_id + 1 ), ',',- 1 ) userId,
@@ -441,41 +428,24 @@
         insert into lab_grade_manage_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="remark != null">remark,</if>
-
             <if test="ruleId != null">rule_id,</if>
-
             <if test="ruleName != null">rule_name,</if>
-
             <if test="ruleUserId != null">rule_user_id,</if>
-
             <if test="subId != null">sub_id,</if>
-
             <if test="joinUserId != null">join_user_id,</if>
-
             <if test="userPosition != null">user_position,</if>
-
             <if test="status != null">status,</if>
-
             <if test="carryTime != null">carry_time,</if>
-
             <if test="endDate != null">end_date,</if>
             <if test="cycleCount != null">cycle_count,</if>
             <if test="ruleType != null">rule_type,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deptId != null">#{deptId},</if>

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

@@ -66,21 +66,6 @@
         where id = #{id}
     </select>
 
-    <!--select r.id as ruleId, r.name as ruleName, r.remark as ruleRemark,
-               ifnull(mr.status, 1) as status, mr.carry_time as carryTime,
-               ru.is_upload as isUpload, ru.id as ruleUserId,
-               case
-                   when ru.cycle = '一天' then date_add(ru.update_time ,INTERVAL 1 day)
-                   when ru.cycle = '一周' then date_add(ru.update_time ,INTERVAL 7 day)
-                   when ru.cycle = '一月' then date_add(ru.update_time ,INTERVAL 1 MONTH)
-                   when ru.cycle = '一年' then date_add(ru.update_time ,INTERVAL 1 year)
-                   else null
-                end as endDate
-        from lab_grade_manage_rule r
-            left join lab_grade_manage m on r.grade_manage_id = m.id
-            left join lab_grade_manage_record mr on r.id = mr.rule_id
-            left join lab_grade_manage_rule_user ru on r.id = ru.grade_manage_rule_id
-        where ru.type = 3 and find_in_set(#{subId}, m.sub_ids) and find_in_set(#{userId}, ru.user_ids)-->
     <select id="selectMyLabGradeManageWorkDetailByType3"
             resultType="com.zd.laboratory.api.vo.LabGradeManageWorkDetailVO">
 
@@ -130,24 +115,6 @@
                            ON a.ruleUserId = mr.rule_user_id and mr.sub_id = #{subId} and mr.join_user_id = #{userId}
     </select>
 
-    <!--select r.id as ruleId, r.name as ruleName, r.remark as ruleRemark,
-               ifnull(mr.status, 1) as status, mr.carry_time as carryTime,
-               ru.is_upload as isUpload, ru.id as ruleUserId,
-               case
-                   when ru.cycle = '一天' then date_add(ru.update_time ,INTERVAL 1 day)
-                   when ru.cycle = '一周' then date_add(ru.update_time ,INTERVAL 7 day)
-                   when ru.cycle = '一月' then date_add(ru.update_time ,INTERVAL 1 MONTH)
-                   when ru.cycle = '一年' then date_add(ru.update_time ,INTERVAL 1 year)
-                   else null
-                   end as endDate
-        from lab_grade_manage_rule r
-                 left join lab_grade_manage m on r.grade_manage_id = m.id
-                 left join lab_grade_manage_record mr on r.id = mr.rule_id
-                 left join lab_grade_manage_rule_user ru on r.id = ru.grade_manage_rule_id
-        where ru.type = 1 and ru.id in
-        <foreach item="id" collection="list" open="(" separator="," close=")">
-            #{id}
-        </foreach>-->
     <select id="selectMyLabGradeManageWorkDetailByType1"
             resultType="com.zd.laboratory.api.vo.LabGradeManageWorkDetailVO">
 
@@ -201,21 +168,6 @@
         mr.sub_id = #{subId}
     </select>
 
-    <!--select r.id as ruleId, r.name as ruleName, r.remark as ruleRemark,
-               ifnull(mr.status, 1) as status, mr.carry_time as carryTime,
-               ru.is_upload as isUpload, ru.id as ruleUserId,
-               case
-                   when ru.cycle = '一天' then date_add(ru.update_time ,INTERVAL 1 day)
-                   when ru.cycle = '一周' then date_add(ru.update_time ,INTERVAL 7 day)
-                   when ru.cycle = '一月' then date_add(ru.update_time ,INTERVAL 1 MONTH)
-                   when ru.cycle = '一年' then date_add(ru.update_time ,INTERVAL 1 year)
-                   else null
-                   end as endDate
-        from lab_grade_manage_rule r
-                 left join lab_grade_manage m on r.grade_manage_id = m.id
-                 left join lab_grade_manage_record mr on r.id = mr.rule_id
-                 left join lab_grade_manage_rule_user ru on r.id = ru.grade_manage_rule_id
-        where ru.type = 2 and ru.id = #{id}-->
     <select id="selectMyLabGradeManageWorkDetailByType2"
             resultType="com.zd.laboratory.api.vo.LabGradeManageWorkDetailVO">
         select a.*,
@@ -261,6 +213,7 @@
                  left join lab_grade_manage_record mr
                            on a.ruleUserId = mr.rule_user_id and mr.join_user_id = #{userId} and mr.sub_id = #{subId}
     </select>
+
     <select id="selectMyLabGradeManageWorkDetailByType"
             resultType="com.zd.laboratory.api.vo.LabGradeManageWorkDetailVO">
         select * from (
@@ -381,25 +334,15 @@
         insert into lab_grade_manage_rule
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="remark != null">remark,</if>
-
             <if test="name != null">name,</if>
-
             <if test="gradeManageId != null">grade_manage_id,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deptId != null">#{deptId},</if>

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

@@ -213,36 +213,21 @@
         insert into lab_grade_manage_rule_user
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="remark != null">remark,</if>
-
             <if test="gradeManageId != null">grade_manage_id,</if>
-
             <if test="gradeManageRuleId != null">grade_manage_rule_id,</if>
-
             <if test="type != null">type,</if>
-
             <if test="userIds != null">user_ids,</if>
-
             <if test="isUpload != null">is_upload,</if>
             <if test="isAll != null">is_all,</if>
-
             <if test="cycle != null">cycle,</if>
-
             <if test="cycleCount != null">cycle_count,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deptId != null">#{deptId},</if>

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

@@ -199,7 +199,6 @@
         order by xx.create_time desc
     </select>
 
-
     <select id="selectLabHardwareById" resultMap="LabHardwareVOResult">
         <include refid="selectLabHardwareVo"/>
         where xx.id = #{id}
@@ -378,15 +377,10 @@
             <if test="configStatus != null">config_status,</if>
             <if test="ipAddress != null">ip_address,</if>
             <if test="manufacturerType != null">manufacturer_type,</if>
-
             <if test="port != null">port,</if>
-
             <if test="uniformPower != null">uniform_power,</if>
-
             <if test="sessionIndex != null">session_index,</if>
-
             <if test="channels != null">channels,</if>
-
             <if test="lockId != null">lock_id,</if>
             <if test="isPcfire != null">is_pcfire,</if>
         </trim>

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

@@ -92,34 +92,19 @@
         insert into lab_hazard_book
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="name != null">name,</if>
-
             <if test="pinYinChar != null">pin_yin_char,</if>
-
             <if test="pinYin != null">pin_yin,</if>
-
             <if test="code != null">code,</if>
-
             <if test="content != null">content,</if>
-
-
             <if test="scanCount != null">scan_count,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="remark != null">remark,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>

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

@@ -193,20 +193,6 @@
         where a.id = #{id}
     </select>
 
-    <!--        union all-->
-    <!--        select '' as hazardId, c.id as containerId, 2 as type, concat(ifnull(h.ch_name ,""), "-", c.material_quality) as name,-->
-    <!--            floor((select (select count(1) from lab_hazard_subject_relation where container_id = c.id)/(select count(1) from lab_hazard_subject_relation) * 100)) as labScale,-->
-    <!--            floor((select (select count(1) from lab_risk_plan where container_id = c.id)/(select count(1) from lab_risk_plan) * 100)) as planScale,-->
-    <!--            floor((select (select count(1) from lab_risk_plan_abnormal_log where risk_plan_id in (select id from lab_risk_plan where container_id = c.id))/(select count(1) from lab_risk_plan_abnormal_log) * 100)) as faultScale-->
-    <!--        from lab_container c left join lab_hazard h on c.hazard_id = h.id-->
-    <!--        <where>-->
-    <!--            <if test="name != null and name != ''">-->
-    <!--                and (h.ch_name like concat("%", #{name}, "%") or c.material_quality like concat("%", #{name}, "%"))-->
-    <!--            </if>-->
-    <!--            <if test="type != null and type != '' and type == '1' ">-->
-    <!--                and false-->
-    <!--            </if>-->
-    <!--        </where>-->
     <select id="selectLabHazardAndContainerList" resultType="com.zd.laboratory.domain.dto.LabHazardDTO">
         select hazardId, containerId, type, name, code,
         ifnull(scanCount, 0) scanCount,
@@ -230,7 +216,6 @@
             <!--            </if>-->
         </where>
         order by code ) a
-
     </select>
 
     <insert id="insertLabHazard" parameterType="int" useGeneratedKeys="true" keyProperty="id">
@@ -368,8 +353,6 @@
         </foreach>
     </insert>
 
-
-
     <select id="listByHazard" parameterType="com.zd.laboratory.domain.vo.LabHazardVO" resultMap="LabHazardVoResult">
         SELECT
           h.`ch_name` hazard_name,
@@ -482,8 +465,6 @@
         )x1 WHERE x1.num IS NOT NULL
     </select>
 
-
-
     <select id="queryHazardColumnarTop" resultType="java.util.Map" parameterType="com.zd.laboratory.domain.LabHazard">
         select x1.*,concat(ROUND(x1.num/x1.totalNum*100,2),'%') percentage from (
         select h.`id`,count(hr.`hazard_id`) num,
@@ -507,7 +488,6 @@
 
     </select>
 
-
     <select id="queryHazardList" resultType="com.zd.laboratory.domain.vo.LabHazardColumnarVO" parameterType="com.zd.laboratory.domain.vo.LabHazardVO">
         select x1.*,concat(ROUND(x1.num/x1.totalNum*100,2),'%') percentage,
         ROUND(x1.num/x1.totalNum*100,2) percentageNum from (
@@ -541,17 +521,7 @@
 
     </select>
 
-
     <select id="queryBigViewHazardList" resultType="com.zd.laboratory.domain.vo.LabHazardBigViewVO" parameterType="com.zd.laboratory.domain.vo.LabHazardVO">
-
-        <!--SELECT sd.`dict_label` dictLabel,sd.`dict_value` dictValue,ROUND((SUM(IFNULL(sk.usages,0)-IFNULL(sk.tare,0)))/1000,2) totalNum,'kg' unit
-        FROM sys_dict_data sd
-        LEFT JOIN lab_hazard hd  ON sd.`dict_value` = hd.`hazard_type_mode`
-        LEFT JOIN lab_hazard_subject_relation hsr ON hsr.hazard_id = hd.`id`
-        LEFT JOIN hxp_stock sk ON sk.`sub_id` = hsr.`subject_id` AND sk.`status`=1
-        LEFT JOIN lab_subject st ON sk.`sub_id` = st.`id`
-        WHERE sd.`dict_type` = 'lab_hazard_type' AND sd.`dict_value`=1
-        -->
         SELECT sd.`dict_label` dictLabel,sd.`dict_value` dictValue,SUM(CASE WHEN hsr.id IS NULL THEN 0 ELSE 1 END) totalNum,'kg' unit FROM sys_dict_data sd
         LEFT JOIN lab_hazard hd  ON sd.`dict_value` = hd.`hazard_type_mode`
         LEFT JOIN lab_hazard_subject_relation hsr ON hsr.hazard_id = hd.`id`
@@ -559,9 +529,7 @@
         WHERE sd.`dict_type` = 'lab_hazard_type' AND sd.`dict_value`=1
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-
         UNION ALL
-
         SELECT sd.`dict_label` dictLabel,sd.`dict_value` dictValue,SUM(CASE WHEN hsr.id IS NULL THEN 0 ELSE 1 END) totalNum,'瓶' unit FROM sys_dict_data sd
         LEFT JOIN lab_hazard hd  ON sd.`dict_value` = hd.`hazard_type_mode`
         LEFT JOIN lab_hazard_subject_relation hsr ON hsr.hazard_id = hd.`id`
@@ -569,9 +537,7 @@
         WHERE sd.`dict_type` = 'lab_hazard_type' AND sd.`dict_value`=2
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-
         UNION ALL
-
         SELECT sd.`dict_label` dictLabel,sd.`dict_value` dictValue,SUM(CASE WHEN hd.id IS NULL THEN 0 ELSE 1 END) totalNum,'台' unit FROM sys_dict_data sd
         LEFT JOIN lab_hazard hd  ON sd.`dict_value` = hd.`hazard_type_mode`
         LEFT JOIN lab_hazard_subject_relation hsr ON hsr.hazard_id = hd.`id`
@@ -579,9 +545,7 @@
         WHERE sd.`dict_type` = 'lab_hazard_type' AND sd.`dict_value`=3
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-
         UNION ALL
-
         SELECT sd.`dict_label` dictLabel,sd.`dict_value` dictValue,SUM(CASE WHEN hsr.id IS NULL THEN 0 ELSE 1 END) totalNum,'台' unit FROM sys_dict_data sd
         LEFT JOIN lab_hazard hd  ON sd.`dict_value` = hd.`hazard_type_mode`
         LEFT JOIN lab_hazard_subject_relation hsr ON hsr.hazard_id = hd.`id`
@@ -589,9 +553,7 @@
         WHERE sd.`dict_type` = 'lab_hazard_type' AND sd.`dict_value`=4
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-
         UNION ALL
-
         SELECT sd.`dict_label` dictLabel,sd.`dict_value` dictValue,SUM(CASE WHEN hsr.id IS NULL THEN 0 ELSE 1 END) totalNum,NULL unit FROM sys_dict_data sd
         LEFT JOIN lab_hazard hd  ON sd.`dict_value` = hd.`hazard_type_mode`
         LEFT JOIN lab_hazard_subject_relation hsr ON hsr.hazard_id = hd.`id`

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

@@ -42,16 +42,10 @@
     <select id="queryCountBySubIds" resultType="com.zd.system.api.entity.CommonCount">
         select count(id) count,lhsr.subject_id as id from  lab_hazard_subject_relation lhsr
         where lhsr.subject_id in
-
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
-
         GROUP BY lhsr.subject_id
-
-
-
-
     </select>
 
     <select id="selectLabHazardSubjectRelationById"  resultMap="LabHazardSubjectRelationResult">
@@ -76,9 +70,6 @@
             <if test="hazardId != null">
                 and sr.subject_id = #{subjectId}
             </if>
-<!--            <if test="containerId != null">-->
-<!--                and sr.container_id = #{containerId}-->
-<!--            </if>-->
         </where>
     </select>
     <select id="queryBySubjectId" resultMap="LabHazardSubjectRelationResult">

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

@@ -47,7 +47,6 @@
 
     <sql id="selectDetail">
         select s.*,
-
             (select group_concat(nick_name) from sys_user where find_in_set(user_id, s.user_ids) ) as userNames
         from
         (   select t.id,
@@ -124,7 +123,6 @@
         order by t.create_time desc
     </select>
 
-
     <select id="selectLabClearMessageList" parameterType="com.zd.laboratory.domain.dto.LabMessageContentListQuery"
             resultType="com.zd.laboratory.domain.vo.LabMessageContentVO">
         <include refid="selectlistVO"/>
@@ -136,7 +134,6 @@
         order by t.create_time desc
     </select>
 
-
     <select id="selectLabMessageContentById"
             resultType="com.zd.laboratory.api.entity.LabMessageContent">
         <include refid="selectDetail"/>

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

@@ -5,25 +5,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabMessageDynamicMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabMessageDynamic" id="LabMessageDynamicResult">
-        <result property="id"    column="id"    />
-        <result property="sendRange"    column="send_range"    />
-        <result property="messClass"    column="mess_class"    />
-        <result property="content"    column="content"    />
-        <result property="dynamicId"    column="dynamic_id"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="sendRange" column="send_range"/>
+        <result property="messClass" column="mess_class"/>
+        <result property="content" column="content"/>
+        <result property="dynamicId" column="dynamic_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectLabMessageDynamicVo">
         select id, send_range, mess_class, content, dynamic_id, create_time, user_id, create_by, update_time, update_by, remark from lab_message_dynamic
     </sql>
+
     <sql id="selectLabMessageDynamicListVo">
         select t.id, t.send_range, t.mess_class, t.content, t.dynamic_id, t.create_time, t.user_id, t.create_by, t.update_time, t.update_by, t.remark from lab_message_dynamic as t
     </sql>
+
     <select id="selectLabMessageDynamicList" parameterType="com.zd.laboratory.domain.LabMessageDynamic" resultMap="LabMessageDynamicResult">
         <include refid="selectLabMessageDynamicVo"/>
         <where>
@@ -49,38 +51,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabMessageDynamic" parameterType="com.zd.laboratory.domain.LabMessageDynamic" useGeneratedKeys="true" keyProperty="id">
         insert into lab_message_dynamic
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="sendRange != null">send_range,</if>
-
-    <if test="messClass != null">mess_class,</if>
-
-    <if test="content != null">content,</if>
-
-    <if test="dynamicId != null">dynamic_id,</if>
-
-    <if test="createTime != null">create_time,</if>
-
-    <if test="userId != null">user_id,</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>
-
+            <if test="sendRange != null">send_range,</if>
+            <if test="messClass != null">mess_class,</if>
+            <if test="content != null">content,</if>
+            <if test="dynamicId != null">dynamic_id,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="userId != null">user_id,</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="sendRange != null">#{sendRange},</if>
-    <if test="messClass != null">#{messClass},</if>
-    <if test="content != null">#{content},</if>
-    <if test="dynamicId != null">#{dynamicId},</if>
-    <if test="createTime != null">#{createTime},</if>
-    <if test="userId != null">#{userId},</if>
-    <if test="createBy != null">#{createBy},</if>
-    <if test="updateTime != null">#{updateTime},</if>
-    <if test="updateBy != null">#{updateBy},</if>
-    <if test="remark != null">#{remark},</if>
+            <if test="sendRange != null">#{sendRange},</if>
+            <if test="messClass != null">#{messClass},</if>
+            <if test="content != null">#{content},</if>
+            <if test="dynamicId != null">#{dynamicId},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
 

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

@@ -110,34 +110,6 @@
     </select>
 
     <select id="selectListVO" parameterType="com.zd.laboratory.api.entity.LabMessageUser" resultType="com.zd.laboratory.api.vo.LabMessageUserListVO">
-        <!--SELECT
-            lc.id,
-            #{joinUserId} AS join_user_id,
-            lc.id AS message_id,
-            lc.create_time,
-            lc.dept_ids,
-            0 AS is_read,
-            lc.dept_name,
-            lc.user_id,
-            lc.create_by,
-            lc.update_time,
-            lc.update_by,
-            lc.remark,
-            lc.content AS meaasge_context,
-            s.nick_name AS send_name
-        FROM
-            lab_message_content lc
-                left join sys_user s on s.user_id = #{joinUserId}
-        where  lc.send_range =1
-           or (
-            lc.send_range =2 and FIND_IN_SET(#{deptId},lc.dept_ids)
-            )
-           or (
-            lc.send_range =3 and FIND_IN_SET(s.user_id,lc.user_ids) or
-            (find_in_set(s.dept_id, lc.dept_ids) and find_in_set(s.position, lc.post_ids))
-            )
-        order by lc.create_time desc
-        -->
         SELECT x1.* FROM (
         SELECT ur.`join_user_id` AS join_user_id,
         su.nick_name AS send_name,

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

@@ -69,23 +69,14 @@
         insert into lab_mold
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="deptName != null">dept_name,</if>
-
             <if test="deptId != null">dept_id,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="userId != null">user_id,</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>
-
             <if test="moldName != null">mold_name,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deptName != null">#{deptName},</if>

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

@@ -5,20 +5,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabNegativeListRecordsMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabNegativeListRecords" id="LabNegativeListRecordsResult">
-        <result property="id"    column="id"    />
-        <result property="joinUserId"    column="user_id"    />
-        <result property="userName"    column="user_name"    />
-        <result property="belongCollege"    column="belong_college"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="reason"    column="reason"    />
-        <result property="status"    column="status"    />
-        <result property="violationNum"    column="violation_num"    />
-        <result property="negativeListNum"    column="negative_list_num"    />
-        <result property="blackListNum"    column="black_list_num"    />
-        <result property="ceditScore"    column="credit_score"    />
-        <result property="isNegative"    column="is_negative"    />
-        <result property="isBlackList"    column="is_black_list"    />
-        <result property="creact_id"    column="creact_id"    />
+        <result property="id" column="id"/>
+        <result property="joinUserId" column="user_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="belongCollege" column="belong_college"/>
+        <result property="createTime" column="create_time"/>
+        <result property="reason" column="reason"/>
+        <result property="status" column="status"/>
+        <result property="violationNum" column="violation_num"/>
+        <result property="negativeListNum" column="negative_list_num"/>
+        <result property="blackListNum" column="black_list_num"/>
+        <result property="ceditScore" column="credit_score"/>
+        <result property="isNegative" column="is_negative"/>
+        <result property="isBlackList" column="is_black_list"/>
+        <result property="creact_id" column="creact_id"/>
     </resultMap>
 
     <sql id="selectLabNegativeListRecordsVo">
@@ -58,14 +58,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="creact_id!=null"> and v.creact_id=#{creact_id}</if>
             <if test="userName != null and userName!=''">
                 and u.nick_name like concat('%', #{userName}, '%')
-
             </if>
             <if test="stuNo != null and stuNo!=''">
-
                and  u.user_name like concat('%', #{stuNo}, '%')
             </if>
             <if test="deptId != null  and deptId != ''"> and d.dept_Id = #{deptId}</if>
-
             <if test="order=='violationNum'">
                 order by v.violation_num ${orderType}
             </if>
@@ -93,46 +90,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabNegativeListRecords" parameterType="com.zd.laboratory.domain.LabNegativeListRecords" useGeneratedKeys="true" keyProperty="id">
         insert into lab_negative_list_records
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="userId != null">user_id,</if>
-    <if test="userName != null">user_name,</if>
-
-    <if test="stuNo != null">stu_no,</if>
-
-    <if test="belongCollege != null">belong_college,</if>
-
-    <if test="createTime != null">create_time,</if>
-
-    <if test="reason != null">reason,</if>
-
-    <if test="status != null">status,</if>
-
-    <if test="violationNum != null">violation_num,</if>
-
-    <if test="negativeListNum != null">negative_list_num,</if>
-
-    <if test="blackListNum != null">black_list_num,</if>
-
-    <if test="ceditScore != null">credit_score,</if>
-    <if test="isNegative != null">is_negative,</if>
-    <if test="isBlackList != null">is_black_list,</if>
-    <if test="creact_id!= null">creact_id</if>
-         </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
-     <if test="userId != null">#{userId},</if>
-    <if test="userName != null">#{userName},</if>
-    <if test="stuNo != null">#{stuNo},</if>
-    <if test="belongCollege != null">#{belongCollege},</if>
-    <if test="createTime != null">#{createTime},</if>
-    <if test="reason != null">#{reason},</if>
-    <if test="status != null">#{status},</if>
-    <if test="violationNum != null">#{violationNum},</if>
-    <if test="negativeListNum != null">#{negativeListNum},</if>
-    <if test="blackListNum != null">#{blackListNum},</if>
-    <if test="ceditScore != null">#{ceditScore},</if>
+            <if test="userId != null">user_id,</if>
+            <if test="userName != null">user_name,</if>
+            <if test="stuNo != null">stu_no,</if>
+            <if test="belongCollege != null">belong_college,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="reason != null">reason,</if>
+            <if test="status != null">status,</if>
+            <if test="violationNum != null">violation_num,</if>
+            <if test="negativeListNum != null">negative_list_num,</if>
+            <if test="blackListNum != null">black_list_num,</if>
+            <if test="ceditScore != null">credit_score,</if>
+            <if test="isNegative != null">is_negative,</if>
+            <if test="isBlackList != null">is_black_list,</if>
+            <if test="creact_id!= null">creact_id</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="userName != null">#{userName},</if>
+            <if test="stuNo != null">#{stuNo},</if>
+            <if test="belongCollege != null">#{belongCollege},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="reason != null">#{reason},</if>
+            <if test="status != null">#{status},</if>
+            <if test="violationNum != null">#{violationNum},</if>
+            <if test="negativeListNum != null">#{negativeListNum},</if>
+            <if test="blackListNum != null">#{blackListNum},</if>
+            <if test="ceditScore != null">#{ceditScore},</if>
             <if test="isNegative != null">#{isNegative},</if>
             <if test="isBlackList != null">#{isBlackList},</if>
-     <if test="creact_id!= null">#{creact_id}</if>
-         </trim>
+            <if test="creact_id!= null">#{creact_id}</if>
+        </trim>
     </insert>
 
     <update id="updateLabNegativeListRecords" parameterType="com.zd.laboratory.domain.LabNegativeListRecords">
@@ -204,12 +192,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE user_id=#{userId}
     </update>
 
-
-
-
-
-
-
     <delete id="delByUserId" >
         delete from lab_negative_list_records where user_id=#{userId}
     </delete>

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

@@ -3,15 +3,15 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zd.laboratory.mapper.LabNegativeListSiteMapper">
-    
+
     <resultMap type="com.zd.laboratory.domain.LabNegativeListSite" id="LabNegativeListSiteResult">
-        <result property="id"    column="id"    />
-        <result property="violationsNum"    column="violations_num"    />
-        <result property="creditScoreStart"    column="credit_score_start"    />
-        <result property="creditScoreEnd"    column="credit_score_end"    />
-        <result property="solutionType"    column="solution_type"    />
-        <result property="questionsNum"    column="questions_num"    />
-        <result property="durationTime"    column="duration_time"    />
+        <result property="id" column="id"/>
+        <result property="violationsNum" column="violations_num"/>
+        <result property="creditScoreStart" column="credit_score_start"/>
+        <result property="creditScoreEnd" column="credit_score_end"/>
+        <result property="solutionType" column="solution_type"/>
+        <result property="questionsNum" column="questions_num"/>
+        <result property="durationTime" column="duration_time"/>
     </resultMap>
 
     <sql id="selectLabNegativeListSiteVo">
@@ -41,26 +41,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabNegativeListSite" parameterType="com.zd.laboratory.domain.LabNegativeListSite" useGeneratedKeys="true" keyProperty="id">
         insert into lab_negative_list_site
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="violationsNum != null">violations_num,</if>
-
-    <if test="creditScoreStart != null">credit_score_start,</if>
-
-    <if test="creditScoreEnd != null">credit_score_end,</if>
-
-    <if test="solutionType != null">solution_type,</if>
-
-    <if test="questionsNum != null">questions_num,</if>
-
-    <if test="durationTime != null">duration_time,</if>
-
+            <if test="violationsNum != null">violations_num,</if>
+            <if test="creditScoreStart != null">credit_score_start,</if>
+            <if test="creditScoreEnd != null">credit_score_end,</if>
+            <if test="solutionType != null">solution_type,</if>
+            <if test="questionsNum != null">questions_num,</if>
+            <if test="durationTime != null">duration_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="violationsNum != null">#{violationsNum},</if>
-    <if test="creditScoreStart != null">#{creditScoreStart},</if>
-    <if test="creditScoreEnd != null">#{creditScoreEnd},</if>
-    <if test="solutionType != null">#{solutionType},</if>
-    <if test="questionsNum != null">#{questionsNum},</if>
-    <if test="durationTime != null">#{durationTime},</if>
+            <if test="violationsNum != null">#{violationsNum},</if>
+            <if test="creditScoreStart != null">#{creditScoreStart},</if>
+            <if test="creditScoreEnd != null">#{creditScoreEnd},</if>
+            <if test="solutionType != null">#{solutionType},</if>
+            <if test="questionsNum != null">#{questionsNum},</if>
+            <if test="durationTime != null">#{durationTime},</if>
          </trim>
     </insert>
 

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

@@ -5,33 +5,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabNegativelistHistoryMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabNegativelistHistory" id="LabNegativelistHistoryResult">
-        <result property="id"    column="id"    />
-        <result property="blackId"    column="black_id"    />
-        <result property="reason"    column="reason"    />
-        <result property="treatmentMethod"    column="treatment_method"    />
-        <result property="learnStatus"    column="learn_status"    />
-        <result property="testStatus"    column="test_status"    />
-        <result property="practiceStatus"    column="practice_status"    />
-        <result property="overStatus"    column="over_status"    />
-        <result property="handleDay"    column="handle_day"    />
-        <result property="creditScore"    column="credit_score"    />
-        <result property="numberTopics"    column="number_topics"    />
-        <result property="numberAccuracy"    column="number_accuracy"    />
-        <result property="learnTime"    column="learn_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-        <result property="laboratoryName"    column="laboratory_name"    />
-        <result property="laboratoryId"    column="laboratory_id"    />
-        <result property="deductionVal"    column="deduction_val"    />
-        <result property="dataType"    column="data_type"    />
-        <result property="userId"    column="user_id"    />
-        <result property="userName"    column="user_name"    />
-        <result property="warningStatus"    column="warningStatus"    />
-        <result property="interviewStatus"    column="interviewStatus"    />
-        <result property="violationType"    column="violationType"    />
+        <result property="id" column="id"/>
+        <result property="blackId" column="black_id"/>
+        <result property="reason" column="reason"/>
+        <result property="treatmentMethod" column="treatment_method"/>
+        <result property="learnStatus" column="learn_status"/>
+        <result property="testStatus" column="test_status"/>
+        <result property="practiceStatus" column="practice_status"/>
+        <result property="overStatus" column="over_status"/>
+        <result property="handleDay" column="handle_day"/>
+        <result property="creditScore" column="credit_score"/>
+        <result property="numberTopics" column="number_topics"/>
+        <result property="numberAccuracy" column="number_accuracy"/>
+        <result property="learnTime" column="learn_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="laboratoryName" column="laboratory_name"/>
+        <result property="laboratoryId" column="laboratory_id"/>
+        <result property="deductionVal" column="deduction_val"/>
+        <result property="dataType" column="data_type"/>
+        <result property="userId" column="user_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="warningStatus" column="warningStatus"/>
+        <result property="interviewStatus" column="interviewStatus"/>
+        <result property="violationType" column="violationType"/>
     </resultMap>
 
     <sql id="selectLabNegativelistHistoryVo">
@@ -101,77 +101,57 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabNegativelistHistory" parameterType="com.zd.laboratory.domain.LabNegativelistHistory" useGeneratedKeys="true" keyProperty="id">
         insert into lab_negativelist_history
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="blackId != null">black_id,</if>
-
-    <if test="reason != null">reason,</if>
-
-    <if test="treatmentMethod != null">treatment_method,</if>
-
-    <if test="learnStatus != null">learn_status,</if>
-
-    <if test="testStatus != null">test_status,</if>
-
-    <if test="practiceStatus != null">practice_status,</if>
-
-    <if test="overStatus != null">over_status,</if>
-
-    <if test="handleDay != null">handle_day,</if>
-
-    <if test="creditScore != null">credit_score,</if>
-
-    <if test="numberTopics != null">number_topics,</if>
-
-    <if test="numberAccuracy != null">number_accuracy,</if>
-
-    <if test="learnTime != null">learn_time,</if>
-
-    <if test="createBy != null">create_by,</if>
-
-    <if test="createTime != null">create_time,</if>
-
-    <if test="updateBy != null">update_by,</if>
-
-    <if test="updateTime != null">update_time,</if>
-
-    <if test="remark != null">remark,</if>
-
-    <if test="laboratoryName != null">laboratory_name,</if>
-
-    <if test="laboratoryId != null">laboratory_id,</if>
-
-    <if test="deductionVal != null">deduction_val,</if>
-    <if test="dataType != null "> data_type,</if>
-
-    <if test="userName != null "> user_name,</if>
-    <if test="warningStatus != -1 "> warningStatus,</if>
-    <if test="interviewStatus != -1 "> interviewStatus,</if>
+            <if test="blackId != null">black_id,</if>
+            <if test="reason != null">reason,</if>
+            <if test="treatmentMethod != null">treatment_method,</if>
+            <if test="learnStatus != null">learn_status,</if>
+            <if test="testStatus != null">test_status,</if>
+            <if test="practiceStatus != null">practice_status,</if>
+            <if test="overStatus != null">over_status,</if>
+            <if test="handleDay != null">handle_day,</if>
+            <if test="creditScore != null">credit_score,</if>
+            <if test="numberTopics != null">number_topics,</if>
+            <if test="numberAccuracy != null">number_accuracy,</if>
+            <if test="learnTime != null">learn_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+            <if test="laboratoryName != null">laboratory_name,</if>
+            <if test="laboratoryId != null">laboratory_id,</if>
+            <if test="deductionVal != null">deduction_val,</if>
+            <if test="dataType != null "> data_type,</if>
+            <if test="userName != null "> user_name,</if>
+            <if test="warningStatus != -1 "> warningStatus,</if>
+            <if test="interviewStatus != -1 "> interviewStatus,</if>
             <if test="userId != null "> user_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="blackId != null">#{blackId},</if>
-    <if test="reason != null">#{reason},</if>
-    <if test="treatmentMethod != null">#{treatmentMethod},</if>
-    <if test="learnStatus != null">#{learnStatus},</if>
-    <if test="testStatus != null">#{testStatus},</if>
-    <if test="practiceStatus != null">#{practiceStatus},</if>
-    <if test="overStatus != null">#{overStatus},</if>
-    <if test="handleDay != null">#{handleDay},</if>
-    <if test="creditScore != null">#{creditScore},</if>
-    <if test="numberTopics != null">#{numberTopics},</if>
-    <if test="numberAccuracy != null">#{numberAccuracy},</if>
-    <if test="learnTime != null">#{learnTime},</if>
-    <if test="createBy != null">#{createBy},</if>
-    <if test="createTime != null">#{createTime},</if>
-    <if test="updateBy != null">#{updateBy},</if>
-    <if test="updateTime != null">#{updateTime},</if>
-    <if test="remark != null">#{remark},</if>
-    <if test="laboratoryName != null">#{laboratoryName},</if>
-    <if test="laboratoryId != null">#{laboratoryId},</if>
-    <if test="deductionVal != null">#{deductionVal},</if>
-    <if test="dataType != null "> #{dataType},</if>
-    <if test="userName != null "> #{userName},</if>
-    <if test="warningStatus != -1 "> #{warningStatus},</if>
-    <if test="interviewStatus != -1 "> #{interviewStatus},</if>
+            <if test="blackId != null">#{blackId},</if>
+            <if test="reason != null">#{reason},</if>
+            <if test="treatmentMethod != null">#{treatmentMethod},</if>
+            <if test="learnStatus != null">#{learnStatus},</if>
+            <if test="testStatus != null">#{testStatus},</if>
+            <if test="practiceStatus != null">#{practiceStatus},</if>
+            <if test="overStatus != null">#{overStatus},</if>
+            <if test="handleDay != null">#{handleDay},</if>
+            <if test="creditScore != null">#{creditScore},</if>
+            <if test="numberTopics != null">#{numberTopics},</if>
+            <if test="numberAccuracy != null">#{numberAccuracy},</if>
+            <if test="learnTime != null">#{learnTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="laboratoryName != null">#{laboratoryName},</if>
+            <if test="laboratoryId != null">#{laboratoryId},</if>
+            <if test="deductionVal != null">#{deductionVal},</if>
+            <if test="dataType != null "> #{dataType},</if>
+            <if test="userName != null "> #{userName},</if>
+            <if test="warningStatus != -1 "> #{warningStatus},</if>
+            <if test="interviewStatus != -1 "> #{interviewStatus},</if>
             <if test="userId != null "> #{userId},</if>
          </trim>
     </insert>
@@ -208,8 +188,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-
-
     <delete id="deleteLabNegativelistHistoryById" parameterType="Long">
         delete from lab_negativelist_history where id = #{id}
     </delete>
@@ -222,8 +200,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="getExpireTimeData" resultType="com.zd.laboratory.domain.LabNegativelistHistory">
-        <!--SELECT * FROM lab_negativelist_history WHERE DATE_SUB(CURDATE(), INTERVAL 7 DAY) >= DATE(handle_day)-->
-
         SELECT his.id,his.`black_id`,his.`reason`,his.`treatment_method`,his.`warningStatus`,his.`interviewStatus`,his.`learn_status`,his.`test_status`,his.`practice_status`,his.`over_status`,
         his.`handle_day`,re.`credit_score`,his.`number_topics`,his.`number_accuracy`,his.`learn_time`,his.`create_by`,his.`create_time`,his.`update_by`,his.`update_time`,his.`remark`,
         his.`laboratory_name`,his.`laboratory_id`,his.`deduction_val`,his.`data_type`,his.`user_id`,his.`user_name`
@@ -234,10 +210,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
 
-
     <select id="historypageList" resultType="com.zd.laboratory.domain.LabNegativelistHistory">
         select xx.* from(select a.* from (
-
         SELECT h.*,1 violationType FROM lab_negativelist_history h
         WHERE h.`user_id`=#{userId}
         <if test="overStatus!='-1'">
@@ -256,7 +230,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (SELECT u.nick_name FROM sys_user u WHERE u.user_id = b.`join_user_id`) user_name,2 violationType
         FROM
         lab_blackdetail d INNER JOIN lab_blacklist b ON d.`black_id` = b.`id`
-
         WHERE b.`join_user_id`=#{userId}
         <if test="overStatus!='-1'">
             and d.over_status=#{overStatus}
@@ -266,17 +239,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         ) a ORDER BY a.`create_time` DESC,a.violationType desc LIMIT 1
         )xx
-
-
-        <!--select * from (SELECT * FROM lab_negativelist_history h-->
-        <!--WHERE h.`user_id`=#{userId}-->
-        <!--<if test="overStatus!='-1'">-->
-          <!--and h.over_status=#{overStatus}-->
-        <!--</if>-->
-        <!--<if test="statTime!='' ">-->
-            <!--and h.`create_time` BETWEEN #{statTime} AND #{endTime}-->
-        <!--</if>-->
-        <!--order by  h.`create_time` desc limit 1) a-->
     </select>
 
     <update id="updateLabHistory" >
@@ -290,5 +252,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id=#{violationId}
     </update>
 
-
 </mapper>

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

@@ -5,18 +5,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabNewnoticeContentMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabNewnoticeContent" id="LabNewnoticeContentResult">
-        <result property="id"    column="id"    />
-        <result property="noticeModeId"    column="notice_mode_id"    />
-        <result property="noticeType"    column="notice_type"    />
-        <result property="variableLevel"    column="variable_level"    />
-        <result property="noticeContent"    column="notice_content"    />
-        <result property="sortNum"    column="sort_num"    />
-        <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="noticeModeId" column="notice_mode_id"/>
+        <result property="noticeType" column="notice_type"/>
+        <result property="variableLevel" column="variable_level"/>
+        <result property="noticeContent" column="notice_content"/>
+        <result property="sortNum" column="sort_num"/>
+        <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="selectLabNewnoticeContentVo">
@@ -50,29 +50,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabNewnoticeContent"  parameterType="com.zd.laboratory.domain.LabNewnoticeContent" useGeneratedKeys="true" keyProperty="id">
         insert into lab_newnotice_content
         <trim prefix="(" suffix=")" suffixOverrides=",">
-
             <if test="noticeModeId != null">notice_mode_id,</if>
-
             <if test="noticeType != null">notice_type,</if>
-
             <if test="variableLevel != null">variable_level,</if>
-
             <if test="noticeContent != null">notice_content,</if>
-
             <if test="sortNum != null">sort_num,</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="noticeModeId != null">#{noticeModeId},</if>

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

@@ -5,16 +5,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabNewnoticeGroupMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabNewnoticeGroup" id="LabNewnoticeGroupResult">
-        <result property="id"    column="id"    />
-        <result property="groupName"    column="group_name"    />
-        <result property="groupValue"    column="group_value"    />
-        <result property="sendMode"    column="send_mode"    />
-        <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="groupName" column="group_name"/>
+        <result property="groupValue" column="group_value"/>
+        <result property="sendMode" column="send_mode"/>
+        <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="selectLabNewnoticeGroupVo">

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

@@ -5,15 +5,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabNewnoticeModeMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabNewnoticeMode" id="LabNewnoticeModeResult">
-        <result property="id"    column="id"    />
-        <result property="noticeModeName"    column="notice_mode_name"    />
-        <result property="noticeModeValue"    column="notice_mode_value"    />
-        <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="noticeModeName" column="notice_mode_name"/>
+        <result property="noticeModeValue" column="notice_mode_value"/>
+        <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="selectLabNewnoticeModeVo">
@@ -34,5 +34,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by t.create_time asc
     </select>
 
-
 </mapper>

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

@@ -5,15 +5,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabNewnoticeSendmodeMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabNewnoticeSendmode" id="LabNewnoticeSendmodeResult">
-        <result property="id"    column="id"    />
-        <result property="groupId"    column="group_id"    />
-        <result property="sendMode"    column="send_mode"    />
-        <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="groupId" column="group_id"/>
+        <result property="sendMode" column="send_mode"/>
+        <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="selectLabNewnoticeSendModeVo">
@@ -37,23 +37,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabNewnoticeSendmode" parameterType="com.zd.laboratory.domain.LabNewnoticeSendmode" useGeneratedKeys="true" keyProperty="id">
         insert into lab_newnotice_sendmode
         <trim prefix="(" suffix=")" suffixOverrides=",">
-
             <if test="groupId != null">group_id,</if>
-
             <if test="sendMode != null">send_mode,</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="groupId != null">#{groupId},</if>

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

@@ -66,34 +66,20 @@
         insert into lab_noticeconfig
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="riskVoice != null">risk_voice,</if>
-
             <if test="riskPhone != null">risk_phone,</if>
-
             <if test="riskMessage != null">risk_message,</if>
-
             <if test="riskRadio != null">risk_radio,</if>
-
             <if test="exitRadio != null">exit_radio,</if>
-
             <if test="exitVoice != null">exit_voice,</if>
-
             <if test="exitPhone != null">exit_phone,</if>
-
             <if test="exitMessage != null">exit_message,</if>
             <if test="userId != null">user_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="remark != null">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">

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

@@ -5,46 +5,46 @@
 <mapper namespace="com.zd.laboratory.mapper.LabNotifyplanMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabNotifyplan" id="LabNotifyplanResult">
-        <result property="id"    column="id"    />
-        <result property="title"    column="title"    />
-        <result property="notifyType"    column="notify_type"    />
-        <result property="type"    column="type"    />
-        <result property="contentName"    column="content_name"    />
-        <result property="contentUrl"    column="content_url"    />
-        <result property="content"    column="content"    />
-        <result property="company"    column="company"    />
-        <result property="conAbstract"    column="con_abstract"    />
-        <result property="status"    column="status"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateUserid"    column="update_userid"    />
-        <result property="updateUsername"    column="update_username"    />
-        <result property="updateTime"    column="update_time"    />
+        <result property="id" column="id"/>
+        <result property="title" column="title"/>
+        <result property="notifyType" column="notify_type"/>
+        <result property="type" column="type"/>
+        <result property="contentName" column="content_name"/>
+        <result property="contentUrl" column="content_url"/>
+        <result property="content" column="content"/>
+        <result property="company" column="company"/>
+        <result property="conAbstract" column="con_abstract"/>
+        <result property="status" column="status"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateUserid" column="update_userid"/>
+        <result property="updateUsername" column="update_username"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabNotifyplanVO" id="LabNotifyplanResultVO">
-        <result property="id"    column="id"    />
-        <result property="title"    column="title"    />
-        <result property="notifyType"    column="notify_type"    />
-        <result property="type"    column="type"    />
-        <result property="contentName"    column="content_name"    />
-        <result property="contentUrl"    column="content_url"    />
-        <result property="content"    column="content"    />
-        <result property="company"    column="company"    />
-        <result property="conAbstract"    column="con_abstract"    />
-        <result property="status"    column="status"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateUserid"    column="update_userid"    />
-        <result property="updateUsername"    column="update_username"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="executionTime"    column="execution_time"    />
+        <result property="id" column="id"/>
+        <result property="title" column="title"/>
+        <result property="notifyType" column="notify_type"/>
+        <result property="type" column="type"/>
+        <result property="contentName" column="content_name"/>
+        <result property="contentUrl" column="content_url"/>
+        <result property="content" column="content"/>
+        <result property="company" column="company"/>
+        <result property="conAbstract" column="con_abstract"/>
+        <result property="status" column="status"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateUserid" column="update_userid"/>
+        <result property="updateUsername" column="update_username"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="executionTime" column="execution_time"/>
     </resultMap>
 
     <sql id="selectLabNotifyplanVo">
@@ -62,24 +62,25 @@
         left join   sys_dept d on   t.dept_id=d.dept_id
         left join   sys_user u on  t.user_id=u.user_id
     </sql>
+
     <select id="selectLabNotifyplanList" parameterType="com.zd.laboratory.domain.LabNotifyplan" resultMap="LabNotifyplanResult">
         <include refid="selectLabNotifyplanVo"/>
         <where>
-            <if test="title != null  and title != ''"> and t.title  like concat('%', #{title}, '%')</if>
-            <if test="notifyType != null "> and t.notify_type = #{notifyType}</if>
-            <if test="type != null "> and t.type = #{type}</if>
-            <if test="contentName != null  and contentName != ''"> and t.content_name like concat('%', #{contentName}, '%')</if>
-            <if test="contentUrl != null  and contentUrl != ''"> and t.content_url = #{contentUrl}</if>
-            <if test="content != null  and content != ''"> and t.content = #{content}</if>
-            <if test="company != null  and company != ''"> and t.company = #{company}</if>
-            <if test="conAbstract != null  and conAbstract != ''"> and t.con_abstract = #{conAbstract}</if>
-            <if test="status != null "> and t.status = #{status}</if>
-            <if test="deptId != null "> and t.dept_id = #{deptId}</if>
-            <if test="deptName != null "> and t.dept_name = #{deptName}</if>
-            <if test="userId != null "> and t.user_id = #{userId}</if>
-            <if test="createBy != null  and createBy != ''"> and t.create_by like concat('%', #{createBy}, '%')</if>
-            <if test="updateUserid != null "> and t.update_userid = #{updateUserid}</if>
-            <if test="updateUsername != null  and updateUsername != ''"> and t.update_username like concat('%', #{updateUsername}, '%')</if>
+            <if test="title != null  and title != ''">and t.title like concat('%', #{title}, '%')</if>
+            <if test="notifyType != null ">and t.notify_type = #{notifyType}</if>
+            <if test="type != null ">and t.type = #{type}</if>
+            <if test="contentName != null  and contentName != ''">and t.content_name like concat('%', #{contentName}, '%')</if>
+            <if test="contentUrl != null  and contentUrl != ''">and t.content_url = #{contentUrl}</if>
+            <if test="content != null  and content != ''">and t.content = #{content}</if>
+            <if test="company != null  and company != ''">and t.company = #{company}</if>
+            <if test="conAbstract != null  and conAbstract != ''">and t.con_abstract = #{conAbstract}</if>
+            <if test="status != null ">and t.status = #{status}</if>
+            <if test="deptId != null ">and t.dept_id = #{deptId}</if>
+            <if test="deptName != null ">and t.dept_name = #{deptName}</if>
+            <if test="userId != null ">and t.user_id = #{userId}</if>
+            <if test="createBy != null  and createBy != ''">and t.create_by like concat('%', #{createBy}, '%')</if>
+            <if test="updateUserid != null ">and t.update_userid = #{updateUserid}</if>
+            <if test="updateUsername != null  and updateUsername != ''">and t.update_username like concat('%', #{updateUsername}, '%')</if>
         </where>
         order by t.create_time desc
     </select>
@@ -87,21 +88,21 @@
     <select id="selectLabNotifyplanListVO" parameterType="com.zd.laboratory.domain.vo.LabNotifyplanVO" resultMap="LabNotifyplanResultVO">
         <include refid="selectLabNotifyplanListVo"/>
         <where>
-            <if test="title != null  and title != ''"> and t.title  like concat('%', #{title}, '%')</if>
-            <if test="notifyType != null "> and t.notify_type = #{notifyType}</if>
-            <if test="type != null "> and t.type = #{type}</if>
-            <if test="contentName != null  and contentName != ''"> and t.content_name like concat('%', #{contentName}, '%')</if>
-            <if test="contentUrl != null  and contentUrl != ''"> and t.content_url = #{contentUrl}</if>
-            <if test="content != null  and content != ''"> and t.content = #{content}</if>
-            <if test="company != null  and company != ''"> and t.company  like concat('%', #{company}, '%')</if>
-            <if test="conAbstract != null  and conAbstract != ''"> and t.con_abstract  like concat('%', #{conAbstract}, '%')</if>
-            <if test="status != null "> and t.status = #{status}</if>
-            <if test="deptId != null "> and t.dept_id = #{deptId}</if>
-            <if test="deptName != null "> and t.dept_name = #{deptName}</if>
-            <if test="userId != null "> and t.user_id = #{userId}</if>
-            <if test="createBy != null  and createBy != ''"> and t.create_by like concat('%', #{createBy}, '%')</if>
-            <if test="updateUserid != null "> and t.update_userid = #{updateUserid}</if>
-            <if test="updateUsername != null  and updateUsername != ''"> and t.update_username like concat('%', #{updateUsername}, '%')</if>
+            <if test="title != null  and title != ''">and t.title  like concat('%', #{title}, '%')</if>
+            <if test="notifyType != null ">and t.notify_type = #{notifyType}</if>
+            <if test="type != null ">and t.type = #{type}</if>
+            <if test="contentName != null  and contentName != ''">and t.content_name like concat('%', #{contentName}, '%')</if>
+            <if test="contentUrl != null  and contentUrl != ''">and t.content_url = #{contentUrl}</if>
+            <if test="content != null  and content != ''">and t.content = #{content}</if>
+            <if test="company != null  and company != ''">and t.company  like concat('%', #{company}, '%')</if>
+            <if test="conAbstract != null  and conAbstract != ''">and t.con_abstract  like concat('%', #{conAbstract}, '%')</if>
+            <if test="status != null ">and t.status = #{status}</if>
+            <if test="deptId != null ">and t.dept_id = #{deptId}</if>
+            <if test="deptName != null ">and t.dept_name = #{deptName}</if>
+            <if test="userId != null ">and t.user_id = #{userId}</if>
+            <if test="createBy != null  and createBy != ''">and t.create_by like concat('%', #{createBy}, '%')</if>
+            <if test="updateUserid != null ">and t.update_userid = #{updateUserid}</if>
+            <if test="updateUsername != null  and updateUsername != ''">and t.update_username like concat('%', #{updateUsername}, '%')</if>
             <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
                 and str_to_date(t.date_format(create_time,'%Y-%m-%d'),'%Y-%m-%d') &gt;= str_to_date(#{beginTime},'%Y-%m-%d')
             </if>
@@ -130,39 +131,22 @@
         insert into lab_notifyplan
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="title != null">title,</if>
-
             <if test="notifyType != null">notify_type,</if>
-
             <if test="type != null">type,</if>
-
             <if test="contentName != null">content_name,</if>
-
             <if test="contentUrl != null">content_url,</if>
-
             <if test="content != null">content,</if>
-
             <if test="company != null">company,</if>
-
             <if test="conAbstract != null">con_abstract,</if>
-
             <if test="status != null">status,</if>
-
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="updateUserid != null">update_userid,</if>
-
             <if test="updateUsername != null">update_username,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="executionTime != null">execution_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">

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

@@ -5,18 +5,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabOnepcMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabOnepc" id="LabOnepcResult">
-        <result property="id"    column="id"    />
-        <result property="accessId"    column="access_id"    />
-        <result property="oneTitle"    column="one_title"    />
-        <result property="oneConfirm"    column="one_confirm"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="accessId" column="access_id"/>
+        <result property="oneTitle" column="one_title"/>
+        <result property="oneConfirm" column="one_confirm"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectLabOnepcVo">

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

@@ -5,22 +5,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabPhotoInspectionMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabPhotoInspection" id="LabPhotoInspectionResult">
-        <result property="id"    column="id"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectLabPhotoInspectionVo">
         select id, access_id, annex_title, annex_url, dept_id, dept_name, user_id, create_by,
                create_time, update_by, update_time, remark,
                garbage_url,dangerous_url,source_risk_url,sub_url
-
         from lab_photo_inspection pi
     </sql>
 

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

@@ -5,25 +5,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabPhotoNoteMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabPhotoNote" id="LabPhotoNoteResult">
-        <result property="id"    column="id"    />
-        <result property="imgUrl"    column="img_url"    />
-        <result property="handleUser"    column="handle_user"    />
-        <result property="handleTime"    column="handle_time"    />
-        <result property="handleStatus"    column="handle_status"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="userId"    column="user_id"    />
-        <result property="remark"    column="remark"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="subjectId"    column="subject_id"    />
-        <result property="describe"    column="describe"    />
+        <result property="id" column="id"/>
+        <result property="imgUrl" column="img_url"/>
+        <result property="handleUser" column="handle_user"/>
+        <result property="handleTime" column="handle_time"/>
+        <result property="handleStatus" column="handle_status"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="userId" column="user_id"/>
+        <result property="remark" column="remark"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="describe" column="describe"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabPhotoNoteVO" id="LabPhotoNoteResultVO">
-        <result property="photoCount"    column="photo_count"    />
+        <result property="photoCount" column="photo_count"/>
     </resultMap>
 
     <sql id="selectLabPhotoNoteVo">
@@ -102,54 +102,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabPhotoNote" parameterType="com.zd.laboratory.domain.LabPhotoNote" useGeneratedKeys="true" keyProperty="id">
         insert into lab_photo_note
         <trim prefix="(" suffix=")" suffixOverrides=",">
-
-    <if test="imgUrl != null">img_url,</if>
-
-    <if test="handleUser != null">handle_user,</if>
-
-    <if test="handleTime != null">handle_time,</if>
-
-    <if test="handleStatus != null">handle_status,</if>
-
-    <if test="deptId != null">dept_id,</if>
-
-    <if test="deptName != null">dept_name,</if>
-
-    <if test="userId != null">user_id,</if>
-
-    <if test="remark != null">remark,</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="subjectId != null">subject_id,</if>
-
-    <if test="describe != null">`describe`,</if>
-
-    <if test="handleUsers != null">`handle_users`,</if>
-
+            <if test="imgUrl != null">img_url,</if>
+            <if test="handleUser != null">handle_user,</if>
+            <if test="handleTime != null">handle_time,</if>
+            <if test="handleStatus != null">handle_status,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="deptName != null">dept_name,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="remark != null">remark,</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="subjectId != null">subject_id,</if>
+            <if test="describe != null">`describe`,</if>
+            <if test="handleUsers != null">`handle_users`,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="imgUrl != null">#{imgUrl},</if>
-    <if test="handleUser != null">#{handleUser},</if>
-    <if test="handleTime != null">#{handleTime},</if>
-    <if test="handleStatus != null">#{handleStatus},</if>
-    <if test="deptId != null">#{deptId},</if>
-    <if test="deptName != null">#{deptName},</if>
-    <if test="userId != null">#{userId},</if>
-    <if test="remark != null">#{remark},</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="subjectId != null">#{subjectId},</if>
-    <if test="describe != null and describe != ''">#{describe},</if>
-    <if test="handleUsers != null and handleUsers != ''">#{handleUsers},</if>
+            <if test="imgUrl != null">#{imgUrl},</if>
+            <if test="handleUser != null">#{handleUser},</if>
+            <if test="handleTime != null">#{handleTime},</if>
+            <if test="handleStatus != null">#{handleStatus},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="deptName != null">#{deptName},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="remark != null">#{remark},</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="subjectId != null">#{subjectId},</if>
+            <if test="describe != null and describe != ''">#{describe},</if>
+            <if test="handleUsers != null and handleUsers != ''">#{handleUsers},</if>
          </trim>
     </insert>
 
@@ -199,40 +183,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectDangers" resultType="java.util.Map">
-
         select d.date, IFNULL(c.count,0) as count
         from
         (SELECT @s :=@s + 1 as 'index', DATE(DATE_SUB(CURRENT_DATE, INTERVAL @s DAY)) AS date FROM mysql.help_topic,(SELECT @s := -1) temp WHERE @s &lt; 6 ORDER BY date) d
-
         left join
         (select date_format(create_time,'%Y-%m-%d') as date, count(1) as count
         from lab_photo_note pn
-
         WHERE create_time >= DATE_SUB(NOW(),INTERVAL 7 DAY)
         <if test="deptId != null and deptId != ''">
             and dept_id = #{deptId}
         </if>
         group by date
         order by date) c on d.date = c.date
-
         order by d.date
-
-        <!--select date_format(create_time,'%Y%m%d') as date, count(1) as count
-        from lab_photo_note pn,
-        (SELECT @s :=@s + 1 as 'index', DATE(DATE_SUB(CURRENT_DATE, INTERVAL @s DAY)) AS date FROM mysql.help_topic,(SELECT @s := -1) temp WHERE @s &lt; 6 ORDER BY date) d
-        where date_format(pn.create_time, '%Y-%m-%d') = d.date
-        <where>
-            <if test="type == 1">
-                and create_time >= DATE_SUB(NOW(),INTERVAL 7 DAY)
-            </if>
-            <if test="type == 2">
-                and create_time >= DATE_SUB(NOW(),INTERVAL 30 DAY)
-            </if>
-            <if test="subjectId != null and subjectId != ''">
-                and subject_id = #{subjectId}
-            </if>
-        </where>
-        group by date
-        order by date-->
     </select>
 </mapper>

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

@@ -3,11 +3,11 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zd.laboratory.mapper.LabPintsScoreSiteMapper">
-    
+
     <resultMap type="com.zd.laboratory.domain.LabPintsScoreSite" id="LabPintsScoreSiteResult">
-        <result property="id"    column="id"    />
-        <result property="negativeListScore"    column="negative_list_score"    />
-        <result property="blackListScore"    column="black_list_score"    />
+        <result property="id" column="id"/>
+        <result property="negativeListScore" column="negative_list_score"/>
+        <result property="blackListScore" column="black_list_score"/>
     </resultMap>
 
     <sql id="selectLabPintsScoreSiteVo">

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

@@ -3,11 +3,11 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zd.laboratory.mapper.LabProcessSiteMapper">
-    
+
     <resultMap type="com.zd.laboratory.domain.LabProcessSite" id="LabProcessSiteResult">
-        <result property="id"    column="id"    />
-        <result property="processType"    column="process_type"    />
-        <result property="remake"    column="remake"    />
+        <result property="id" column="id"/>
+        <result property="processType" column="process_type"/>
+        <result property="remake" column="remake"/>
     </resultMap>
 
     <sql id="selectLabProcessSiteVo">
@@ -32,15 +32,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabProcessSite" parameterType="com.zd.laboratory.domain.LabProcessSite">
         insert into lab_process_site
         <trim prefix="(" suffix=")" suffixOverrides=",">
-
-    <if test="processType != null">process_type,</if>
-
-    <if test="remake != null">remake,</if>
-
+            <if test="processType != null">process_type,</if>
+            <if test="remake != null">remake,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="processType != null">#{processType},</if>
-    <if test="remake != null">#{remake},</if>
+            <if test="processType != null">#{processType},</if>
+            <if test="remake != null">#{remake},</if>
          </trim>
     </insert>
 

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabQpSubjectRelationMapper.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.laboratory.mapper.LabQpSubjectRelationMapper">
-    
+
     <resultMap type="com.zd.laboratory.domain.LabQpSubjectRelation" id="LabQpSubjectRelationResult">
-        <result property="id"    column="id"    />
-        <result property="subjectId"    column="subject_id"    />
-        <result property="bottleTotal"    column="bottle_total"    />
-        <result property="bottleUserTotal"    column="bottle_user_total"    />
-        <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="subjectId" column="subject_id"/>
+        <result property="bottleTotal" column="bottle_total"/>
+        <result property="bottleUserTotal" column="bottle_user_total"/>
+        <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="selectLabQpSubjectRelationVo">
@@ -38,29 +38,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabQpSubjectRelation" parameterType="com.zd.laboratory.domain.LabQpSubjectRelation" useGeneratedKeys="true" keyProperty="id">
         insert into lab_qp_subject_relation
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="subjectId != null">subject_id,</if>
-
-    <if test="bottleTotal != null">bottle_total,</if>
-
-    <if test="bottleUserTotal != null">bottle_user_total,</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="subjectId != null">subject_id,</if>
+            <if test="bottleTotal != null">bottle_total,</if>
+            <if test="bottleUserTotal != null">bottle_user_total,</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="subjectId != null">#{subjectId},</if>
-    <if test="bottleTotal != null">#{bottleTotal},</if>
-    <if test="bottleUserTotal != null">#{bottleUserTotal},</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="subjectId != null">#{subjectId},</if>
+            <if test="bottleTotal != null">#{bottleTotal},</if>
+            <if test="bottleUserTotal != null">#{bottleUserTotal},</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-modules-laboratory/src/main/resources/mapper/laboratory/LabRelayMapper.xml

@@ -5,13 +5,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabRelayMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabRelay" id="LabRelayResult">
-        <result property="id"    column="id"    />
-        <result property="code"    column="code"    />
-        <result property="type"    column="type"    />
-        <result property="routeNum"    column="route_num"    />
-        <result property="reverseBit"    column="reverse_bit"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="configId"    column="config_id"    />
+        <result property="id" column="id"/>
+        <result property="code" column="code"/>
+        <result property="type" column="type"/>
+        <result property="routeNum" column="route_num"/>
+        <result property="reverseBit" column="reverse_bit"/>
+        <result property="createTime" column="create_time"/>
+        <result property="configId" column="config_id"/>
     </resultMap>
 
     <sql id="selectLabRelayVo">
@@ -38,23 +38,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabRelay" parameterType="com.zd.laboratory.domain.LabRelay" useGeneratedKeys="true" keyProperty="id">
         insert into lab_relay
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="code != null and code != ''">code,</if>
-
-    <if test="type != null">type,</if>
-
-    <if test="routeNum != null">route_num,</if>
-
-    <if test="reverseBit != null">reverse_bit,</if>
-
-    <if test="createTime != null">create_time,</if>
-
+            <if test="code != null and code != ''">code,</if>
+            <if test="type != null">type,</if>
+            <if test="routeNum != null">route_num,</if>
+            <if test="reverseBit != null">reverse_bit,</if>
+            <if test="createTime != null">create_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="code != null and code != ''">#{code},</if>
-    <if test="type != null">#{type},</if>
-    <if test="routeNum != null">#{routeNum},</if>
-    <if test="reverseBit != null">#{reverseBit},</if>
-    <if test="createTime != null">#{createTime},</if>
+            <if test="code != null and code != ''">#{code},</if>
+            <if test="type != null">#{type},</if>
+            <if test="routeNum != null">#{routeNum},</if>
+            <if test="reverseBit != null">#{reverseBit},</if>
+            <if test="createTime != null">#{createTime},</if>
          </trim>
     </insert>
 

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

@@ -179,30 +179,9 @@
         </if>
         group by date
         order by date) c on d.date = c.date
-
         order by d.date
-
-        <!--select date_format(create_time,'%Y%m%d') as date, count(1) as count
-        from lab_risk_plan_abnormal_log pl,
-          (SELECT @s :=@s + 1 as 'index', DATE(DATE_SUB(CURRENT_DATE, INTERVAL @s DAY)) AS date FROM mysql.help_topic,(SELECT @s := -1) temp WHERE @s &lt; 6 ORDER BY date) d
-        where
-          date_format(pl.create_time, '%Y-%m-%d') = d.date
-        <where>
-            <if test="type == 1">
-                and create_time >= DATE_SUB(NOW(),INTERVAL 7 DAY)
-            </if>
-            <if test="type == 2">
-                and create_time >= DATE_SUB(NOW(),INTERVAL 30 DAY)
-            </if>
-            <if test="subjectId != null and subjectId != ''">
-                and subject_id = #{subjectId}
-            </if>
-        </where>
-        group by date
-        order by date-->
     </select>
 
-
     <select id="selectLabRiskPlanAbnormalLogOrderByList" parameterType="com.zd.laboratory.domain.LabRiskPlanAbnormalLog"
             resultMap="LabRiskPlanAbnormalLogResult">
         select

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

@@ -5,15 +5,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabRiskPlanDistributionMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabRiskPlanDistribution" id="LabRiskPlanDistributionResult">
-        <result property="id"    column="id"    />
-        <result property="riskPlanId"    column="risk_plan_id"    />
-        <result property="subId"    column="sub_id"    />
-        <result property="groupDeptId"    column="group_dept_id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="distrStatus"    column="distr_status"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="riskPlanId" column="risk_plan_id"/>
+        <result property="subId" column="sub_id"/>
+        <result property="groupDeptId" column="group_dept_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="distrStatus" column="distr_status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectLabRiskPlanDistributionVo">
@@ -46,32 +46,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabRiskPlanDistribution" parameterType="com.zd.laboratory.domain.LabRiskPlanDistribution" useGeneratedKeys="true" keyProperty="id">
         insert into lab_risk_plan_distribution
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="riskPlanId != null">risk_plan_id,</if>
-
-    <if test="subId != null">sub_id,</if>
-
-    <if test="groupDeptId != null">group_dept_id,</if>
-
-    <if test="userId != null">user_id,</if>
-
-    <if test="distrStatus != null">distr_status,</if>
-
-    <if test="createTime != null">create_time,</if>
-
-    <if test="createBy != null">create_by,</if>
-
-    <if test="remark != null">remark,</if>
-
+            <if test="riskPlanId != null">risk_plan_id,</if>
+            <if test="subId != null">sub_id,</if>
+            <if test="groupDeptId != null">group_dept_id,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="distrStatus != null">distr_status,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="riskPlanId != null">#{riskPlanId},</if>
-    <if test="subId != null">#{subId},</if>
-    <if test="groupDeptId != null">#{groupDeptId},</if>
-    <if test="userId != null">#{userId},</if>
-    <if test="distrStatus != null">#{distrStatus},</if>
-    <if test="createTime != null">#{createTime},</if>
-    <if test="createBy != null">#{createBy},</if>
-    <if test="remark != null">#{remark},</if>
+            <if test="riskPlanId != null">#{riskPlanId},</if>
+            <if test="subId != null">#{subId},</if>
+            <if test="groupDeptId != null">#{groupDeptId},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="distrStatus != null">#{distrStatus},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
 

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

@@ -5,14 +5,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabRiskPlanHardwareRelationMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabRiskPlanHardwareRelation" id="LabRiskPlanHardwareRelationResult">
-        <result property="id"    column="id"    />
-        <result property="riskPlanId"    column="risk_plan_id"    />
-        <result property="riskPlanLevelId"    column="risk_plan_level_id"    />
-        <result property="hardwareId"    column="hardware_id"    />
-        <result property="operate"    column="operate"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="hardwareType"    column="hardware_type"    />
-        <result property="overAct"    column="over_act"    />
+        <result property="id" column="id"/>
+        <result property="riskPlanId" column="risk_plan_id"/>
+        <result property="riskPlanLevelId" column="risk_plan_level_id"/>
+        <result property="hardwareId" column="hardware_id"/>
+        <result property="operate" column="operate"/>
+        <result property="createTime" column="create_time"/>
+        <result property="hardwareType" column="hardware_type"/>
+        <result property="overAct" column="over_act"/>
     </resultMap>
 
     <sql id="selectLabRiskPlanHardwareRelationVo">

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

@@ -4,18 +4,18 @@
   <resultMap id="BaseResultMap" type="com.zd.laboratory.domain.LabRiskPlanLevel">
     <!--@mbg.generated-->
     <!--@Table lab_risk_plan_level-->
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="risk_plan_id" jdbcType="BIGINT" property="riskPlanId" />
-    <result column="risk_plan_level" jdbcType="TINYINT" property="riskPlanLevel" />
-    <result column="if_exit" jdbcType="TINYINT" property="ifExit" />
-    <result column="dept_id" jdbcType="BIGINT" property="deptId" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="dept_name" jdbcType="VARCHAR" property="deptName" />
-    <result column="user_id" jdbcType="BIGINT" property="userId" />
-    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <id column="id" jdbcType="BIGINT" property="id"/>
+    <result column="risk_plan_id" jdbcType="BIGINT" property="riskPlanId"/>
+    <result column="risk_plan_level" jdbcType="TINYINT" property="riskPlanLevel"/>
+    <result column="if_exit" jdbcType="TINYINT" property="ifExit"/>
+    <result column="dept_id" jdbcType="BIGINT" property="deptId"/>
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+    <result column="dept_name" jdbcType="VARCHAR" property="deptName"/>
+    <result column="user_id" jdbcType="BIGINT" property="userId"/>
+    <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+    <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
+    <result column="remark" jdbcType="VARCHAR" property="remark"/>
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->

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

@@ -5,18 +5,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabRotationChartMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabRotationChart" id="LabRotationChartResult">
-        <result property="id"    column="id"    />
-        <result property="imgName"    column="img_name"    />
-        <result property="imgUrl"    column="img_url"    />
-        <result property="imgType"    column="img_type"    />
-        <result property="imgRange"    column="img_range"    />
-        <result property="imgOrder"    column="img_order"    />
-        <result property="imgCategory"    column="img_category"    />
-        <result property="validBeginTime"    column="valid_begin_time"    />
-        <result property="validEndTime"    column="valid_end_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createTime"    column="create_time"    />
+        <result property="id" column="id"/>
+        <result property="imgName" column="img_name"/>
+        <result property="imgUrl" column="img_url"/>
+        <result property="imgType" column="img_type"/>
+        <result property="imgRange" column="img_range"/>
+        <result property="imgOrder" column="img_order"/>
+        <result property="imgCategory" column="img_category"/>
+        <result property="validBeginTime" column="valid_begin_time"/>
+        <result property="validEndTime" column="valid_end_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="userId" column="user_id"/>
+        <result property="createTime" column="create_time"/>
     </resultMap>
 
     <sql id="selectLabRotationChartVo">
@@ -121,42 +121,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabRotationChart" parameterType="com.zd.laboratory.domain.LabRotationChart" useGeneratedKeys="true" keyProperty="id">
         insert into lab_rotation_chart
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="imgName != null">img_name,</if>
-
-    <if test="imgUrl != null">img_url,</if>
-
-    <if test="imgType != null">img_type,</if>
-
-    <if test="imgRange != null">img_range,</if>
-
-    <if test="imgOrder != null">img_order,</if>
-
-    <if test="imgCategory != null">img_category,</if>
-
-    <if test="validBeginTime != null">valid_begin_time,</if>
-
-    <if test="validEndTime != null">valid_end_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="imgName != null">img_name,</if>
+            <if test="imgUrl != null">img_url,</if>
+            <if test="imgType != null">img_type,</if>
+            <if test="imgRange != null">img_range,</if>
+            <if test="imgOrder != null">img_order,</if>
+            <if test="imgCategory != null">img_category,</if>
+            <if test="validBeginTime != null">valid_begin_time,</if>
+            <if test="validEndTime != null">valid_end_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="deptId != null">dept_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="imgName != null">#{imgName},</if>
-    <if test="imgUrl != null">#{imgUrl},</if>
-    <if test="imgType != null">#{imgType},</if>
-    <if test="imgRange != null">#{imgRange},</if>
-    <if test="imgOrder != null">#{imgOrder},</if>
-    <if test="imgCategory != null">#{imgCategory},</if>
-    <if test="validBeginTime != null">#{validBeginTime},</if>
-    <if test="validEndTime != null">#{validEndTime},</if>
-    <if test="userId != null">#{userId},</if>
-    <if test="createBy != null">#{createBy},</if>
-    <if test="createTime != null">#{createTime},</if>
+            <if test="imgName != null">#{imgName},</if>
+            <if test="imgUrl != null">#{imgUrl},</if>
+            <if test="imgType != null">#{imgType},</if>
+            <if test="imgRange != null">#{imgRange},</if>
+            <if test="imgOrder != null">#{imgOrder},</if>
+            <if test="imgCategory != null">#{imgCategory},</if>
+            <if test="validBeginTime != null">#{validBeginTime},</if>
+            <if test="validEndTime != null">#{validEndTime},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
             <if test="deptId != null">#{deptId},</if>
          </trim>
     </insert>

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

@@ -5,21 +5,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabSafeBookMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabSafeBook" id="LabSafeBookResult">
-        <result property="id"    column="id"    />
-        <result property="type"    column="type"    />
-        <result property="name"    column="name"    />
-        <result property="code"    column="code"    />
-        <result property="content"    column="content"    />
-        <result property="qrCodeUrl"    column="qr_code_url"    />
-        <result property="scanCount"    column="scan_count"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="type" column="type"/>
+        <result property="name" column="name"/>
+        <result property="code" column="code"/>
+        <result property="content" column="content"/>
+        <result property="qrCodeUrl" column="qr_code_url"/>
+        <result property="scanCount" column="scan_count"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectLabSafeBookVo">
@@ -31,20 +31,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectLabSafeBookList" parameterType="com.zd.laboratory.domain.LabSafeBook" resultMap="LabSafeBookResult">
         <include refid="selectLabSafeBookVo"/>
         <where>
-            <if test="type != null  and type != ''"> and type = #{type}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="code != null  and code != ''"> and code = #{code}</if>
-            <if test="content != null  and content != ''"> and content = #{content}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
-
-            <if test="beginTime != null ">
-                and str_to_date(create_time,'%Y-%m-%d') >= #{beginTime}
-            </if>
-            <if test="endTime != null ">
-                and str_to_date(create_time,'%Y-%m-%d') &lt;= #{endTime}
-            </if>
+            <if test="type != null  and type != ''">and type = #{type}</if>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="code != null  and code != ''">and code = #{code}</if>
+            <if test="content != null  and content != ''">and content = #{content}</if>
+            <if test="userId != null ">and user_id = #{userId}</if>
+            <if test="deptId != null ">and dept_id = #{deptId}</if>
+            <if test="deptName != null  and deptName != ''">and dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="beginTime != null ">and str_to_date(create_time,'%Y-%m-%d') >= #{beginTime}</if>
+            <if test="endTime != null ">and str_to_date(create_time,'%Y-%m-%d') &lt;= #{endTime}</if>
             <!-- 数据范围过滤 -->
             ${params.dataScope}
         </where>
@@ -59,48 +54,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabSafeBook" parameterType="com.zd.laboratory.domain.LabSafeBook" useGeneratedKeys="true" keyProperty="id">
         insert into lab_safe_book
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="type != null">type,</if>
-
-    <if test="name != null">name,</if>
-
-    <if test="code != null">code,</if>
-
-    <if test="content != null">content,</if>
-
-
-    <if test="scanCount != null">scan_count,</if>
-
-    <if test="userId != null">user_id,</if>
-
-    <if test="createBy != null">create_by,</if>
-
-    <if test="updateBy != null">update_by,</if>
-
-    <if test="deptId != null">dept_id,</if>
-
-    <if test="deptName != null">dept_name,</if>
-
-    <if test="createTime != null">create_time,</if>
-
-    <if test="updateTime != null">update_time,</if>
-
-    <if test="remark != null">remark,</if>
-
+            <if test="type != null">type,</if>
+            <if test="name != null">name,</if>
+            <if test="code != null">code,</if>
+            <if test="content != null">content,</if>
+            <if test="scanCount != null">scan_count,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="deptName != null">dept_name,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="type != null">#{type},</if>
-    <if test="name != null">#{name},</if>
-    <if test="code != null">#{code},</if>
-    <if test="content != null">#{content},</if>
-    <if test="scanCount != null">#{scanCount},</if>
-    <if test="userId != null">#{userId},</if>
-    <if test="createBy != null">#{createBy},</if>
-    <if test="updateBy != null">#{updateBy},</if>
-    <if test="deptId != null">#{deptId},</if>
-    <if test="deptName != null">#{deptName},</if>
-    <if test="createTime != null">#{createTime},</if>
-    <if test="updateTime != null">#{updateTime},</if>
-    <if test="remark != null">#{remark},</if>
+            <if test="type != null">#{type},</if>
+            <if test="name != null">#{name},</if>
+            <if test="code != null">#{code},</if>
+            <if test="content != null">#{content},</if>
+            <if test="scanCount != null">#{scanCount},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="deptName != null">#{deptName},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
 

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

@@ -5,17 +5,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabSafeClassifiedMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabSafeClassified" id="LabSafeClassifiedResult">
-        <result property="id"    column="id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="remark"    column="remark"    />
-        <result property="classifiedName"    column="classified_name"    />
-        <result property="classifiedColor"    column="classified_color"    />
+        <result property="id" column="id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="remark" column="remark"/>
+        <result property="classifiedName" column="classified_name"/>
+        <result property="classifiedColor" column="classified_color"/>
     </resultMap>
 
     <sql id="selectLabSafeClassifiedVo">
@@ -47,38 +47,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabSafeClassified" parameterType="com.zd.laboratory.domain.LabSafeClassified" useGeneratedKeys="true" keyProperty="id">
         insert into lab_safe_classified
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="deptName != null">dept_name,</if>
-
-    <if test="deptId != null">dept_id,</if>
-
-    <if test="createTime != null">create_time,</if>
-
-    <if test="userId != null">user_id,</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>
-
-    <if test="classifiedName != null">classified_name,</if>
-
-    <if test="classifiedColor != null">classified_color,</if>
-
+            <if test="deptName != null">dept_name,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="userId != null">user_id,</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>
+            <if test="classifiedName != null">classified_name,</if>
+            <if test="classifiedColor != null">classified_color,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="deptName != null">#{deptName},</if>
-    <if test="deptId != null">#{deptId},</if>
-    <if test="createTime != null">#{createTime},</if>
-    <if test="userId != null">#{userId},</if>
-    <if test="createBy != null">#{createBy},</if>
-    <if test="updateTime != null">#{updateTime},</if>
-    <if test="updateBy != null">#{updateBy},</if>
-    <if test="remark != null">#{remark},</if>
-    <if test="classifiedName != null">#{classifiedName},</if>
-    <if test="classifiedColor != null">#{classifiedColor},</if>
+            <if test="deptName != null">#{deptName},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="classifiedName != null">#{classifiedName},</if>
+            <if test="classifiedColor != null">#{classifiedColor},</if>
          </trim>
     </insert>
 

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

@@ -5,17 +5,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabSafeClasstypeMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabSafeClasstype" id="LabSafeClasstypeResult">
-        <result property="id"    column="id"    />
-        <result property="typeName"    column="type_name"    />
-        <result property="systemSetting"    column="system_setting"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="typeName" column="type_name"/>
+        <result property="systemSetting" column="system_setting"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectLabSafeClasstypeVo">
@@ -47,38 +47,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabSafeClasstype" parameterType="com.zd.laboratory.domain.LabSafeClasstype" useGeneratedKeys="true" keyProperty="id">
         insert into lab_safe_classtype
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="typeName != null">type_name,</if>
-
-    <if test="systemSetting != null">system_setting,</if>
-
-    <if test="deptName != null">dept_name,</if>
-
-    <if test="deptId != null">dept_id,</if>
-
-    <if test="createTime != null">create_time,</if>
-
-    <if test="userId != null">user_id,</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>
-
+            <if test="typeName != null">type_name,</if>
+            <if test="systemSetting != null">system_setting,</if>
+            <if test="deptName != null">dept_name,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="userId != null">user_id,</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="typeName != null">#{typeName},</if>
-    <if test="systemSetting != null">#{systemSetting},</if>
-    <if test="deptName != null">#{deptName},</if>
-    <if test="deptId != null">#{deptId},</if>
-    <if test="createTime != null">#{createTime},</if>
-    <if test="userId != null">#{userId},</if>
-    <if test="createBy != null">#{createBy},</if>
-    <if test="updateTime != null">#{updateTime},</if>
-    <if test="updateBy != null">#{updateBy},</if>
-    <if test="remark != null">#{remark},</if>
+            <if test="typeName != null">#{typeName},</if>
+            <if test="systemSetting != null">#{systemSetting},</if>
+            <if test="deptName != null">#{deptName},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
 

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

@@ -5,67 +5,67 @@
 <mapper namespace="com.zd.laboratory.mapper.LabSecurityApplyMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabSecurityApply" id="LabSecurityApplyResult">
-        <result property="id"    column="id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="userName"    column="user_name"    />
-        <result property="userType"    column="user_type"    />
-        <result property="userNumber"    column="user_number"    />
-        <result property="userMajor"    column="user_major"    />
-        <result property="userMajorId"    column="user_major_id"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="subjectId"    column="subject_id"    />
-        <result property="subjectAdminid"    column="subject_adminid"    />
-        <result property="subjectName"    column="subject_name"    />
-        <result property="securityCertificate"    column="security_certificate"    />
-        <result property="securityCommitment"    column="security_commitment"    />
-        <result property="riskReport"    column="risk_report"    />
-        <result property="auditStatus"    column="audit_status"    />
-        <result property="auditTime"    column="audit_time"    />
-        <result property="auditId"    column="audit_id"    />
-        <result property="auditName"    column="audit_name"    />
-        <result property="rejectCause"    column="reject_cause"    />
-        <result property="rejectTime"    column="reject_time"    />
-        <result property="applyCause"    column="apply_cause"    />
-        <result property="rejectMaterial"    column="reject_material"    />
-        <result property="creatTime"    column="creat_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="validLength"    column="valid_length"    />
-        <result property="validBeginTime"    column="valid_begin_time"    />
-        <result property="validEndTime"    column="valid_end_time"    />
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="userType" column="user_type"/>
+        <result property="userNumber" column="user_number"/>
+        <result property="userMajor" column="user_major"/>
+        <result property="userMajorId" column="user_major_id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="subjectAdminid" column="subject_adminid"/>
+        <result property="subjectName" column="subject_name"/>
+        <result property="securityCertificate" column="security_certificate"/>
+        <result property="securityCommitment" column="security_commitment"/>
+        <result property="riskReport" column="risk_report"/>
+        <result property="auditStatus" column="audit_status"/>
+        <result property="auditTime" column="audit_time"/>
+        <result property="auditId" column="audit_id"/>
+        <result property="auditName" column="audit_name"/>
+        <result property="rejectCause" column="reject_cause"/>
+        <result property="rejectTime" column="reject_time"/>
+        <result property="applyCause" column="apply_cause"/>
+        <result property="rejectMaterial" column="reject_material"/>
+        <result property="creatTime" column="creat_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="validLength" column="valid_length"/>
+        <result property="validBeginTime" column="valid_begin_time"/>
+        <result property="validEndTime" column="valid_end_time"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabSecurityApplyVO" id="LabSecurityApplyResultVO">
-        <result property="id"    column="id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="userName"    column="user_name"    />
-        <result property="userType"    column="user_type"    />
-        <result property="userNumber"    column="user_number"    />
-        <result property="userMajor"    column="user_major"    />
-        <result property="userMajorId"    column="user_major_id"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="subjectId"    column="subject_id"    />
-        <result property="subjectAdminid"    column="subject_adminid"    />
-        <result property="subjectName"    column="subject_name"    />
-        <result property="securityCertificate"    column="security_certificate"    />
-        <result property="securityCommitment"    column="security_commitment"    />
-        <result property="riskReport"    column="risk_report"    />
-        <result property="auditStatus"    column="audit_status"    />
-        <result property="auditTime"    column="audit_time"    />
-        <result property="auditId"    column="audit_id"    />
-        <result property="auditName"    column="audit_name"    />
-        <result property="rejectCause"    column="reject_cause"    />
-        <result property="rejectTime"    column="reject_time"    />
-        <result property="applyCause"    column="apply_cause"    />
-        <result property="rejectMaterial"    column="reject_material"    />
-        <result property="creatTime"    column="creat_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="validLength"    column="valid_length"    />
-        <result property="validBeginTime"    column="valid_begin_time"    />
-        <result property="validEndTime"    column="valid_end_time"    />
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="userType" column="user_type"/>
+        <result property="userNumber" column="user_number"/>
+        <result property="userMajor" column="user_major"/>
+        <result property="userMajorId" column="user_major_id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="subjectAdminid" column="subject_adminid"/>
+        <result property="subjectName" column="subject_name"/>
+        <result property="securityCertificate" column="security_certificate"/>
+        <result property="securityCommitment" column="security_commitment"/>
+        <result property="riskReport" column="risk_report"/>
+        <result property="auditStatus" column="audit_status"/>
+        <result property="auditTime" column="audit_time"/>
+        <result property="auditId" column="audit_id"/>
+        <result property="auditName" column="audit_name"/>
+        <result property="rejectCause" column="reject_cause"/>
+        <result property="rejectTime" column="reject_time"/>
+        <result property="applyCause" column="apply_cause"/>
+        <result property="rejectMaterial" column="reject_material"/>
+        <result property="creatTime" column="creat_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="validLength" column="valid_length"/>
+        <result property="validBeginTime" column="valid_begin_time"/>
+        <result property="validEndTime" column="valid_end_time"/>
     </resultMap>
 
     <sql id="selectLabSecurityApplyVo">
@@ -77,11 +77,9 @@
                t.audit_id, t.audit_name, t.reject_cause, t.reject_time,t.apply_cause,
                t.reject_material, t.creat_time, t.update_by, t.update_time,t.valid_length,
                t.valid_begin_time,t.valid_end_time,
-                   /*CASE  WHEN (audit_status =2) THEN
-                             STR_TO_DATE(DATE_FORMAT( DATE_ADD(audit_time, INTERVAL IFNULL(valid_length,0) MONTH),'%Y-%m-%d %H:%i'),'%Y-%m-%d %H:%i') ELSE null END
-                       AS valid_end_time,*/
-                   DATE_FORMAT(t.creat_time,'%H:%i') hi from lab_security_apply as t
+               DATE_FORMAT(t.creat_time,'%H:%i') hi from lab_security_apply as t
     </sql>
+
     <sql id="selectLabSecurityApplyListVo">
         select t.id, t.user_id, t.user_name, t.user_type,t.user_number,t.user_major,t.user_major_id, t.dept_id,
                t.dept_name, t.subject_id,t.subject_adminid,
@@ -90,11 +88,9 @@
                t.audit_id, t.audit_name, t.reject_cause, t.reject_time,t.apply_cause,
                t.reject_material, t.creat_time, t.update_by, t.update_time,t.valid_length,
                t.valid_begin_time,t.valid_end_time,
-               /*CASE  WHEN (audit_status =2) THEN
-                         STR_TO_DATE(DATE_FORMAT( DATE_ADD(audit_time, INTERVAL IFNULL(valid_length,0) MONTH),'%Y-%m-%d %H:%i'),'%Y-%m-%d %H:%i') ELSE null END
-                   AS valid_end_time,*/
                DATE_FORMAT(t.creat_time,'%H:%i') hi from lab_security_apply as t
     </sql>
+
     <select id="selectLabSecurityApplyListYmd" parameterType="com.zd.laboratory.domain.LabSecurityApply" resultMap="LabSecurityApplyResultVO">
         <include refid="selectLabSecurityApplyVo"/>
         <where>
@@ -178,7 +174,6 @@
                 </foreach>
             </if>
             <!-- 数据范围过滤 ${params.dataScope}-->
-
         </where>
         order by creat_time desc
     </select>
@@ -192,59 +187,32 @@
         insert into lab_security_apply
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="userId != null">user_id,</if>
-
             <if test="userName != null">user_name,</if>
-
             <if test="userType != null">user_type,</if>
-
             <if test="userNumber != null">user_number,</if>
-
             <if test="userMajor != null">user_major,</if>
-
             <if test="userMajorId != null">user_major_id,</if>
-
             <if test="deptId != null">dept_id,</if>
-
             <if test="subjectAdminid != null">subject_adminid,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="subjectId != null">subject_id,</if>
-
             <if test="subjectName != null">subject_name,</if>
-
             <if test="securityCertificate != null">security_certificate,</if>
-
             <if test="securityCommitment != null">security_commitment,</if>
-
             <if test="riskReport != null">risk_report,</if>
-
             <if test="auditStatus != null">audit_status,</if>
-
             <if test="auditTime != null">audit_time,</if>
-
             <if test="auditId != null">audit_id,</if>
-
             <if test="auditName != null">audit_name,</if>
-
             <if test="rejectCause != null">reject_cause,</if>
-
             <if test="rejectTime != null">reject_time,</if>
-
             <if test="applyCause != null">apply_cause,</if>
-
             <if test="rejectMaterial != null">reject_material,</if>
-
             <if test="creatTime != null">creat_time,</if>
-
             <if test="updateBy != null">update_by,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="validLength != null">valid_length,</if>
-
             <if test="validBeginTime != null ">valid_begin_time,</if>
-
             <if test="validEndTime != null "> valid_end_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">

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

@@ -5,37 +5,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabSecurityGroupMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabSecurityGroup" id="LabSecurityGroupResult">
-        <result property="id"    column="id"    />
-        <result property="joinUserId"    column="join_user_id"    />
-        <result property="groupTitle"    column="group_title"    />
-        <result property="groupUrl"    column="group_url"    />
-        <result property="remark"    column="remark"    />
-        <result property="status"    column="status"    />
-        <result property="configureName"    column="configure_name"    />
-        <result property="effectiveTime"    column="effective_time"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
+        <result property="id" column="id"/>
+        <result property="joinUserId" column="join_user_id"/>
+        <result property="groupTitle" column="group_title"/>
+        <result property="groupUrl" column="group_url"/>
+        <result property="remark" column="remark"/>
+        <result property="status" column="status"/>
+        <result property="configureName" column="configure_name"/>
+        <result property="effectiveTime" column="effective_time"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabSecurityGroupVO" id="LabSecurityGroupResultVO">
-        <result property="id"    column="id"    />
-        <result property="configureName"    column="configure_name"    />
-        <result property="effectiveTime"    column="effective_time"    />
-        <result property="materialNames"    column="material_names"    />
-        <result property="subjectCount"    column="subject_count"    />
-        <result property="remark"    column="remark"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
+        <result property="id" column="id"/>
+        <result property="configureName" column="configure_name"/>
+        <result property="effectiveTime" column="effective_time"/>
+        <result property="materialNames" column="material_names"/>
+        <result property="subjectCount" column="subject_count"/>
+        <result property="remark" column="remark"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
     </resultMap>
 
     <sql id="selectLabSecurityGroupVo">
@@ -44,13 +44,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             (SELECT GROUP_CONCAT(ml.`material_name`) FROM lab_security_material ml WHERE ml.configure_id = g.id ORDER BY ml.id) as material_names, g.dept_id
             from lab_security_group g
          ) z
-
     </sql>
 
     <select id="selectLabSecurityGroupList" parameterType="com.zd.laboratory.domain.LabSecurityGroup" resultMap="LabSecurityGroupResultVO">

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

@@ -120,35 +120,20 @@
         insert into lab_security_material_data
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="materialName != null">material_name,</if>
-
             <if test="materialDescribe != null">material_describe,</if>
-
             <if test="materialSuit != null">material_suit,</if>
-
             <if test="materialType != null">material_type,</if>
-
             <if test="fileType != null">file_type,</if>
-
             <if test="relationType != null">relation_type,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="createBy != null">create_by,</if>
-
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="updateUserid != null">update_userid,</if>
-
             <if test="updateUsername != null">update_username,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="remak != null">remak,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="materialName != null">#{materialName},</if>

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

@@ -5,22 +5,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabSecurityMaterialMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabSecurityMaterial" id="LabSecurityMaterialResult">
-        <result property="id"    column="id"    />
-        <result property="materialName"    column="material_name"    />
-        <result property="configureId"    column="configure_id"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="materialName" column="material_name"/>
+        <result property="configureId" column="configure_id"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabSecurityMaterialVO" id="LabSecurityMaterialResultVO">
-        <result property="subjectId"    column="subject_id"    />
+        <result property="subjectId" column="subject_id"/>
     </resultMap>
 
     <sql id="selectLabSecurityMaterialVo">
         select id, material_name, configure_id, remark from lab_security_material sm
     </sql>
+
     <sql id="selectLabSecurityMaterialListVo">
         select t.id, t.material_name, t.configure_id, t.remark from lab_security_material as t
     </sql>
+
     <select id="selectLabSecurityMaterialList" parameterType="com.zd.laboratory.domain.LabSecurityMaterial" resultMap="LabSecurityMaterialResult">
         <include refid="selectLabSecurityMaterialVo"/>
         <where>
@@ -39,18 +41,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabSecurityMaterial" parameterType="com.zd.laboratory.domain.LabSecurityMaterial">
         insert into lab_security_material
         <trim prefix="(" suffix=")" suffixOverrides=",">
-
-    <if test="materialName != null">material_name,</if>
-
-    <if test="configureId != null">configure_id,</if>
-
-    <if test="remark != null">remark,</if>
-
+            <if test="materialName != null">material_name,</if>
+            <if test="configureId != null">configure_id,</if>
+            <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="materialName != null">#{materialName},</if>
-    <if test="configureId != null">#{configureId},</if>
-    <if test="remark != null">#{remark},</if>
+            <if test="materialName != null">#{materialName},</if>
+            <if test="configureId != null">#{configureId},</if>
+            <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
 

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

@@ -5,15 +5,15 @@
 <mapper namespace="com.zd.laboratory.mapper.LabSecurityMaterialrelationMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabSecurityMaterialrelation" id="LabSecurityMaterialrelationResult">
-        <result property="id"    column="id"    />
-        <result property="applyId"    column="apply_id"    />
-        <result property="materialId"    column="material_id"    />
-        <result property="dataName"    column="data_name"    />
-        <result property="dataDescribe"    column="data_describe"    />
-        <result property="dataUrl"    column="data_url"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="remak"    column="remak"    />
+        <result property="id" column="id"/>
+        <result property="applyId" column="apply_id"/>
+        <result property="materialId" column="material_id"/>
+        <result property="dataName" column="data_name"/>
+        <result property="dataDescribe" column="data_describe"/>
+        <result property="dataUrl" column="data_url"/>
+        <result property="userId" column="user_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="remak" column="remak"/>
     </resultMap>
 
     <sql id="selectLabSecurityMaterialrelationVo">
@@ -43,23 +43,14 @@
     <insert id="insertLabSecurityMaterialrelation" parameterType="com.zd.laboratory.domain.LabSecurityMaterialrelation">
         insert into lab_security_materialrelation
         <trim prefix="(" suffix=")" suffixOverrides=",">
-
             <if test="applyId != null">apply_id,</if>
-
             <if test="materialId != null">material_id,</if>
-
             <if test="dataName != null">data_name,</if>
-
             <if test="dataDescribe != null">data_describe,</if>
-
             <if test="dataUrl != null">data_url,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="remak != null">remak,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="applyId != null">#{applyId},</if>

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

@@ -5,23 +5,23 @@
 <mapper namespace="com.zd.laboratory.mapper.LabSecuritySubjectmaterialMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabSecuritySubjectmaterial" id="LabSecuritySubjectmaterialResult">
-        <result property="id"    column="id"    />
-        <result property="subjectId"    column="subject_id"    />
-        <result property="materialId"    column="material_id"    />
-        <result property="materialType"    column="material_type"    />
-        <result property="cretaId"    column="creta_id"    />
-        <result property="createTime"    column="create_time"    />
+        <result property="id" column="id"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="materialId" column="material_id"/>
+        <result property="materialType" column="material_type"/>
+        <result property="cretaId" column="creta_id"/>
+        <result property="createTime" column="create_time"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabSecuritySubjectmaterialVO" id="LabSecuritySubjectmaterialVO">
-        <result property="id"    column="id"    />
-        <result property="subjectId"    column="subject_id"    />
-        <result property="materialId"    column="material_id"    />
-        <result property="materialType"    column="material_type"    />
-        <result property="cretaId"    column="creta_id"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="materialName"    column="material_name"    />
-        <result property="materialDescribe"    column="material_describe"    />
+        <result property="id" column="id"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="materialId" column="material_id"/>
+        <result property="materialType" column="material_type"/>
+        <result property="cretaId" column="creta_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="materialName" column="material_name"/>
+        <result property="materialDescribe" column="material_describe"/>
     </resultMap>
 
     <sql id="selectLabSecuritySubjectmaterialVo">
@@ -30,6 +30,7 @@
     <sql id="selectLabSecuritySubjectmaterialListVo">
         select t.id, t.subject_id, t.material_id,t.material_type, t.creta_id, t.create_time from lab_security_subjectmaterial as t
     </sql>
+
     <select id="selectLabSecuritySubjectmaterialList" parameterType="com.zd.laboratory.domain.LabSecuritySubjectmaterial" resultMap="LabSecuritySubjectmaterialResult">
         <include refid="selectLabSecuritySubjectmaterialVo"/>
         <where>
@@ -49,15 +50,10 @@
         insert into lab_security_subjectmaterial
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="subjectId != null">subject_id,</if>
-
             <if test="materialId != null">material_id,</if>
-
             <if test="materialType != null">material_type,</if>
-
             <if test="cretaId != null">creta_id,</if>
-
             <if test="createTime != null">create_time,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="subjectId != null">#{subjectId},</if>
@@ -101,5 +97,4 @@
     <select id="selectStudentList" parameterType="com.zd.laboratory.domain.vo.LabSecuritySubjectmaterialVO" resultMap="LabSecuritySubjectmaterialVO">
         SELECT * FROM lab_security_material_data md WHERE md.material_suit IN(1,3)
     </select>
-
 </mapper>

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabSemesterMapper.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.laboratory.mapper.LabSemesterMapper">
-    
+
     <resultMap type="com.zd.laboratory.domain.LabSemester" id="LabSemesterResult">
-        <result property="id"    column="id"    />
-        <result property="semesterName"    column="semester_name"    />
-        <result property="semesterStart"    column="semester_start"    />
-        <result property="semesterEnd"    column="semester_end"    />
-        <result property="semesterRemake"    column="semester_remake"    />
+        <result property="id" column="id"/>
+        <result property="semesterName" column="semester_name"/>
+        <result property="semesterStart" column="semester_start"/>
+        <result property="semesterEnd" column="semester_end"/>
+        <result property="semesterRemake" column="semester_remake"/>
     </resultMap>
 
     <sql id="selectLabSemesterVo">
@@ -36,20 +36,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabSemester" parameterType="com.zd.laboratory.domain.LabSemester" useGeneratedKeys="true" keyProperty="id">
         insert into lab_semester
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="semesterName != null">semester_name,</if>
-
-    <if test="semesterStart != null">semester_start,</if>
-
-    <if test="semesterEnd != null">semester_end,</if>
-
-    <if test="semesterRemake != null">semester_remake,</if>
-
+            <if test="semesterName != null">semester_name,</if>
+            <if test="semesterStart != null">semester_start,</if>
+            <if test="semesterEnd != null">semester_end,</if>
+            <if test="semesterRemake != null">semester_remake,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="semesterName != null">#{semesterName},</if>
-    <if test="semesterStart != null">#{semesterStart},</if>
-    <if test="semesterEnd != null">#{semesterEnd},</if>
-    <if test="semesterRemake != null">#{semesterRemake},</if>
+            <if test="semesterName != null">#{semesterName},</if>
+            <if test="semesterStart != null">#{semesterStart},</if>
+            <if test="semesterEnd != null">#{semesterEnd},</if>
+            <if test="semesterRemake != null">#{semesterRemake},</if>
          </trim>
     </insert>
 

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

@@ -36,7 +36,6 @@
         <result property="senseState" column="sense_state" typeHandler="org.apache.ibatis.type.EnumOrdinalTypeHandler"/>
     </resultMap>
 
-    <!--   select id, name, factory, type, sense_data, data_upper, data_lower, mac_add, subject_id, dept_id, create_time, dept_name, user_id, create_by, update_time, update_by, remark from lab_sensor-->
     <sql id="selectLabSensorVo">
         select xx.*
         from (SELECT id,

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

@@ -27,7 +27,6 @@
         <result property="floorName" column="floorName"/>
         <result property="deviceType" column="device_type"/>
         <result property="deviceVol" column="device_vol"/>
-
     </resultMap>
 
     <sql id="selectLabSparseHardwareVo">
@@ -84,38 +83,6 @@
         LEFT JOIN lab_build_floor d ON t.build_id = d.id
         LEFT JOIN lab_build_floor b ON t.floor_id = b.id
         LEFT JOIN lab_subject s ON t.subject_id = s.id
-        <!--select t.id,
-               t.hardware_num,
-               t.name,
-               t.type,
-               t.floor_id,
-               t.build_id,
-               CASE WHEN t.subject_id IS NOT NULL THEN
-               (SELECT DISTINCT dt.name FROM lab_building dt INNER JOIN lab_subject st ON dt.id = st.floor_id WHERE st.id = t.subject_id)
-               ELSE b.name END AS buildName,
-               t.subject_id,
-               s.name as subjectName,
-               t.operate,
-               t.function_status,
-               t.dept_id,
-               t.dept_name,
-               t.create_time,
-               t.user_id,
-               t.create_by,
-               t.update_time,
-               t.update_by,
-               t.remark,
-               t.port,
-               t.device_vol,
-               t.device_type,
-               CASE WHEN t.subject_id IS NOT NULL THEN
-               (SELECT DISTINCT dt.dept_name FROM sys_dept dt INNER JOIN lab_subject st ON dt.dept_id = st.build_id WHERE st.id = t.subject_id)
-               ELSE d.dept_name END AS floorName
-        from lab_sparse_hardware as t
-            left join sys_dept d on t.build_id = d.dept_id
-            left join lab_building b on t.floor_id = b.id
-            left join lab_subject s on t.subject_id = s.id
-            -->
     </sql>
     <select id="selectLabSparseHardwareList" parameterType="com.zd.laboratory.domain.LabSparseHardware"
             resultMap="LabSparseHardwareResult">
@@ -159,40 +126,24 @@
         insert into lab_sparse_hardware
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="hardwareNum != null">hardware_num,</if>
-
             <if test="name != null">name,</if>
-
             <if test="type != null">type,</if>
-
             <if test="floorId != null">floor_id,</if>
-
             <if test="buildId != null">build_id,</if>
-
             <if test="subjectId != null">subject_id,</if>
-
             <if test="operate != null">operate,</if>
-
             <if test="functionStatus != null">function_status,</if>
-
             <if test="deptId != null">dept_id,</if>
-
             <if test="deptName != null">dept_name,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="userId != null">user_id,</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>
             <if test="port != null">port,</if>
             <if test="deviceType != null">device_type,</if>
             <if test="deviceVol != null">device_vol,</if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="hardwareNum != null">#{hardwareNum},</if>

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

@@ -5,24 +5,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabStudentsInfoMapper">
 
     <resultMap type="com.zd.system.api.entity.LabStudentsInfo" id="LabStudentsInfoResult">
-        <result property="joinStudentsId"    column="join_students_id"    />
-        <result property="auditStatus"    column="audit_status"    />
-        <result property="card"    column="card"    />
-        <result property="faceImg"    column="face_img"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="opinions"    column="opinions"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="userId"    column="user_id"    />
-        <result property="remark"    column="remark"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="auditTime"    column="audit_time"    />
-        <result property="auditUser"    column="audit_user"    />
-        <result property="commitTime"    column="commit_time"    />
-        <result property="faceFeature"    column="face_feature"    />
-
+        <result property="joinStudentsId" column="join_students_id"/>
+        <result property="auditStatus" column="audit_status"/>
+        <result property="card" column="card"/>
+        <result property="faceImg" column="face_img"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="opinions" column="opinions"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="userId" column="user_id"/>
+        <result property="remark" column="remark"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="auditTime" column="audit_time"/>
+        <result property="auditUser" column="audit_user"/>
+        <result property="commitTime" column="commit_time"/>
+        <result property="faceFeature" column="face_feature"/>
     </resultMap>
 
     <sql id="selectLabStudentsInfoVo">
@@ -65,55 +64,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabStudentsInfo" parameterType="com.zd.system.api.entity.LabStudentsInfo">
         insert into lab_students_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="joinStudentsId != null">join_students_id,</if>
-
-    <if test="auditStatus != null">audit_status,</if>
-
-    <if test="card != null">card,</if>
-
-    <if test="faceImg != null">face_img,</if>
-
-    <if test="deptId != null">dept_id,</if>
-
-    <if test="deptName != null">dept_name,</if>
-
-    <if test="userId != null">user_id,</if>
-
-    <if test="remark != null">remark,</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="opinions != null">opinions,</if>
-    <if test="auditTime != null">audit_time,</if>
-    <if test="auditUser != null">audit_user,</if>
-    <if test="commitTime != null">commit_time,</if>
-    <if test="faceFeature != null">face_feature,</if>
-
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="joinStudentsId != null">#{joinStudentsId},</if>
-    <if test="auditStatus != null">#{auditStatus},</if>
-    <if test="card != null">#{card},</if>
-    <if test="faceImg != null">#{faceImg},</if>
-    <if test="deptId != null">#{deptId},</if>
-    <if test="deptName != null">#{deptName},</if>
-    <if test="userId != null">#{userId},</if>
-    <if test="remark != null">#{remark},</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="opinions != null">#{opinions},</if>
-    <if test="auditTime != null">#{auditTime},</if>
-        <if test="auditUser != null">#{auditUser},</if>
-        <if test="commitTime != null">#{commitTime},</if>
-        <if test="faceFeature != null">#{faceFeature},</if>
-
-         </trim>
+            <if test="joinStudentsId != null">join_students_id,</if>
+            <if test="auditStatus != null">audit_status,</if>
+            <if test="card != null">card,</if>
+            <if test="faceImg != null">face_img,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="deptName != null">dept_name,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="remark != null">remark,</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="opinions != null">opinions,</if>
+            <if test="auditTime != null">audit_time,</if>
+            <if test="auditUser != null">audit_user,</if>
+            <if test="commitTime != null">commit_time,</if>
+            <if test="faceFeature != null">face_feature,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="joinStudentsId != null">#{joinStudentsId},</if>
+            <if test="auditStatus != null">#{auditStatus},</if>
+            <if test="card != null">#{card},</if>
+            <if test="faceImg != null">#{faceImg},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="deptName != null">#{deptName},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="remark != null">#{remark},</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="opinions != null">#{opinions},</if>
+            <if test="auditTime != null">#{auditTime},</if>
+            <if test="auditUser != null">#{auditUser},</if>
+            <if test="commitTime != null">#{commitTime},</if>
+            <if test="faceFeature != null">#{faceFeature},</if>
+        </trim>
     </insert>
 
     <update id="updateLabStudentsInfo" parameterType="com.zd.system.api.entity.LabStudentsInfo">

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

@@ -5,50 +5,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabSubjectAccessRecordMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabSubjectAccessRecord" id="LabSubjectAccessRecordResult">
-        <result property="id"    column="id"    />
-        <result property="joinUserId"    column="join_user_id"    />
-        <result property="subjectId"    column="subject_id"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="inTime"    column="in_time"    />
-        <result property="outTime"    column="out_time"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="remark"    column="remark"    />
-        <result property="accessStatus"    column="access_status"    />
-        <result property="initFlag"    column="init_flag"    />
+        <result property="id" column="id"/>
+        <result property="joinUserId" column="join_user_id"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="inTime" column="in_time"/>
+        <result property="outTime" column="out_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="remark" column="remark"/>
+        <result property="accessStatus" column="access_status"/>
+        <result property="initFlag" column="init_flag"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabSubjectAccessRecordVo" id="labInoutTimeVo">
-        <result property="timeStr"    column="time_str"    />
-        <result property="userName"    column="user_name"    />
-        <result property="countStr"    column="count_str"    />
-        <result property="subjectName"    column="subject_name"    />
+        <result property="timeStr" column="time_str"/>
+        <result property="userName" column="user_name"/>
+        <result property="countStr" column="count_str"/>
+        <result property="subjectName" column="subject_name"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabSubjectAccessRecordVo" id="labAccessDetail">
-        <result property="id"    column="id"    />
-        <result property="joinUserId"    column="join_user_id"    />
-        <result property="subjectId"    column="subject_id"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="inTime"    column="in_time"    />
-        <result property="outTime"    column="out_time"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="remark"    column="remark"    />
-        <result property="userName"    column="user_name"    />
-        <result property="nickName"    column="nick_name"    />
-        <result property="phonenumber"    column="phonenumber"    />
-        <result property="accessStatus"    column="access_status"    />
-        <result property="intervalTime"    column="interval_time"    />
-        <result property="subjectName"    column="subject_name"    />
+        <result property="id" column="id"/>
+        <result property="joinUserId" column="join_user_id"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="inTime" column="in_time"/>
+        <result property="outTime" column="out_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="remark" column="remark"/>
+        <result property="userName" column="user_name"/>
+        <result property="nickName" column="nick_name"/>
+        <result property="phonenumber" column="phonenumber"/>
+        <result property="accessStatus" column="access_status"/>
+        <result property="intervalTime" column="interval_time"/>
+        <result property="subjectName" column="subject_name"/>
     </resultMap>
 
     <sql id="selectLabSubjectAccessRecordVo">
@@ -202,8 +202,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by re.create_time desc
     </select>
 
-
-
     <select id="selectLabSubjectAccessRecordSingleList" parameterType="com.zd.laboratory.domain.vo.LabSubjectAccessRecordVo" resultMap="labAccessDetail">
         SELECT
         re.id,
@@ -257,7 +255,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by re.create_time desc
     </select>
 
-
     <select id="selectMyAccessRecordList" parameterType="com.zd.laboratory.domain.vo.LabSubjectAccessRecordVo" resultMap="labAccessDetail">
         <include refid="selectMyAccessRecordVo"/>
         <where>
@@ -413,7 +410,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
-
     <select id="labInoutTime" parameterType="com.zd.laboratory.domain.vo.LabSubjectAccessRecordVo" resultMap="labInoutTimeVo">
         select str_to_date(re.`in_time`,'%Y-%m-%d') time_str,re.`join_user_name` user_name
         , count(*) count_str  FROM lab_subject_access_record re
@@ -423,7 +419,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         group by str_to_date(re.`in_time`,'%Y-%M-%d'),re.`join_user_id` order by re.`in_time` desc
     </select>
 
-
     <select id="myAccessDetail" parameterType="Long" resultMap="labAccessDetail">
         SELECT a.id,
         u.`user_name`,
@@ -486,5 +481,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="outTimeChangeStatus">
         UPDATE lab_subject_access_record ar INNER JOIN lab_subject st ON ar.`subject_id` = st.`id` SET ar.access_status=3 WHERE ar.`out_time` IS NULL AND TIMESTAMPDIFF(HOUR,ar.in_time,NOW())>=st.sign_time AND ar.access_status=1 and ar.init_flag = 0
     </update>
-
 </mapper>

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

@@ -5,18 +5,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabSubjectDengerRelationMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabSubjectDengerRelation" id="LabSubjectDengerRelationResult">
-        <result property="id"    column="id"    />
-        <result property="dangerId"    column="danger_id"    />
-        <result property="dangerName"    column="danger_name"    />
-        <result property="subjectId"    column="subject_id"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="userId"    column="user_id"    />
-        <result property="remark"    column="remark"    />
-        <result property="quantity"    column="quantity"    />
-        <result property="subjectName"    column="subjectName"   javaType="string" />
-        <result property="subDept"    column="subDept"    javaType="string"/>
-
+        <result property="id" column="id"/>
+        <result property="dangerId" column="danger_id"/>
+        <result property="dangerName" column="danger_name"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="userId" column="user_id"/>
+        <result property="remark" column="remark"/>
+        <result property="quantity" column="quantity"/>
+        <result property="subjectName" column="subjectName" javaType="string"/>
+        <result property="subDept" column="subDept" javaType="string"/>
     </resultMap>
 
     <sql id="selectLabSubjectDengerRelationVo">
@@ -82,21 +81,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into lab_subject_denger_relation
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="dangerId != null">danger_id,</if>
-
             <if test="dangerName != null">danger_name,</if>
-
             <if test="subjectId != null">subject_id,</if>
-
             <if test="createTime != null">create_time,</if>
-
             <if test="updateTime != null">update_time,</if>
-
             <if test="userId != null">user_id,</if>
-
             <if test="remark != null">remark,</if>
-
             <if test="quantity != null">quantity,</if>
-
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="dangerId != null">#{dangerId},</if>

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

@@ -5,13 +5,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabSubjectHardwarePositionMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabSubjectHardwarePosition" id="LabSubjectHardwarePositionResult">
-        <result property="id"    column="id"    />
-        <result property="labSubjectId"    column="lab_subject_id"    />
-        <result property="hardName"    column="hard_name"    />
-        <result property="hardId"    column="hard_id"    />
-        <result property="horizontalAxis"    column="horizontal_axis"    />
-        <result property="verticalAxis"    column="vertical_axis"    />
-        <result property="createTime"    column="create_time"    />
+        <result property="id" column="id"/>
+        <result property="labSubjectId" column="lab_subject_id"/>
+        <result property="hardName" column="hard_name"/>
+        <result property="hardId" column="hard_id"/>
+        <result property="horizontalAxis" column="horizontal_axis"/>
+        <result property="verticalAxis" column="vertical_axis"/>
+        <result property="createTime" column="create_time"/>
     </resultMap>
 
     <sql id="selectLabSubjectHardwarePositionVo">
@@ -41,26 +41,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabSubjectHardwarePosition" parameterType="com.zd.laboratory.domain.LabSubjectHardwarePosition" useGeneratedKeys="true" keyProperty="id">
         insert into lab_subject_hardware_position
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="labSubjectId != null">lab_subject_id,</if>
-
-    <if test="hardName != null">hard_name,</if>
-
-    <if test="hardId != null">hard_id,</if>
-
-    <if test="horizontalAxis != null">horizontal_axis,</if>
-
-    <if test="verticalAxis != null">vertical_axis,</if>
-
-    <if test="createTime != null">create_time,</if>
-
+            <if test="labSubjectId != null">lab_subject_id,</if>
+            <if test="hardName != null">hard_name,</if>
+            <if test="hardId != null">hard_id,</if>
+            <if test="horizontalAxis != null">horizontal_axis,</if>
+            <if test="verticalAxis != null">vertical_axis,</if>
+            <if test="createTime != null">create_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="labSubjectId != null">#{labSubjectId},</if>
-    <if test="hardName != null">#{hardName},</if>
-    <if test="hardId != null">#{hardId},</if>
-    <if test="horizontalAxis != null">#{horizontalAxis},</if>
-    <if test="verticalAxis != null">#{verticalAxis},</if>
-    <if test="createTime != null">#{createTime},</if>
+            <if test="labSubjectId != null">#{labSubjectId},</if>
+            <if test="hardName != null">#{hardName},</if>
+            <if test="hardId != null">#{hardId},</if>
+            <if test="horizontalAxis != null">#{horizontalAxis},</if>
+            <if test="verticalAxis != null">#{verticalAxis},</if>
+            <if test="createTime != null">#{createTime},</if>
          </trim>
     </insert>
 

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

@@ -5,35 +5,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabSubjectLayoutMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabSubjectLayout" id="LabSubjectLayoutResult">
-        <result property="id"    column="id"    />
-        <result property="subjectId"    column="subject_id"    />
-        <result property="room"    column="room"    />
-        <result property="floorId"    column="floor_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="layWidth"    column="lay_width"    />
-        <result property="layHeight"    column="lay_height"    />
-        <result property="layOrder"    column="lay_order"    />
-        <result property="isSubject"    column="is_subject"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="room" column="room"/>
+        <result property="floorId" column="floor_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="layWidth" column="lay_width"/>
+        <result property="layHeight" column="lay_height"/>
+        <result property="layOrder" column="lay_order"/>
+        <result property="isSubject" column="is_subject"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabSubjectLayoutVo" id="subjectAndLayout">
-        <result property="id"    column="id"    />
-        <result property="room"    column="room"    />
-        <result property="floorId"    column="floor_id"    />
-        <result property="layWidth"    column="lay_width"    />
-        <result property="layHeight"    column="lay_height"    />
-        <result property="layOrder"    column="lay_order"    />
-        <result property="isSubject"    column="is_subject"    />
+        <result property="id" column="id"/>
+        <result property="room" column="room"/>
+        <result property="floorId" column="floor_id"/>
+        <result property="layWidth" column="lay_width"/>
+        <result property="layHeight" column="lay_height"/>
+        <result property="layOrder" column="lay_order"/>
+        <result property="isSubject" column="is_subject"/>
 
         <association property="subjectDetail" column="id" javaType="com.zd.laboratory.domain.vo.LabSubjectDetailVO"
-                    select="com.zd.laboratory.mapper.LabSubjectMapper.queryByLayoutId"/>
+                     select="com.zd.laboratory.mapper.LabSubjectMapper.queryByLayoutId"/>
     </resultMap>
 
     <sql id="selectLabSubjectLayoutVo">
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ${params.dataScope}
         </where>
     </select>
-<!--   查询未使用布局 -->
+    <!--   查询未使用布局 -->
     <select id="selectLabSubjectLayoutNoUseList" parameterType="com.zd.laboratory.domain.LabSubjectLayout" resultMap="LabSubjectLayoutResult">
         <include refid="selectLabSubjectLayoutVo"/>
         <where>
@@ -78,8 +78,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="layOrder != null "> and lay_order = #{layOrder}</if>
             <if test="isSubject != null "> and is_subject = #{isSubject}</if>
         </where>
-
-
     </select>
 
 
@@ -91,53 +89,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabSubjectLayout" parameterType="com.zd.laboratory.domain.LabSubjectLayout" useGeneratedKeys="true" keyProperty="id">
         insert into lab_subject_layout
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="subjectId != null">subject_id,</if>
-
-    <if test="room != null">room,</if>
-
-    <if test="floorId != null">floor_id,</if>
-
-    <if test="deptName != null">dept_name,</if>
-
-    <if test="deptId != null">dept_id,</if>
-
-    <if test="createTime != null">create_time,</if>
-
-    <if test="userId != null">user_id,</if>
-
-    <if test="createBy != null">create_by,</if>
-
-    <if test="updateTime != null">update_time,</if>
-
-    <if test="updateBy != null">update_by,</if>
-
-    <if test="layWidth != null">lay_width,</if>
-
-    <if test="layHeight != null">lay_height,</if>
-
-    <if test="layOrder != null">lay_order,</if>
-
-    <if test="isSubject != null">is_subject,</if>
-
-    <if test="remark != null">remark,</if>
-
+            <if test="subjectId != null">subject_id,</if>
+            <if test="room != null">room,</if>
+            <if test="floorId != null">floor_id,</if>
+            <if test="deptName != null">dept_name,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="layWidth != null">lay_width,</if>
+            <if test="layHeight != null">lay_height,</if>
+            <if test="layOrder != null">lay_order,</if>
+            <if test="isSubject != null">is_subject,</if>
+            <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="subjectId != null">#{subjectId},</if>
-    <if test="room != null">#{room},</if>
-    <if test="floorId != null">#{floorId},</if>
-    <if test="deptName != null">#{deptName},</if>
-    <if test="deptId != null">#{deptId},</if>
-    <if test="createTime != null">#{createTime},</if>
-    <if test="userId != null">#{userId},</if>
-    <if test="createBy != null">#{createBy},</if>
-    <if test="updateTime != null">#{updateTime},</if>
-    <if test="updateBy != null">#{updateBy},</if>
-    <if test="layWidth != null">#{layWidth},</if>
-    <if test="layHeight != null">#{layHeight},</if>
-    <if test="layOrder != null">#{layOrder},</if>
-    <if test="isSubject != null">#{isSubject},</if>
-    <if test="remark != null">#{remark},</if>
+            <if test="subjectId != null">#{subjectId},</if>
+            <if test="room != null">#{room},</if>
+            <if test="floorId != null">#{floorId},</if>
+            <if test="deptName != null">#{deptName},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="layWidth != null">#{layWidth},</if>
+            <if test="layHeight != null">#{layHeight},</if>
+            <if test="layOrder != null">#{layOrder},</if>
+            <if test="isSubject != null">#{isSubject},</if>
+            <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
 
@@ -175,16 +158,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="selectAddrrByLayoutIds"  resultType="com.zd.laboratory.api.entity.SubAddrr">
-        <!--select t.id,  t.room, t.floor_id,-->
-               <!--lb.name as floor_name ,-->
-               <!--sd.dept_name as build_name-->
-        <!--from lab_subject_layout as t-->
-        <!--left join lab_building lb on lb.id = t.floor_id-->
-        <!--left join sys_dept sd on sd.dept_id = lb.dept_id-->
-        <!--where t.id in-->
-        <!--<foreach item="id" collection="array" open="(" separator="," close=")">-->
-            <!--#{id}-->
-        <!--</foreach>-->
         SELECT t.id,  t.room_num room, t.`floor_id`,
         (SELECT bf.`name` FROM lab_build_floor bf WHERE bf.id = t.`floor_id`) AS floor_name ,
         (SELECT bf.`name` FROM lab_build_floor bf WHERE bf.type = 2 AND bf.id = t.`build_id` ) AS build_name

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

@@ -5,113 +5,111 @@
 <mapper namespace="com.zd.laboratory.mapper.LabSubjectMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabSubject" id="LabSubjectResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="floorId"    column="floor_id"    />
-        <result property="room"    column="room"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="adminId"    column="admin_id"    />
-        <result property="isDel"    column="is_del"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="remark"    column="remark"    />
-        <result property="buildId"    column="build_id"    />
-        <result property="layoutId"    column="layout_id"    />
-        <result property="checkOut"    column="check_out"    />
-        <result property="checkIn"    column="check_in"    />
-        <result property="safeUserId"    column="safe_user_id"    />
-        <result property="moldId"    column="mold_id"    />
-        <result property="moldName"    column="moldName"    />
-
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="floorId" column="floor_id"/>
+        <result property="room" column="room"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="adminId" column="admin_id"/>
+        <result property="isDel" column="is_del"/>
+        <result property="createTime" column="create_time"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="remark" column="remark"/>
+        <result property="buildId" column="build_id"/>
+        <result property="layoutId" column="layout_id"/>
+        <result property="checkOut" column="check_out"/>
+        <result property="checkIn" column="check_in"/>
+        <result property="safeUserId" column="safe_user_id"/>
+        <result property="moldId" column="mold_id"/>
+        <result property="moldName" column="moldName"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabSubjectVO" id="LabSubjectResultVO">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="floorId"    column="floor_id"    />
-        <result property="room"    column="room"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="adminId"    column="admin_id"    />
-        <result property="isDel"    column="is_del"    />
-        <result property="layoutId"    column="layout_id"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="remark"    column="remark"    />
-        <result property="buildName"    column="build_name"    />
-        <result property="subDept"    column="sub_dept"    />
-        <result property="buildId"    column="build_id"    />
-        <result property="dangerName"    column="danger_name"    />
-        <result property="adminName"    column="admin_name"    />
-        <result property="isApply"    column="is_apply"    />
-        <result property="checkOut"    column="check_out"    />
-        <result property="checkIn"    column="check_in"    />
-        <result property="recordContent"    column="record_content"    />
-        <result property="appId"    column="app_id"    />
-        <result property="safeUserId"    column="safe_user_id"    />
-        <result property="safeSigns"    column="safe_signs"    />
-        <result property="hazardCategory"    column="hazard_category"    />
-        <result property="riskMeasure"    column="risk_measure"    />
-        <result property="outfire"    column="outfire"    />
-        <result property="qrCode"    column="qr_code"    />
-        <result property="level"    column="level"    />
-        <result property="diyOrder"    column="diy_order"    />
-        <result property="levelName"    column="levelName"    />
-        <result property="fiedColor"    column="fiedColor"    />
-        <result property="typeId"    column="type_id"    />
-        <result property="typeName"    column="typeName"    />
-        <result property="moldId"    column="mold_id"    />
-        <result property="moldName"    column="moldName"    />
-        <result property="adminNameAndPhone"    column="adminNameAndPhone"    />
-        <result property="safeUserNameAdminPhone"    column="safeUserNameAdminPhone"    />
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="floorId" column="floor_id"/>
+        <result property="room" column="room"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="adminId" column="admin_id"/>
+        <result property="isDel" column="is_del"/>
+        <result property="layoutId" column="layout_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="remark" column="remark"/>
+        <result property="buildName" column="build_name"/>
+        <result property="subDept" column="sub_dept"/>
+        <result property="buildId" column="build_id"/>
+        <result property="dangerName" column="danger_name"/>
+        <result property="adminName" column="admin_name"/>
+        <result property="isApply" column="is_apply"/>
+        <result property="checkOut" column="check_out"/>
+        <result property="checkIn" column="check_in"/>
+        <result property="recordContent" column="record_content"/>
+        <result property="appId" column="app_id"/>
+        <result property="safeUserId" column="safe_user_id"/>
+        <result property="safeSigns" column="safe_signs"/>
+        <result property="hazardCategory" column="hazard_category"/>
+        <result property="riskMeasure" column="risk_measure"/>
+        <result property="outfire" column="outfire"/>
+        <result property="qrCode" column="qr_code"/>
+        <result property="level" column="level"/>
+        <result property="diyOrder" column="diy_order"/>
+        <result property="levelName" column="levelName"/>
+        <result property="fiedColor" column="fiedColor"/>
+        <result property="typeId" column="type_id"/>
+        <result property="typeName" column="typeName"/>
+        <result property="moldId" column="mold_id"/>
+        <result property="moldName" column="moldName"/>
+        <result property="adminNameAndPhone" column="adminNameAndPhone"/>
+        <result property="safeUserNameAdminPhone" column="safeUserNameAdminPhone"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabSubjectDetailVO" id="subjectAndInfoResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="floorId"    column="floor_id"    />
-        <result property="room"    column="room"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="adminId"    column="admin_id"    />
-        <result property="isDel"    column="is_del"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="userId"    column="user_id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="remark"    column="remark"    />
-        <result property="buildId"    column="build_id"    />
-        <result property="layoutId"    column="layout_id"    />
-        <result property="checkOut"    column="check_out"    />
-        <result property="adminName"    column="admin_name"    />
-        <result property="adminPhone"    column="adminPhone"    />
-
-        <result property="safeUserId"    column="safe_user_id"    />
-        <result property="safeSigns"    column="safe_signs"    />
-        <result property="hazardCategory"    column="hazard_category"    />
-        <result property="riskMeasure"    column="risk_measure"    />
-        <result property="outfire"    column="outfire"    />
-        <result property="qrCode"    column="qr_code"    />
-        <result property="level"    column="level"    />
-        <result property="levelName"    column="levelName"    />
-        <result property="typeId"    column="type_id"    />
-        <result property="typeName"    column="typeName"    />
-        <result property="moldId"    column="mold_id"    />
-        <result property="moldName"    column="moldName"    />
-
-        <result property="skipped"    column="skipped"    />
-        <result property="checkCount"    column="check_count"    />
-        <result property="signTime"    column="sign_time"    />
-
-        <collection property="hazardSubjectRelations" column="id" ofType="com.zd.laboratory.domain.LabHazardSubjectRelation"
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="floorId" column="floor_id"/>
+        <result property="room" column="room"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="adminId" column="admin_id"/>
+        <result property="isDel" column="is_del"/>
+        <result property="createTime" column="create_time"/>
+        <result property="userId" column="user_id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="remark" column="remark"/>
+        <result property="buildId" column="build_id"/>
+        <result property="layoutId" column="layout_id"/>
+        <result property="checkOut" column="check_out"/>
+        <result property="adminName" column="admin_name"/>
+        <result property="adminPhone" column="adminPhone"/>
+        <result property="safeUserId" column="safe_user_id"/>
+        <result property="safeSigns" column="safe_signs"/>
+        <result property="hazardCategory" column="hazard_category"/>
+        <result property="riskMeasure" column="risk_measure"/>
+        <result property="outfire" column="outfire"/>
+        <result property="qrCode" column="qr_code"/>
+        <result property="level" column="level"/>
+        <result property="levelName" column="levelName"/>
+        <result property="typeId" column="type_id"/>
+        <result property="typeName" column="typeName"/>
+        <result property="moldId" column="mold_id"/>
+        <result property="moldName" column="moldName"/>
+        <result property="skipped" column="skipped"/>
+        <result property="checkCount" column="check_count"/>
+        <result property="signTime" column="sign_time"/>
+
+        <collection property="hazardSubjectRelations" column="id"
+                    ofType="com.zd.laboratory.domain.LabHazardSubjectRelation"
                     select="com.zd.laboratory.mapper.LabHazardSubjectRelationMapper.queryBySubjectId"/>
 
         <collection property="hardwares" column="id" ofType="com.zd.laboratory.domain.LabHardware"
@@ -754,27 +752,6 @@
 
     <!--   根据实验室IDs 查询危险等级  -->
     <select id="querySubClassesByIds" resultType="com.zd.laboratory.api.vo.LabSubClassVO">
-        <!--SELECT-->
-        <!--b.*,-->
-        <!--lsct.type_name,-->
-        <!--lsct.`id` danger_level-->
-        <!--FROM-->
-        <!--(-->
-        <!--SELECT-->
-        <!--a.subject_id,-->
-        <!--min( classtype_id ) AS classtype_id-->
-        <!--FROM-->
-        <!--`lab_hazard_subject_relation` a-->
-        <!--LEFT JOIN lab_safe_classified lsc ON lsc.hazard_id = a.hazard_id-->
-        <!--WHERE-->
-        <!--a.subject_id IN-->
-        <!--<foreach item="id" collection="array" open="(" separator="," close=")">-->
-            <!--#{id}-->
-        <!--</foreach>-->
-        <!--GROUP BY-->
-        <!--a.subject_id-->
-        <!--) b-->
-        <!--LEFT JOIN lab_safe_classtype lsct ON lsct.id = b.classtype_id-->
         SELECT
         a.id subject_id,
         (select sc.id from lab_safe_classtype sc where sc.`id` = a.`type_id`) classtypeId,

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

@@ -5,10 +5,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabSubjectSecurityconfigureMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabSubjectSecurityconfigure" id="LabSubjectSecurityconfigureResult">
-        <result property="id"    column="id"    />
-        <result property="subjectId"    column="subject_id"    />
-        <result property="groupconfigureId"    column="groupconfigure_id"    />
-        <result property="remark"    column="remark"    />
+        <result property="id" column="id"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="groupconfigureId" column="groupconfigure_id"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectLabSubjectSecurityconfigureVo">
@@ -33,18 +33,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabSubjectSecurityconfigure" parameterType="com.zd.laboratory.domain.LabSubjectSecurityconfigure">
         insert into lab_subject_securityconfigure
         <trim prefix="(" suffix=")" suffixOverrides=",">
-
-    <if test="subjectId != null">subject_id,</if>
-
-    <if test="groupconfigureId != null">groupconfigure_id,</if>
-
-    <if test="remark != null">remark,</if>
-
+            <if test="subjectId != null">subject_id,</if>
+            <if test="groupconfigureId != null">groupconfigure_id,</if>
+            <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="subjectId != null">#{subjectId},</if>
-    <if test="groupconfigureId != null">#{groupconfigureId},</if>
-    <if test="remark != null">#{remark},</if>
+            <if test="subjectId != null">#{subjectId},</if>
+            <if test="groupconfigureId != null">#{groupconfigureId},</if>
+            <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
 

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabValueSegmentSiteMapper.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.laboratory.mapper.LabValueSegmentSiteMapper">
-    
+
     <resultMap type="com.zd.laboratory.domain.LabValueSegmentSite" id="LabValueSegmentSiteResult">
-        <result property="id"    column="id"    />
-        <result property="valueSegmentStat"    column="value_segment_stat"    />
-        <result property="valueSegmentValue"    column="value_segment_value"    />
-        <result property="dealWay"    column="deal_way"    />
-        <result property="dealWayDay"    column="deal_way_day"    />
-        <result property="remake"    column="remake"    />
+        <result property="id" column="id"/>
+        <result property="valueSegmentStat" column="value_segment_stat"/>
+        <result property="valueSegmentValue" column="value_segment_value"/>
+        <result property="dealWay" column="deal_way"/>
+        <result property="dealWayDay" column="deal_way_day"/>
+        <result property="remake" column="remake"/>
     </resultMap>
 
     <sql id="selectLabValueSegmentSiteVo">
@@ -38,23 +38,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabValueSegmentSite" parameterType="com.zd.laboratory.domain.LabValueSegmentSite">
         insert into lab_value_segment_site
         <trim prefix="(" suffix=")" suffixOverrides=",">
-
-    <if test="valueSegmentStat != null">value_segment_stat,</if>
-
-    <if test="valueSegmentValue != null">value_segment_value,</if>
-
-    <if test="dealWay != null">deal_way,</if>
-    <if test="dealWayDay != null">deal_way_day</if>
-
-    <if test="remake != null">remake,</if>
-
+            <if test="valueSegmentStat != null">value_segment_stat,</if>
+            <if test="valueSegmentValue != null">value_segment_value,</if>
+            <if test="dealWay != null">deal_way,</if>
+            <if test="dealWayDay != null">deal_way_day</if>
+            <if test="remake != null">remake,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="valueSegmentStat != null">#{valueSegmentStat},</if>
-    <if test="valueSegmentValue != null">#{valueSegmentValue},</if>
-    <if test="dealWay != null">#{dealWay},</if>
-    <if test="dealWayDay != null">#{dealWayDay}</if>
-    <if test="remake != null">#{remake},</if>
+            <if test="valueSegmentStat != null">#{valueSegmentStat},</if>
+            <if test="valueSegmentValue != null">#{valueSegmentValue},</if>
+            <if test="dealWay != null">#{dealWay},</if>
+            <if test="dealWayDay != null">#{dealWayDay}</if>
+            <if test="remake != null">#{remake},</if>
          </trim>
     </insert>
 

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

@@ -3,35 +3,35 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zd.laboratory.mapper.LabViolationHistoryRecordMapper">
-    
+
     <resultMap type="com.zd.laboratory.domain.LabViolationHistoryRecord" id="LabViolationHistoryRecordResult">
-        <result property="id"    column="id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="reason"    column="reason"    />
-        <result property="laboratorys"    column="laboratorys"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="deductionValue"    column="deduction_value"    />
-        <result property="creditScore"    column="credit_score"    />
-        <result property="userName"    column="user_name"    />
-        <result property="status"    column="status"    />
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="reason" column="reason"/>
+        <result property="laboratorys" column="laboratorys"/>
+        <result property="createTime" column="create_time"/>
+        <result property="deductionValue" column="deduction_value"/>
+        <result property="creditScore" column="credit_score"/>
+        <result property="userName" column="user_name"/>
+        <result property="status" column="status"/>
 
-        <result property="treatmentMethod"    column="treatment_method"    />
-        <result property="learnStatus"    column="learn_status"    />
-        <result property="testStatus"    column="test_status"    />
-        <result property="practiceStatus"    column="practice_status"    />
-        <result property="overStatus"    column="over_status"    />
-        <result property="handleDay"    column="handle_day"    />
-        <result property="numberTopics"    column="number_topics"    />
-        <result property="numberAccuracy"    column="number_accuracy"    />
-        <result property="learnTime"    column="learn_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
-        <result property="laboratoryId"    column="laboratory_id"    />
-        <result property="deductionVal"    column="deduction_val"    />
-        <result property="userId"    column="user_id"    />
+        <result property="treatmentMethod" column="treatment_method"/>
+        <result property="learnStatus" column="learn_status"/>
+        <result property="testStatus" column="test_status"/>
+        <result property="practiceStatus" column="practice_status"/>
+        <result property="overStatus" column="over_status"/>
+        <result property="handleDay" column="handle_day"/>
+        <result property="numberTopics" column="number_topics"/>
+        <result property="numberAccuracy" column="number_accuracy"/>
+        <result property="learnTime" column="learn_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="laboratoryId" column="laboratory_id"/>
+        <result property="deductionVal" column="deduction_val"/>
+        <result property="userId" column="user_id"/>
 
     </resultMap>
 
@@ -62,30 +62,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabViolationHistoryRecord" parameterType="com.zd.laboratory.domain.LabViolationHistoryRecord" useGeneratedKeys="true" keyProperty="id">
         insert into lab_violation_history_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="userId != null">user_id,</if>
-
-    <if test="reason != null">reason,</if>
-
-    <if test="laboratorys != null">laboratorys,</if>
-
-    <if test="createTime != null">create_time,</if>
-
-    <if test="deductionValue != null">deduction_value,</if>
-
-    <if test="creditScore != null">credit_score,</if>
-
-    <if test="userName != null ">user_name,</if>
-    <if test="status != null ">status</if>
+            <if test="userId != null">user_id,</if>
+            <if test="reason != null">reason,</if>
+            <if test="laboratorys != null">laboratorys,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="deductionValue != null">deduction_value,</if>
+            <if test="creditScore != null">credit_score,</if>
+            <if test="userName != null ">user_name,</if>
+            <if test="status != null ">status</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-    <if test="userId != null">#{userId},</if>
-    <if test="reason != null">#{reason},</if>
-    <if test="laboratorys != null">#{laboratorys},</if>
-    <if test="createTime != null">#{createTime},</if>
-    <if test="deductionValue != null">#{deductionValue},</if>
-    <if test="creditScore != null">#{creditScore},</if>
-    <if test="userName != null">#{userName},</if>
-    <if test="status != null">#{status}</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="reason != null">#{reason},</if>
+            <if test="laboratorys != null">#{laboratorys},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="deductionValue != null">#{deductionValue},</if>
+            <if test="creditScore != null">#{creditScore},</if>
+            <if test="userName != null">#{userName},</if>
+            <if test="status != null">#{status}</if>
          </trim>
     </insert>
 

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

@@ -5,54 +5,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabViolationMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabViolation" id="LabViolationResult">
-        <result property="id"    column="id"    />
-        <result property="joinUserId"    column="join_user_id"    />
-        <result property="violationType"    column="violation_type"    />
-        <result property="violationContent"    column="violation_content"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="userId"    column="user_id"    />
-        <result property="remark"    column="remark"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="penaltyType"    column="penalty_type"    />
-        <result property="isHandle"    column="is_handle"    />
-        <result property="subjectId"    column="subject_id"    />
-        <result property="stuNo"    column="stu_no"    />
-        <result property="belongCollege"    column="belong_college"    />
-        <result property="status"    column="status"    />
-        <result property="violationNum"    column="violation_num"    />
-        <result property="negativeListNum"    column="negative_list_num"    />
-        <result property="blackListNum"    column="black_list_num"    />
-        <result property="isNegative"    column="is_negative"    />
-        <result property="isBlackList"    column="is_black_list"    />
-        <result property="creact_id"    column="creact_id"    />
+        <result property="id" column="id"/>
+        <result property="joinUserId" column="join_user_id"/>
+        <result property="violationType" column="violation_type"/>
+        <result property="violationContent" column="violation_content"/>
+        <result property="createTime" column="create_time"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="userId" column="user_id"/>
+        <result property="remark" column="remark"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="penaltyType" column="penalty_type"/>
+        <result property="isHandle" column="is_handle"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="stuNo" column="stu_no"/>
+        <result property="belongCollege" column="belong_college"/>
+        <result property="status" column="status"/>
+        <result property="violationNum" column="violation_num"/>
+        <result property="negativeListNum" column="negative_list_num"/>
+        <result property="blackListNum" column="black_list_num"/>
+        <result property="isNegative" column="is_negative"/>
+        <result property="isBlackList" column="is_black_list"/>
+        <result property="creact_id" column="creact_id"/>
     </resultMap>
 
     <resultMap type="com.zd.laboratory.domain.vo.LabViolationVO" id="LabViolationVOResult">
-        <result property="subjectName"    column="subject_name"    />
-        <result property="userName"    column="user_name"    />
-        <result property="violCount"    column="viol_count"    />
-        <result property="untreatedCount"    column="untreated_count"    />
-        <result property="lastViolTime"    column="last_viol_time"    />
-        <result property="lastHandleTime"    column="last_handle_time"    />
-       <!-- <result property="stuNo"    column="stu_no"    />-->
-        <result property="belongCollege"    column="belong_college"    />
-        <result property="status"    column="status"    />
-        <result property="violationNum"    column="violation_num"    />
-        <result property="negativeListNum"    column="negative_list_num"    />
-        <result property="blackListNum"    column="black_list_num"    />
-        <result property="violationNum"    column="violation_num"    />
-        <result property="creditScore"    column="credit_score"    />
-        <result property="isNegative"    column="is_negative"    />
-        <result property="isBlackList"    column="is_black_list"    />
-        <result property="avatar"    column="avatar"/>
-        <result property="totalPoints"    column="total_points"/>
-        <result property="bonusPoints"    column="bonus_points"/>
-        <result property="creact_id"    column="creact_id"    />
-        <result property="negativeId"    column="negative_id"    />
+        <result property="subjectName" column="subject_name"/>
+        <result property="userName" column="user_name"/>
+        <result property="violCount" column="viol_count"/>
+        <result property="untreatedCount" column="untreated_count"/>
+        <result property="lastViolTime" column="last_viol_time"/>
+        <result property="lastHandleTime" column="last_handle_time"/>
+        <!-- <result property="stuNo"    column="stu_no"/>-->
+        <result property="belongCollege" column="belong_college"/>
+        <result property="status" column="status"/>
+        <result property="violationNum" column="violation_num"/>
+        <result property="negativeListNum" column="negative_list_num"/>
+        <result property="blackListNum" column="black_list_num"/>
+        <result property="violationNum" column="violation_num"/>
+        <result property="creditScore" column="credit_score"/>
+        <result property="isNegative" column="is_negative"/>
+        <result property="isBlackList" column="is_black_list"/>
+        <result property="avatar" column="avatar"/>
+        <result property="totalPoints" column="total_points"/>
+        <result property="bonusPoints" column="bonus_points"/>
+        <result property="creact_id" column="creact_id"/>
+        <result property="negativeId" column="negative_id"/>
 
     </resultMap>
 
@@ -149,7 +149,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ${params.dataScope}
         </where>
         order by t.id DESC
-
         <if test="size != null "> limit 0 ,#{size} </if>
     </select>
 
@@ -270,13 +269,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="mylist" parameterType="com.zd.laboratory.domain.vo.LabViolationVO" resultMap="LabViolationVOResult">
         <include refid="selectListVo"/>
         <where>
-            <if test="joinUserId != null "> and t.join_user_id = #{joinUserId}</if>
-            <if test="violationType != null "> and t.violation_type = #{violationType}</if>
-            <if test="violationContent != null  and violationContent != ''"> and t.violation_content = #{violationContent}</if>
-            <if test="deptId != null "> and t.dept_id = #{deptId}</if>
-            <if test="deptName != null  and deptName != ''"> and t.dept_name like concat('%', #{deptName}, '%')</if>
-            <if test="userId != null "> and t.user_id = #{userId}</if>
-            <if test="isHandle != null "> and t.is_handle = #{isHandle}</if>
+            <if test="joinUserId != null ">and t.join_user_id = #{joinUserId}</if>
+            <if test="violationType != null ">and t.violation_type = #{violationType}</if>
+            <if test="violationContent != null  and violationContent != ''">and t.violation_content = #{violationContent}</if>
+            <if test="deptId != null ">and t.dept_id = #{deptId}</if>
+            <if test="deptName != null  and deptName != ''">and t.dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="userId != null ">and t.user_id = #{userId}</if>
+            <if test="isHandle != null ">and t.is_handle = #{isHandle}</if>
             <if test="beginTime != null ">
                 and str_to_date(t.create_time,'%Y-%m-%d') >= #{beginTime}
             </if>
@@ -288,9 +287,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="statistics" resultType="java.util.Map">
-
-
-
         SELECT dd.id AS type, dd.violation_name AS content, IFNULL( lv.num, 0) AS count
         FROM (
             SELECT ss.`id`,ss.violation_name FROM lab_violation_score_site ss
@@ -302,9 +298,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             FROM lab_negativelist_history v INNER JOIN lab_subject t ON v.`laboratory_id` = t.`id`
             INNER JOIN lab_violation_score_site vs ON v.`reason` = vs.`violation_name`
             where DATE_FORMAT(v.`create_time`,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')
-
             UNION ALL
-
             SELECT '其他' violation_type , v.`id` num,t.`build_id` dept_id
             FROM lab_negativelist_history v INNER JOIN lab_subject t ON v.`laboratory_id` = t.`id`
             WHERE v.reason NOT IN(
@@ -319,43 +313,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY t.violation_type
         ) lv ON dd.violation_name = lv.violation_type
         ORDER BY COUNT DESC
-
-
-
-        <!--SELECT dd.dict_value AS type, dd.dict_label AS content, IFNULL( lv.num, 0) AS count-->
-        <!--FROM sys_dict_data dd LEFT JOIN (-->
-        <!--SELECT t.violation_type , COUNT(1) num FROM (-->
-        <!--SELECT v.violation_type , v.`id` num,t.`build_id` dept_id-->
-        <!--FROM lab_violation v INNER JOIN lab_subject t ON v.`subject_id` = t.`id`-->
-        <!--<where>-->
-            <!--DATE_FORMAT(v.`create_time`,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')-->
-        <!--</where>-->
-        <!--) t-->
-        <!--<where>-->
-        <!--1=1-->
-        <!--&lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
-        <!--${params.dataScope}-->
-        <!--</where>-->
-        <!--GROUP BY t.violation_type-->
-        <!--) lv ON dd.dict_value = lv.violation_type-->
-        <!--WHERE dd.dict_type = "lab_violation_rules"-->
-
-        <!--ORDER BY count DESC-->
-
-        <!--select dd.dict_value as type, dd.dict_label as content, ifnull( lv.num, 0) as count-->
-        <!--from sys_dict_data dd left join (-->
-        <!--select violation_type , count(1) num-->
-        <!--from lab_violation-->
-        <!--<where>-->
-            <!--<if test="deptId != null and deptId != ''"> and dept_id = #{deptId}</if>-->
-            <!--<if test="buildId != null ">-->
-                <!--AND (subject_id IN ( SELECT id FROM lab_subject WHERE build_id = #{buildId} ))-->
-            <!--</if>-->
-        <!--</where>-->
-        <!--group by violation_type) lv on dd.dict_value = lv.violation_type-->
-        <!--where dd.dict_type = "lab_violation_rules"-->
-
-        <!--order by count desc-->
     </select>
 
     <select id="columnar" resultType="com.zd.laboratory.domain.vo.LabViolationColumnarVO">
@@ -399,58 +356,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTimeStr != null and endTimeStr != ''"><!-- 结束时间检索 -->
                 AND date_format(v.create_time,'%y%m%d') &lt;= date_format(#{endTimeStr},'%y%m%d')
             </if>
-            <!--<if test="(beginTimeStr == null or beginTimeStr == '') and (endTimeStr == null or endTimeStr == '')">-->
-            <!--AND DATE_FORMAT(v.`create_time`,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')-->
-            <!--</if>-->
-            <!-- 数据范围过滤 -->
             ${params.dataScope}
         </where>
         )x1 ON dd.violation_name = x1.violation_type INNER JOIN sys_dept dt ON x1.deptGroup = dt.dept_id
         GROUP BY x1.deptGroup,x1.violation_type
         )xx2 ON xx1.currencyId = xx2.currencyId ORDER BY num DESC
-
-
-        <!--select xx1.currencyId,xx1.currencyName,xx2.type,xx2.content,IFNULL(xx2.num,0) num from (-->
-        <!--SELECT dt.`dept_id` currencyId,dt.`dept_name` currencyName-->
-        <!--FROM  sys_dept d JOIN sys_dept dt ON d.dept_id = dt.parent_id-->
-        <!--WHERE d.parent_id = 0-->
-        <!--)xx1 left join (-->
-            <!--SELECT dd.dict_value AS TYPE, dd.dict_label AS content,IFNULL(COUNT(1),0) num,x1.deptGroup currencyId,dt.`dept_name` currencyName-->
-            <!--FROM sys_dict_data dd LEFT JOIN-->
-            <!--(-->
-            <!--SELECT v.id,v.`violation_type`,s.build_id dept_id,t.parent_id,t.`ancestors`,-->
-            <!--(SELECT dt.`dept_id`-->
-            <!--FROM  sys_dept d JOIN sys_dept dt ON d.dept_id = dt.parent_id-->
-            <!--WHERE d.parent_id = 0 AND FIND_IN_SET(dt.dept_id,t.`ancestors`)) deptGroup-->
-            <!--FROM sys_dept t INNER JOIN lab_subject s ON t.`dept_id` = s.`build_id` INNER JOIN lab_violation v ON s.`id` = v.`subject_id`-->
-            <!--<where>-->
-                <!--<if test="schoolDeptId != null ">-->
-                    <!--AND (s.build_id = #{schoolDeptId} OR s.build_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{schoolDeptId},-->
-                    <!--ancestors) ))-->
-                <!--</if>-->
-                <!--<if test="violationType != null "> and v.`violation_type` = #{violationType}</if>-->
-                <!--<if test="beginTimeStr != null and beginTimeStr != ''">&lt;!&ndash; 开始时间检索 &ndash;&gt;-->
-                    <!--AND date_format(v.create_time,'%y%m%d') &gt;= date_format(#{beginTimeStr},'%y%m%d')-->
-                <!--</if>-->
-                <!--<if test="endTimeStr != null and endTimeStr != ''">&lt;!&ndash; 结束时间检索 &ndash;&gt;-->
-                    <!--AND date_format(v.create_time,'%y%m%d') &lt;= date_format(#{endTimeStr},'%y%m%d')-->
-                <!--</if>-->
-                <!--&lt;!&ndash;<if test="(beginTimeStr == null or beginTimeStr == '') and (endTimeStr == null or endTimeStr == '')">&ndash;&gt;-->
-                    <!--&lt;!&ndash;AND DATE_FORMAT(v.`create_time`,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')&ndash;&gt;-->
-                <!--&lt;!&ndash;</if>&ndash;&gt;-->
-                <!--&lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
-                <!--${params.dataScope}-->
-            <!--</where>-->
-            <!--)x1 ON dd.dict_value = x1.violation_type INNER JOIN sys_dept dt ON x1.deptGroup = dt.dept_id-->
-            <!--WHERE dd.dict_type = "lab_violation_rules"-->
-            <!--GROUP BY x1.deptGroup,x1.violation_type-->
-        <!--)xx2 ON xx1.currencyId = xx2.currencyId ORDER BY num desc-->
     </select>
 
 
     <select id="columnarBySub" resultType="com.zd.laboratory.domain.vo.LabViolationColumnarVO">
-
-
         SELECT xs1.currencyId,xs1.currencyName,xs2.type,xs2.content,IFNULL(xs2.num,0) num FROM (
             SELECT x2.subjectId currencyId,IFNULL(COUNT(1),0) num,x2.subjectName currencyName FROM (
             SELECT v.id,v.`violation_type`,s.id subjectId,s.`name` subjectName
@@ -533,68 +447,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTimeStr != null and endTimeStr != ''"><!-- 结束时间检索 -->
                 AND date_format(v.create_time,'%y%m%d') &lt;= date_format(#{endTimeStr},'%y%m%d')
             </if>
-            <!--<if test="(beginTimeStr == null or beginTimeStr == '') and (endTimeStr == null or endTimeStr == '')">-->
-            <!--AND DATE_FORMAT(v.`create_time`,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')-->
-            <!--</if>-->
-            <!-- 数据范围过滤 -->
             ${params.dataScope}
         </where>
         )x1 ON dd.violation_name = x1.violation_type
         GROUP BY x1.subjectId,x1.violation_type
         )xx2 ON xx1.subjectId = xx2.subjectId
-
         )xs2 ON xs1.currencyId = xs2.currencyId ORDER BY num DESC,xs1.currencyId DESC
-
-
-
-        <!--SELECT xs1.currencyId,xs1.currencyName,xs2.type,xs2.content,IFNULL(xs2.num,0) num FROM (-->
-            <!--SELECT s.id currencyId,s.`name` currencyName-->
-            <!--FROM sys_dept t INNER JOIN lab_subject s ON t.`dept_id` = s.`build_id`-->
-            <!--<where>-->
-                <!--1=1-->
-                <!--&lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
-                <!--${params.dataScope}-->
-            <!--</where>-->
-            <!--)xs1 LEFT JOIN (-->
-
-            <!--select xx2.type,xx2.content,xx2.num,xx2.subjectId currencyId,xx2.subjectName currencyName from (select x2.subjectId,IFNULL(COUNT(1),0) num from (-->
-            <!--SELECT v.id,v.`violation_type`,s.id subjectId,s.`name` subjectName-->
-            <!--FROM sys_dept t INNER JOIN lab_subject s ON t.`dept_id` = s.`build_id` INNER JOIN lab_violation v ON s.`id` = v.`subject_id`-->
-                <!--<where>-->
-                    <!--1=1-->
-                    <!--&lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
-                    <!--${params.dataScope}-->
-                <!--</where>-->
-                <!--)x2 GROUP BY x2.subjectId order by num desc LIMIT 10)xx1-->
-                <!--inner join (-->
-                <!--SELECT dd.dict_value AS TYPE, dd.dict_label AS content,IFNULL(COUNT(1),0) num,x1.subjectId subjectId,x1.`subjectName` subjectName-->
-                <!--FROM sys_dict_data dd INNER JOIN-->
-                <!--(-->
-                <!--SELECT v.id,v.`violation_type`,s.id subjectId,s.`name` subjectName-->
-                <!--FROM sys_dept t INNER JOIN lab_subject s ON t.`dept_id` = s.`build_id` INNER JOIN lab_violation v ON s.`id` = v.`subject_id`-->
-                <!--<where>-->
-                    <!--<if test="subjectId != null ">-->
-                        <!--AND s.`id` = #{subjectId}-->
-                    <!--</if>-->
-                    <!--<if test="violationType != null "> and v.`violation_type` = #{violationType}</if>-->
-                    <!--<if test="beginTimeStr != null and beginTimeStr != ''">&lt;!&ndash; 开始时间检索 &ndash;&gt;-->
-                        <!--AND date_format(v.create_time,'%y%m%d') &gt;= date_format(#{beginTimeStr},'%y%m%d')-->
-                    <!--</if>-->
-                    <!--<if test="endTimeStr != null and endTimeStr != ''">&lt;!&ndash; 结束时间检索 &ndash;&gt;-->
-                        <!--AND date_format(v.create_time,'%y%m%d') &lt;= date_format(#{endTimeStr},'%y%m%d')-->
-                    <!--</if>-->
-                    <!--&lt;!&ndash;<if test="(beginTimeStr == null or beginTimeStr == '') and (endTimeStr == null or endTimeStr == '')">&ndash;&gt;-->
-                        <!--&lt;!&ndash;AND DATE_FORMAT(v.`create_time`,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')&ndash;&gt;-->
-                    <!--&lt;!&ndash;</if>&ndash;&gt;-->
-                    <!--&lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
-                    <!--${params.dataScope}-->
-                <!--</where>-->
-            <!--)x1 ON dd.dict_value = x1.violation_type-->
-            <!--WHERE dd.dict_type = "lab_violation_rules"-->
-            <!--GROUP BY x1.subjectId,x1.violation_type-->
-            <!--)xx2 on xx1.subjectId = xx2.subjectId-->
-
-        <!--)xs2 ON xs1.currencyId = xs2.currencyId ORDER BY num DESC LIMIT 10-->
     </select>
 
 
@@ -604,7 +462,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT ss.`id`,ss.violation_name FROM lab_violation_score_site ss
         UNION ALL
         SELECT '-99' id,'其他' violation_name FROM DUAL
-
         ) dd INNER JOIN
         (
         SELECT v.id,v.`violation_type`,s.id subjectId,s.`name` subjectName,
@@ -633,45 +490,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTimeStr != null and endTimeStr != ''"><!-- 结束时间检索 -->
                 AND date_format(v.create_time,'%y%m%d') &lt;= date_format(#{endTimeStr},'%y%m%d')
             </if>
-            <!--<if test="(beginTimeStr == null or beginTimeStr == '') and (endTimeStr == null or endTimeStr == '')">-->
-                <!--AND DATE_FORMAT(v.`create_time`,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')-->
-            <!--</if>-->
-            <!-- 数据范围过滤 -->
             ${params.dataScope}
         </where>
         )x1 ON dd.violation_name = x1.violation_type
         GROUP BY x1.subjectId,x1.violation_type ORDER BY num DESC,x1.subjectId desc
-
-
-
-        <!--SELECT dd.dict_value AS TYPE, dd.dict_label AS content,IFNULL(COUNT(1),0) num,x1.subjectId subId,x1.`subjectName` subName,x1.classifiedName,x1.typeName-->
-        <!--FROM sys_dict_data dd INNER JOIN-->
-        <!--(-->
-        <!--SELECT v.id,v.`violation_type`,s.id subjectId,s.`name` subjectName,-->
-        <!--(SELECT sc.classified_name FROM lab_safe_classified sc WHERE sc.id = s.level) AS classifiedName,-->
-        <!--(SELECT sc.type_name FROM lab_safe_classtype sc WHERE sc.id = s.type_id) AS typeName-->
-        <!--FROM sys_dept t INNER JOIN lab_subject s ON t.`dept_id` = s.`build_id` INNER JOIN lab_violation v ON s.`id` = v.`subject_id`-->
-        <!--<where>-->
-            <!--<if test="subjectId != null ">-->
-                <!--AND s.`id` = #{subjectId}-->
-            <!--</if>-->
-            <!--<if test="violationType != null "> and v.`violation_type` = #{violationType}</if>-->
-            <!--<if test="beginTimeStr != null and beginTimeStr != ''">&lt;!&ndash; 开始时间检索 &ndash;&gt;-->
-                <!--AND date_format(v.create_time,'%y%m%d') &gt;= date_format(#{beginTimeStr},'%y%m%d')-->
-            <!--</if>-->
-            <!--<if test="endTimeStr != null and endTimeStr != ''">&lt;!&ndash; 结束时间检索 &ndash;&gt;-->
-                <!--AND date_format(v.create_time,'%y%m%d') &lt;= date_format(#{endTimeStr},'%y%m%d')-->
-            <!--</if>-->
-            <!--<if test="(beginTimeStr == null or beginTimeStr == '') and (endTimeStr == null or endTimeStr == '')">-->
-                <!--AND DATE_FORMAT(v.`create_time`,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')-->
-            <!--</if>-->
-            <!--&lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
-            <!--${params.dataScope}-->
-        <!--</where>-->
-        <!--)x1 ON dd.dict_value = x1.violation_type-->
-        <!--WHERE dd.dict_type = "lab_violation_rules"-->
-        <!--GROUP BY x1.subjectId,x1.violation_type ORDER BY num DESC-->
-
     </select>
 
     <select id="pageList" parameterType="com.zd.laboratory.domain.vo.LabViolationVO" resultMap="LabViolationVOResult">
@@ -714,7 +536,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 u.user_name like concat('%', #{searchValue}, '%')
                 )
             </if>
-
             <!-- 数据范围过滤 -->
             ${params.dataScope}
 
@@ -815,35 +636,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                            ON u.`user_id`=r.`join_user_id` WHERE u.user_id=#{userid} GROUP BY u.`user_id`
     </select>
 
-<update id="updateblackStatus">
-    update lab_violation SET
-                             is_negative='0',
-                             is_black_list='1',
-                             status='3',
-                             black_list_num=black_list_num+1,
-                             credit_score=#{deducPoints}
-    WHERE user_id=#{userId}
-</update>
-
-<update id="updateUser" >
-    update lab_violation SET is_negative='0',
-                             is_black_list='0',
-                             status='1',
-                             black_list_num=black_list_num-1
-                             ,credit_score=#{deducPoints}
-    WHERE user_id=#{userId}
-</update>
-
-
-<delete id="delByUserId">
-    delete from lab_violation where join_user_id=#{userId}
-</delete>
-
-<select id="checkDeptId" resultType="integer">
-            select *
-            FROM
-            sys_dept d where d.dept_id=#{deptId}
-</select>
+    <update id="updateblackStatus">
+        update lab_violation
+        SET is_negative='0',
+            is_black_list='1',
+            status='3',
+            black_list_num=black_list_num + 1,
+            credit_score=#{deducPoints}
+        WHERE user_id = #{userId}
+    </update>
 
+    <update id="updateUser">
+        update lab_violation
+        SET is_negative='0',
+            is_black_list='0',
+            status='1',
+            black_list_num=black_list_num - 1
+                ,
+            credit_score=#{deducPoints}
+        WHERE user_id = #{userId}
+    </update>
 
+
+    <delete id="delByUserId">
+        delete
+        from lab_violation
+        where join_user_id = #{userId}
+    </delete>
+
+    <select id="checkDeptId" resultType="integer">
+        select *
+        FROM sys_dept d
+        where d.dept_id = #{deptId}
+    </select>
 </mapper>

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

@@ -3,19 +3,19 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zd.laboratory.mapper.LabViolationRecordMapper">
-    
+
     <resultMap type="com.zd.laboratory.domain.LabViolationRecord" id="LabViolationRecordResult">
-        <result property="id"    column="id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="userName"    column="user_name"    />
-        <result property="stuNo"    column="stu_no"    />
-        <result property="belongCollege"    column="belong_college"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="status"    column="status"    />
-        <result property="violationNum"    column="violation_num"    />
-        <result property="negativeListNum"    column="negative_list_num"    />
-        <result property="blackListNum"    column="black_list_num"    />
-        <result property="creditScore"    column="credit_score"    />
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="stuNo" column="stu_no"/>
+        <result property="belongCollege" column="belong_college"/>
+        <result property="createTime" column="create_time"/>
+        <result property="status" column="status"/>
+        <result property="violationNum" column="violation_num"/>
+        <result property="negativeListNum" column="negative_list_num"/>
+        <result property="blackListNum" column="black_list_num"/>
+        <result property="creditScore" column="credit_score"/>
     </resultMap>
 
     <sql id="selectLabViolationRecordVo">

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

@@ -5,15 +5,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabViolationScoreSiteMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabViolationScoreSite" id="LabViolationScoreSiteResult">
-        <result property="id"    column="id"    />
-        <result property="wear"    column="wear"    />
-        <result property="leaves"    column="leaves"    />
-        <result property="laboratory"    column="laboratory"    />
-        <result property="safeAccess"    column="safe_access"    />
-        <result property="remake"    column="remake"    />
-        <result property="violationMeth"    column="violation_meth"    />
-        <result property="violationVal"    column="violation_val"    />
-        <result property="violationName"    column="violation_name"    />
+        <result property="id" column="id"/>
+        <result property="wear" column="wear"/>
+        <result property="leaves" column="leaves"/>
+        <result property="laboratory" column="laboratory"/>
+        <result property="safeAccess" column="safe_access"/>
+        <result property="remake" column="remake"/>
+        <result property="violationMeth" column="violation_meth"/>
+        <result property="violationVal" column="violation_val"/>
+        <result property="violationName" column="violation_name"/>
     </resultMap>
 
     <sql id="selectLabViolationScoreSiteVo">

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

@@ -3,12 +3,12 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zd.laboratory.mapper.LabViolationSiteMapper">
-    
+
     <resultMap type="com.zd.laboratory.domain.LabViolationSite" id="LabViolationSiteResult">
-        <result property="id"    column="id"    />
-        <result property="violationType"    column="violation_type"    />
-        <result property="violationVal"    column="violation_val"    />
-        <result property="remake"    column="remake"    />
+        <result property="id" column="id"/>
+        <result property="violationType" column="violation_type"/>
+        <result property="violationVal" column="violation_val"/>
+        <result property="remake" column="remake"/>
     </resultMap>
 
     <sql id="selectLabViolationSiteVo">

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

@@ -3,17 +3,17 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zd.laboratory.mapper.LabWarnPushMessageMapper">
-    
+
     <resultMap type="com.zd.laboratory.domain.LabWarnPushMessage" id="LabWarnPushMessageResult">
-        <result property="id"    column="id"    />
-        <result property="riskGroup"    column="risk_group"    />
-        <result property="context"    column="context"    />
-        <result property="pushType"    column="push_type"    />
-        <result property="warnId"    column="warn_id"    />
-        <result property="subId"    column="sub_id"    />
-        <result property="userAttributes"    column="user_attributes"    />
-        <result property="recipientId"    column="recipient_id"    />
-        <result property="createTime"    column="create_time"    />
+        <result property="id" column="id"/>
+        <result property="riskGroup" column="risk_group"/>
+        <result property="context" column="context"/>
+        <result property="pushType" column="push_type"/>
+        <result property="warnId" column="warn_id"/>
+        <result property="subId" column="sub_id"/>
+        <result property="userAttributes" column="user_attributes"/>
+        <result property="recipientId" column="recipient_id"/>
+        <result property="createTime" column="create_time"/>
     </resultMap>
 
     <sql id="selectLabWarnPushMessageVo">
@@ -24,14 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     <select id="selectLabWarnPushMessageList" parameterType="com.zd.laboratory.domain.LabWarnPushMessage" resultMap="LabWarnPushMessageResult">
         <include refid="selectLabWarnPushMessageVo"/>
-        <where>  
-            <if test="riskGroup != null  and riskGroup != ''"> and risk_group = #{riskGroup}</if>
-            <if test="context != null  and context != ''"> and context = #{context}</if>
-            <if test="pushType != null "> and push_type = #{pushType}</if>
-            <if test="warnId != null "> and warn_id = #{warnId}</if>
-            <if test="subId != null "> and sub_id = #{subId}</if>
-            <if test="userAttributes != null "> and user_attributes = #{userAttributes}</if>
-            <if test="recipientId != null "> and recipient_id = #{recipientId}</if>
+        <where>
+            <if test="riskGroup != null  and riskGroup != ''">and risk_group = #{riskGroup}</if>
+            <if test="context != null  and context != ''">and context = #{context}</if>
+            <if test="pushType != null ">and push_type = #{pushType}</if>
+            <if test="warnId != null ">and warn_id = #{warnId}</if>
+            <if test="subId != null ">and sub_id = #{subId}</if>
+            <if test="userAttributes != null ">and user_attributes = #{userAttributes}</if>
+            <if test="recipientId != null ">and recipient_id = #{recipientId}</if>
         </where>
     </select>
 

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

@@ -5,14 +5,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabWhiteJoinSublistMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabWhiteJoinSublist" id="LabWhiteJoinSublistResult">
-        <result property="id"    column="id"    />
-        <result property="whiteUserId"    column="white_user_id"    />
-        <result property="subjectId"    column="subject_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="whiteUserId" column="white_user_id"/>
+        <result property="subjectId" column="subject_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="selectLabWhiteJoinSublistVo">
@@ -45,8 +45,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT join lab_safe_classified cfd on s.level = cfd.`id`
         LEFT JOIN lab_building bg ON bg.id = s.floor_id
         <where>
-            <if test="whiteUserId != null "> and t.white_user_id = #{whiteUserId}</if>
-            <if test="subjectId != null "> and t.subject_id = #{subjectId}</if>
+            <if test="whiteUserId != null ">and t.white_user_id = #{whiteUserId}</if>
+            <if test="subjectId != null ">and t.subject_id = #{subjectId}</if>
         </where>
     </select>
 
@@ -58,29 +58,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertLabWhiteJoinSublist" parameterType="com.zd.laboratory.domain.LabWhiteJoinSublist" useGeneratedKeys="true" keyProperty="id">
         insert into lab_white_join_sublist
         <trim prefix="(" suffix=")" suffixOverrides=",">
-    <if test="whiteUserId != null">white_user_id,</if>
-
-    <if test="subjectId != null">subject_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="whiteUserId != null">white_user_id,</if>
+            <if test="subjectId != null">subject_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="whiteUserId != null">#{whiteUserId},</if>
-    <if test="subjectId != null">#{subjectId},</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="whiteUserId != null">#{whiteUserId},</if>
+            <if test="subjectId != null">#{subjectId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
 

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

@@ -5,17 +5,17 @@
 <mapper namespace="com.zd.laboratory.mapper.LabWhitelistMapper">
 
     <resultMap type="com.zd.laboratory.domain.LabWhitelist" id="LabWhitelistResult">
-        <result property="id"    column="id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="userName"    column="user_name"    />
-        <result property="userNumber"    column="user_number"    />
-        <result property="userTelephone"    column="user_telephone"    />
-        <result property="userType"    column="user_type"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="deptName"    column="dept_name"    />
-        <result property="createUser"    column="create_user"    />
-        <result property="createId"    column="create_id"    />
-        <result property="createTime"    column="create_time"    />
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="userNumber" column="user_number"/>
+        <result property="userTelephone" column="user_telephone"/>
+        <result property="userType" column="user_type"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="createUser" column="create_user"/>
+        <result property="createId" column="create_id"/>
+        <result property="createTime" column="create_time"/>
     </resultMap>
 
     <sql id="selectLabWhitelistVo">
@@ -31,15 +31,15 @@
     <select id="selectLabWhitelistList" parameterType="com.zd.laboratory.domain.LabWhitelist" resultMap="LabWhitelistResult">
         <include refid="selectLabWhitelistListVo"/>
         <where>
-            <if test="userId != null "> and t.user_id = #{userId}</if>
-            <if test="userName != null  and userName != ''"> and t.user_name like concat('%', #{userName}, '%')</if>
-            <if test="userNumber != null  and userNumber != ''"> and t.user_number = #{userNumber}</if>
-            <if test="userTelephone != null  and userTelephone != ''"> and t.user_telephone = #{userTelephone}</if>
-            <if test="userType != null  and userType != ''"> and t.user_type = #{userType}</if>
-            <if test="deptId != null "> and t.dept_id = #{deptId}</if>
-            <if test="deptName != null  and deptName != ''"> and t.dept_name like concat('%', #{deptName}, '%')</if>
-            <if test="createUser != null  and createUser != ''"> and t.create_user = #{createUser}</if>
-            <if test="createId != null "> and t.create_id = #{createId}</if>
+            <if test="userId != null ">and t.user_id = #{userId}</if>
+            <if test="userName != null  and userName != ''">and t.user_name like concat('%', #{userName}, '%')</if>
+            <if test="userNumber != null  and userNumber != ''">and t.user_number = #{userNumber}</if>
+            <if test="userTelephone != null  and userTelephone != ''">and t.user_telephone = #{userTelephone}</if>
+            <if test="userType != null  and userType != ''">and t.user_type = #{userType}</if>
+            <if test="deptId != null ">and t.dept_id = #{deptId}</if>
+            <if test="deptName != null  and deptName != ''">and t.dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="createUser != null  and createUser != ''">and t.create_user = #{createUser}</if>
+            <if test="createId != null ">and t.create_id = #{createId}</if>
             <if test="searchValue != null and searchValue != ''">
                 and
                 (t.user_name like concat('%', #{searchValue}, '%') or
@@ -56,8 +56,8 @@
         select distinct w.id, w.user_id, w.user_name, w.user_number, w.user_telephone, w.user_type, w.dept_id, w.dept_name, w.create_user,
         w.create_id, w.create_time from lab_whitelist w inner join lab_white_join_sublist st on w.`user_id` = st.white_user_id
         <where>
-            <if test="userId != null "> and w.user_id = #{userId}</if>
-            <if test="subId != null "> and st.subject_id = #{subId}</if>
+            <if test="userId != null ">and w.user_id = #{userId}</if>
+            <if test="subId != null ">and st.subject_id = #{subId}</if>
         </where>
     </select>
 

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

@@ -5,10 +5,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.zd.laboratory.mapper.LabWorkBenchMapper">
 
     <resultMap type="com.zd.laboratory.domain.vo.LabWorkBenchVO" id="LabWorkBenchResult">
-        <result property="happenRisk"    column="happen_risk"    />
-        <result property="abnormalEquipment"    column="abnormal_equipment"    />
-        <result property="riskDanger"    column="risk_danger"    />
-        <result property="securityAssessment"    column="security_assessment"    />
+        <result property="happenRisk" column="happen_risk"/>
+        <result property="abnormalEquipment" column="abnormal_equipment"/>
+        <result property="riskDanger" column="risk_danger"/>
+        <result property="securityAssessment" column="security_assessment"/>
     </resultMap>
 
     <select id="riskStatistics" resultMap="LabWorkBenchResult">
@@ -31,9 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="toDoWorkStatistics"  resultType="com.zd.laboratory.domain.vo.ToDoWork">
-
         select aa.to_do_id ,aa.user_id,aa.content,aa.subject_id,aa.create_time,aa.type as work_type,su.nick_name as user_name, ls.`name` as subject_name  from
-
             (
                 (
                     select  id as to_do_id, user_id , `describe` as content ,subject_id,create_time,1 as type from lab_photo_note
@@ -47,10 +45,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     ORDER BY id desc limit #{size}
 
                 )
-
                 UNION all
                 (
-
                     select a.id as to_do_id, a.join_user_id as user_id , s.configure_name as content ,a.subject_id, a.create_time,3 as type from lab_approval a
                                                                                                                                     left join lab_security_group s on s.id = a.security_group_id
                     where  a.record_content=2 and  subject_id in  (${ids})
@@ -60,12 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ) aa
                 left join sys_user su  on  su.user_id = aa.user_id
                 left join lab_subject ls  on  ls.id = aa.subject_id
-
-
         order by aa.create_time desc limit #{size}
-
-
-
     </select>
 
 

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

@@ -3,22 +3,22 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zd.laboratory.mapper.SensorConfigMapper">
-    
+
     <resultMap type="com.zd.laboratory.domain.SensorConfig" id="SensorConfigResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="fenchen"    column="fenchen"    />
-        <result property="wendu"    column="wendu"    />
-        <result property="shidu"    column="shidu"    />
-        <result property="co"    column="co"    />
-        <result property="daqiya"    column="daqiya"    />
-        <result property="o2"    column="o2"    />
-        <result property="yanwu"    column="yanwu"    />
-        <result property="jiawan"    column="jiawan"    />
-        <result property="voc"    column="voc"    />
-        <result property="so2"    column="so2"    />
-        <result property="no"    column="no"    />
-        <result property="createTime"    column="create_time"    />
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="fenchen" column="fenchen"/>
+        <result property="wendu" column="wendu"/>
+        <result property="shidu" column="shidu"/>
+        <result property="co" column="co"/>
+        <result property="daqiya" column="daqiya"/>
+        <result property="o2" column="o2"/>
+        <result property="yanwu" column="yanwu"/>
+        <result property="jiawan" column="jiawan"/>
+        <result property="voc" column="voc"/>
+        <result property="so2" column="so2"/>
+        <result property="no" column="no"/>
+        <result property="createTime" column="create_time"/>
     </resultMap>
 
     <sql id="selectSensorConfigVo">
@@ -29,19 +29,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     <select id="selectSensorConfigList" parameterType="com.zd.laboratory.domain.SensorConfig" resultMap="SensorConfigResult">
         <include refid="selectSensorConfigVo"/>
-        <where>  
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="fenchen != null  and fenchen != ''"> and fenchen = #{fenchen}</if>
-            <if test="wendu != null  and wendu != ''"> and wendu = #{wendu}</if>
-            <if test="shidu != null  and shidu != ''"> and shidu = #{shidu}</if>
-            <if test="co != null  and co != ''"> and co = #{co}</if>
-            <if test="daqiya != null  and daqiya != ''"> and daqiya = #{daqiya}</if>
-            <if test="o2 != null  and o2 != ''"> and o2 = #{o2}</if>
-            <if test="yanwu != null  and yanwu != ''"> and yanwu = #{yanwu}</if>
-            <if test="jiawan != null  and jiawan != ''"> and jiawan = #{jiawan}</if>
-            <if test="voc != null  and voc != ''"> and voc = #{voc}</if>
-            <if test="so2 != null  and so2 != ''"> and so2 = #{so2}</if>
-            <if test="no != null  and no != ''"> and no = #{no}</if>
+        <where>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="fenchen != null  and fenchen != ''">and fenchen = #{fenchen}</if>
+            <if test="wendu != null  and wendu != ''">and wendu = #{wendu}</if>
+            <if test="shidu != null  and shidu != ''">and shidu = #{shidu}</if>
+            <if test="co != null  and co != ''">and co = #{co}</if>
+            <if test="daqiya != null  and daqiya != ''">and daqiya = #{daqiya}</if>
+            <if test="o2 != null  and o2 != ''">and o2 = #{o2}</if>
+            <if test="yanwu != null  and yanwu != ''">and yanwu = #{yanwu}</if>
+            <if test="jiawan != null  and jiawan != ''">and jiawan = #{jiawan}</if>
+            <if test="voc != null  and voc != ''">and voc = #{voc}</if>
+            <if test="so2 != null  and so2 != ''">and so2 = #{so2}</if>
+            <if test="no != null  and no != ''">and no = #{no}</if>
         </where>
     </select>