Merge remote-tracking branch 'origin/master'

ruoyi-system/src/main/java/com/ruoyi/system/domain/UserNucleicTime.java

@@ -0,0 +1,114 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 导入人员核酸时间记录对象 user_nucleic_time
+ * 
+ * @author ruoyi
+ * @date 2022-08-15
+ */
+public class UserNucleicTime extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 导入人员id(user_info表id) */
+    private Long infoId;
+
+    /** 身份证号码 */
+    private String idCard;
+
+    /** 采集地点 */
+    private String collectPlace;
+
+    /** 核酸采集时间 */
+    private String nucleicCollectTime;
+
+    /** 核酸结果时间 */
+    private String nucleicResultsTime;
+
+    /** 核酸结果 0：阴性1：阳性 */
+    private String nucleicResult;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setInfoId(Long infoId) 
+    {
+        this.infoId = infoId;
+    }
+
+    public Long getInfoId() 
+    {
+        return infoId;
+    }
+    public void setCollectPlace(String collectPlace) 
+    {
+        this.collectPlace = collectPlace;
+    }
+
+    public String getCollectPlace() 
+    {
+        return collectPlace;
+    }
+    public void setNucleicCollectTime(String nucleicCollectTime) 
+    {
+        this.nucleicCollectTime = nucleicCollectTime;
+    }
+
+    public String getNucleicCollectTime() 
+    {
+        return nucleicCollectTime;
+    }
+    public void setNucleicResultsTime(String nucleicResultsTime) 
+    {
+        this.nucleicResultsTime = nucleicResultsTime;
+    }
+
+    public String getNucleicResultsTime() 
+    {
+        return nucleicResultsTime;
+    }
+    public void setNucleicResult(String nucleicResult) 
+    {
+        this.nucleicResult = nucleicResult;
+    }
+
+    public String getNucleicResult() 
+    {
+        return nucleicResult;
+    }
+
+    public String getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
+
+    @Override
+    public String toString() {
+        return "UserNucleicTime{" +
+                "id=" + id +
+                ", infoId=" + infoId +
+                ", idCard='" + idCard + '\'' +
+                ", collectPlace='" + collectPlace + '\'' +
+                ", nucleicCollectTime='" + nucleicCollectTime + '\'' +
+                ", nucleicResultsTime='" + nucleicResultsTime + '\'' +
+                ", nucleicResult='" + nucleicResult + '\'' +
+                '}';
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserNucleicTimeMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.UserNucleicTime;
+
+/**
+ * 导入人员核酸时间记录Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-08-15
+ */
+public interface UserNucleicTimeMapper 
+{
+    /**
+     * 查询导入人员核酸时间记录
+     * 
+     * @param id 导入人员核酸时间记录主键
+     * @return 导入人员核酸时间记录
+     */
+    public UserNucleicTime selectUserNucleicTimeById(Long id);
+
+    /**
+     * 查询导入人员核酸时间记录列表
+     * 
+     * @param userNucleicTime 导入人员核酸时间记录
+     * @return 导入人员核酸时间记录集合
+     */
+    public List<UserNucleicTime> selectUserNucleicTimeList(UserNucleicTime userNucleicTime);
+
+    /**
+     * 新增导入人员核酸时间记录
+     * 
+     * @param userNucleicTime 导入人员核酸时间记录
+     * @return 结果
+     */
+    public int insertUserNucleicTime(UserNucleicTime userNucleicTime);
+
+    /**
+     * 修改导入人员核酸时间记录
+     * 
+     * @param userNucleicTime 导入人员核酸时间记录
+     * @return 结果
+     */
+    public int updateUserNucleicTime(UserNucleicTime userNucleicTime);
+
+    /**
+     * 删除导入人员核酸时间记录
+     * 
+     * @param id 导入人员核酸时间记录主键
+     * @return 结果
+     */
+    public int deleteUserNucleicTimeById(Long id);
+
+    /**
+     * 批量删除导入人员核酸时间记录
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteUserNucleicTimeByIds(Long[] ids);
+}

ruoyi-system/src/main/resources/mapper/system/UserInfoMapper.xml

@@ -45,8 +45,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jobStyle != null  and jobStyle != ''"> and job_style = #{jobStyle}</if>
             <if test="focusCrowdStyle != null  and focusCrowdStyle != ''"> and focus_crowd_style = #{focusCrowdStyle}</if>
             <if test="detectionFrequency != null  and detectionFrequency != ''"> and detection_frequency = #{detectionFrequency}</if>
-            <if test="startTime != null  and startTime != ''"> and start_time = #{startTime}</if>
-            <if test="endTime != null  and endTime != ''"> and end_time = #{endTime}</if>
+            <if test="deptId != null  and deptId != ''"> and dept_id = #{deptId}</if>
+
+            <if test="startTime != null  and startTime != ''"> and start_time > #{startTime}</if>
+            <if test="endTime != null  and endTime != ''"> and #{endTime}>=end_time</if>
+
         </where>
     </select>
     

ruoyi-system/src/main/resources/mapper/system/UserNucleicTimeMapper.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.UserNucleicTimeMapper">
+    
+    <resultMap type="UserNucleicTime" id="UserNucleicTimeResult">
+        <result property="id"    column="id"    />
+        <result property="infoId"    column="info_id"    />
+        <result property="idCard"    column="id_card"    />
+        <result property="collectPlace"    column="collect_place"    />
+        <result property="nucleicCollectTime"    column="nucleic_collect_time"    />
+        <result property="nucleicResultsTime"    column="nucleic_results_time"    />
+        <result property="nucleicResult"    column="nucleic_result"    />
+    </resultMap>
+
+    <sql id="selectUserNucleicTimeVo">
+        select id, info_id, id_card, collect_place, nucleic_collect_time, nucleic_results_time, nucleic_result from user_nucleic_time
+    </sql>
+
+    <select id="selectUserNucleicTimeList" parameterType="UserNucleicTime" resultMap="UserNucleicTimeResult">
+        <include refid="selectUserNucleicTimeVo"/>
+        <where>  
+        </where>
+    </select>
+    
+    <select id="selectUserNucleicTimeById" parameterType="Long" resultMap="UserNucleicTimeResult">
+        <include refid="selectUserNucleicTimeVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertUserNucleicTime" parameterType="UserNucleicTime">
+        insert into user_nucleic_time
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="infoId != null">info_id,</if>
+            <if test="collectPlace != null">collect_place,</if>
+            <if test="nucleicCollectTime != null">nucleic_collect_time,</if>
+            <if test="nucleicResultsTime != null">nucleic_results_time,</if>
+            <if test="nucleicResult != null">nucleic_result,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="infoId != null">#{infoId},</if>
+            <if test="collectPlace != null">#{collectPlace},</if>
+            <if test="nucleicCollectTime != null">#{nucleicCollectTime},</if>
+            <if test="nucleicResultsTime != null">#{nucleicResultsTime},</if>
+            <if test="nucleicResult != null">#{nucleicResult},</if>
+         </trim>
+    </insert>
+
+    <update id="updateUserNucleicTime" parameterType="UserNucleicTime">
+        update user_nucleic_time
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="infoId != null">info_id = #{infoId},</if>
+            <if test="collectPlace != null">collect_place = #{collectPlace},</if>
+            <if test="nucleicCollectTime != null">nucleic_collect_time = #{nucleicCollectTime},</if>
+            <if test="nucleicResultsTime != null">nucleic_results_time = #{nucleicResultsTime},</if>
+            <if test="nucleicResult != null">nucleic_result = #{nucleicResult},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteUserNucleicTimeById" parameterType="Long">
+        delete from user_nucleic_time where id = #{id}
+    </delete>
+
+    <delete id="deleteUserNucleicTimeByIds" parameterType="String">
+        delete from user_nucleic_time where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>