兴安访客小程序访客改造

dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/visitor/VisitorMapper.xml

@@ -287,6 +287,9 @@
             <if test="idCardEndTime != null">id_card_end_time,</if>
             <if test="idCardAddress != null">id_card_address,</if>
             <if test="visitingUnit != null">visiting_unit,</if>
+            <if test="examineState != null">examine_state,</if>
+            <if test="visitorType != null">visitor_type,</if>
+            <if test="park != null">park,</if>
             <if test="userName != null">user_name,</if>
 
         </trim>
@@ -320,6 +323,9 @@
             <if test="idCardEndTime != null">#{idCardEndTime},</if>
             <if test="idCardAddress != null">#{idCardAddress},</if>
             <if test="visitingUnit != null">#{visitingUnit},</if>
+            <if test="examineState != null">#{examineState},</if>
+            <if test="visitorType != null">#{visitorType},</if>
+            <if test="park != null">#{park},</if>
             <if test="userName != null">#{userName},</if>
 
         </trim>
@@ -586,11 +592,15 @@
         </if>
         order by vv.create_time desc, id desc
     </select>
-    <select id="queryVisitor" resultType="java.lang.Integer">
+    <select id="queryVisitorByCardCount" resultType="java.lang.Integer">
         select count(1)
         from vis_visitor
-        where idcard = #{idcard}
-          and out_time is null
+        where out_time is null
+        and examine_state in ('2','0')
+        and idcard in
+        <foreach item="idcard" collection="idcards" open="(" separator="," close=")">
+            #{idcard}
+        </foreach>
     </select>
     <select id="queryVisitorInfoById" resultType="com.dcsoft.system.visitor.domain.PersonnelInfoVo">
         select idcard
@@ -729,8 +739,12 @@
     <select id="queryVisitorByIdCount" resultType="java.lang.Integer">
         select count(1)
         from vis_visitor
-        where phone = #{phone}
-          and out_time is null
+        where out_time is null
+        and examine_state in ('2','0')
+        and phone in
+        <foreach item="phone" collection="phones" open="(" separator="," close=")">
+            #{phone}
+        </foreach>
     </select>
     <select id="queryExportVisitorInfo" resultType="com.dcsoft.system.visitor.domain.Visitor">
         select vv.name, vv.phone, vv.start_time startTime, vv.end_time endTime, sp.name userName, vv.matter