核酸

boman-api/boman-domain/src/main/java/com/boman/domain/Czrk.java

@@ -255,10 +255,12 @@ public class Czrk extends BaseEntity{
     /**
      * 是否完成核酸
      */
+    @Excel(name = "是否完成核酸",readConverterExp = "Y=是,N=否")
     private String isNucleicAcid;
     /**
      * 最后一次核酸时间
      */
+    @Excel(name = "核酸时间")
     private String nucleicAcidTime;
 
     /**

boman-web-core/src/main/resources/mapper/CzrkMapper.xml

@@ -121,6 +121,7 @@
             and status = '1'
             <!-- 已认领 -->
             <if test="isRl != null and isRl != ''">and is_rl = #{isRl}</if>
+            <if test="isNucleicAcid != null and isNucleicAcid != ''">and is_nucleicAcid = #{isNucleicAcid}</if>
             <if test="userName != null  and userName != ''">
                 and user_name like concat(#{userName}, '%')
             </if>
@@ -1160,6 +1161,8 @@
     <select id="getAllCzrk" resultMap="CzrkResult">
         select
         ANY_VALUE(c.user_name) as user_name,
+        ANY_VALUE(c.is_nucleicAcid) as is_nucleicAcid,
+        ANY_VALUE(c.nucleicAcid_time) as nucleicAcid_time,
         ANY_VALUE(c.age) as age,
         <!--ANY_VALUE(STUFF (c.id_card, 7, 8, '********')) AS id_card,-->
         ANY_VALUE(c.id_card) AS id_card,
@@ -1193,6 +1196,7 @@
             <if test="userName != null  and userName != ''">
                 and c.user_name like concat(#{userName}, '%')
             </if>
+            <if test="isNucleicAcid != null and isNucleicAcid != ''">and c.is_nucleicAcid = #{isNucleicAcid}</if>
             <if test="params.startAge != null  and params.startAge != ''">and c.age &gt;= #{params.startAge}</if>
             <if test="params.endAge != null  and params.endAge != ''">and c.age &lt;= #{params.endAge}</if>
             <if test="gender != null  and gender != ''">and c.gender = #{gender}</if>
@@ -1257,6 +1261,7 @@
             <if test="userName != null  and userName != ''">
                 and c.user_name like concat(#{userName}, '%')
             </if>
+            <if test="isNucleicAcid != null and isNucleicAcid != ''">and c.is_nucleicAcid = #{isNucleicAcid}</if>
             <if test="params.startAge != null  and params.startAge != ''">and c.age &gt;= #{params.startAge}</if>
             <if test="params.endAge != null  and params.endAge != ''">and c.age &lt;= #{params.endAge}</if>
             <if test="idCard != null  and idCard != ''">and c.id_card = #{idCard}</if>