信息牌xml添加

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

@@ -9,7 +9,10 @@
         <result property="cardName" column="card_name"/>
         <result property="cardNum" column="card_num"/>
         <result property="college" column="college"/>
+<<<<<<< HEAD
         <result property="collegeId" column="college_id"/>
+=======
+>>>>>>> 5adca4ae (信息牌xml添加)
         <result property="location" column="location"/>
         <result property="operate" column="operate"/>
         <result property="subjectId" column="subject_id"/>
@@ -17,6 +20,10 @@
         <result property="deptId" column="dept_id"/>
         <result property="deptName" column="dept_name"/>
         <result property="isStart" column="is_start"/>
+<<<<<<< HEAD
+=======
+
+>>>>>>> 5adca4ae (信息牌xml添加)
         <result property="userId" column="user_id"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -29,7 +36,10 @@
                card_name,
                card_num,
                college,
+<<<<<<< HEAD
                college_id
+=======
+>>>>>>> 5adca4ae (信息牌xml添加)
                location,
                operate,
                subject_id,
@@ -52,10 +62,16 @@
             <if test="cardName != null and cardName != null">and t.card_name = #{cardName}</if>
             <if test="cardNum != null and cardNum != ''">and t.card_num = #{cardNum}</if>
             <if test="college != null and college != null">and t.college = #{college}</if>
+<<<<<<< HEAD
             <if test="collegeId != null">and t.college_id = #{collegeId}</if>
             <if test="location != null and location != '' ">and t.location = #{location}</if>
             <if test="operate != null ">and t.operate = #{operate}</if>
             <if test="subjectId != null ">and t.subject_id = #{subjectId}</if>
+=======
+            <if test="location != null and location != '' ">and t.location = #{location}</if>
+            <if test="operate != null ">and t.operate = #{operate}</if>
+            <if test="subject_id != null ">and t.subject_id = #{subjectId}</if>
+>>>>>>> 5adca4ae (信息牌xml添加)
             <if test="subjectName != null ">and t.subject_name = #{subjectName}</if>
             <if test="deptId != null ">and t.dept_id = #{deptId}</if>
             <if test="deptName != null ">and t.dept_name = #{deptName}</if>
@@ -79,7 +95,10 @@
             <if test="cardName != null">card_name,</if>
             <if test="cardNum != null">card_num,</if>
             <if test="college != null">college,</if>
+<<<<<<< HEAD
             <if test="collegeId != null">college_id,</if>
+=======
+>>>>>>> 5adca4ae (信息牌xml添加)
             <if test="location != null">location,</if>
             <if test="operate != null">operate,</if>
             <if test="subjectId != null">subject_id,</if>
@@ -97,7 +116,10 @@
             <if test="cardName != null">#{cardName},</if>
             <if test="cardNum != null">#{cardNum},</if>
             <if test="college != null">#{college},</if>
+<<<<<<< HEAD
             <if test="collegeId != null">#{collegeId},</if>
+=======
+>>>>>>> 5adca4ae (信息牌xml添加)
             <if test="location != null">#{location},</if>
             <if test="operate != null">#{operate},</if>
             <if test="subjectId != null">#{subjectId},</if>
@@ -118,8 +140,13 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="cardNum != null">card_name = #{cardNum},</if>
             <if test="cardNum != null">card_num = #{cardNum},</if>
+<<<<<<< HEAD
             <if test="college != null">college = #{college},</if>
             <if test="collegeId != null">college_id = #{collegeId},</if>
+=======
+
+            <if test="college != null">college = #{college},</if>
+>>>>>>> 5adca4ae (信息牌xml添加)
             <if test="location != null">location = #{location},</if>
             <if test="operate != null">operate = #{operate},</if>
             <if test="subjectId != null">subject_id = #{subjectId},</if>
@@ -128,6 +155,10 @@
             <if test="deptName != null">dept_name = #{deptName},</if>
             <if test="isStart != null">is_start = #{isStart},</if>
             <if test="userId != null">user_id = #{userId},</if>
+<<<<<<< HEAD
+=======
+
+>>>>>>> 5adca4ae (信息牌xml添加)
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>

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

@@ -101,7 +101,11 @@
             <if test="deptId != null">#{deptId},</if>
             <if test="deptName != null">#{deptName},</if>
             <if test="college != null">#{college},</if>
+<<<<<<< HEAD
             <if test="dutyTime != null">#{dutyTime},</if>
+=======
+            <if test="dutyTime != null">#{duty_time},</if>
+>>>>>>> 5adca4ae (信息牌xml添加)
             <if test="createById != null">#{createById},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -141,6 +145,7 @@
             #{id}
         </foreach>
     </delete>
+<<<<<<< HEAD
 
     <select id="selectDutyYmdById" parameterType="com.zd.laboratory.domain.XxpDuty" resultType="com.zd.laboratory.domain.vo.XxpDutyVO">
         select t1.duty_time
@@ -168,4 +173,6 @@
              ) t
     </select>
 
+=======
+>>>>>>> 5adca4ae (信息牌xml添加)
 </mapper>

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

@@ -28,7 +28,11 @@
                sign_out,
                dept_id,
                dept_name,
+<<<<<<< HEAD
                timediff(sign_out,sign_in) residence_time,
+=======
+               residence_time,
+>>>>>>> 5adca4ae (信息牌xml添加)
                create_time
         from xxp_inspection t
     </sql>