Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java

@@ -41,6 +41,11 @@ public class IcNatDTO implements Serializable {
      */
     private String pids;
 
+    /**
+     * 是否客户下居民(0:否  1:是)
+     */
+    private String isResiUser;
+
     /**
      * 居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
      */

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatRelationDTO.java

@@ -0,0 +1,82 @@
+package com.epmet.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 核酸记录关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-03-31
+ */
+@Data
+public class IcNatRelationDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 居民端上报时存储用户所在网格的组织id.居民信息的人存储居民所在组织id.单个新增或者导入的存储登录用户所属的组织id
+     */
+	private String agencyId;
+
+    /**
+     * 组织pids,包含当前agencyId值
+     */
+	private String pids;
+
+    /**
+     * 核酸记录表Id(ic_nat.id)
+     */
+	private String icNatId;
+
+    /**
+     * 关系数据的绑定途径【居民端录入：resi;
+数字社区录入：icresi;
+导入的：import;
+同步的：synchro】
+     */
+	private String userType;
+
+    /**
+     * 删除标识
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/EpidemicPreventionFormDTO.java

@@ -56,6 +56,16 @@ public class EpidemicPreventionFormDTO extends PageFormDTO implements Serializab
      * 身份证
      */
     private String idCard;
+
+    /**
+     * 开始日期
+     */
+    private String startDate;
+
+    /**
+     * 结束日期
+     */
+    private String endDate;
     /**
      * 疫苗接种次数
      */
@@ -65,6 +75,8 @@ public class EpidemicPreventionFormDTO extends PageFormDTO implements Serializab
      */
     private Integer natCount;
 
-    private String startDate;
+    /**
-    private String endDate;
+     * 关注类型，核酸检测：2，疫苗接种：1
+     */
+    private Integer attentionType;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java

@@ -64,6 +64,13 @@ public class IcEpidemicPreventionController{
         return new Result<PageData<EpidemicPreventionResultDTO>>().ok(result);
     }
 
+    @PostMapping("user-list")
+    public Result<PageData<EpidemicPreventionResultDTO>> userList(@LoginUser TokenDto tokenDto, @RequestBody EpidemicPreventionFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        PageData<EpidemicPreventionResultDTO> result = icResiUserService.userList(formDTO);
+        return new Result<PageData<EpidemicPreventionResultDTO>>().ok(result);
+    }
+
     /**
      * 居民防疫信息详情
      * @Param formDTO

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatRelationController.java

@@ -0,0 +1,24 @@
+package com.epmet.controller;
+
+import com.epmet.service.IcNatRelationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 核酸记录关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-03-31
+ */
+@RestController
+@RequestMapping("icNatRelation")
+public class IcNatRelationController {
+
+    @Autowired
+    private IcNatRelationService icNatRelationService;
+
+
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatRelationDao.java

@@ -0,0 +1,16 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcNatRelationEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 核酸记录关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-03-31
+ */
+@Mapper
+public interface IcNatRelationDao extends BaseDao<IcNatRelationEntity> {
+	
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -281,4 +281,7 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      */
     List<EpidemicPreventionResultDTO> getEpidemicPreventionList(EpidemicPreventionFormDTO formDTO);
 
+    List<EpidemicPreventionResultDTO> natList(EpidemicPreventionFormDTO formDTO);
+    List<EpidemicPreventionResultDTO> vaccineList(EpidemicPreventionFormDTO formDTO);
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java

@@ -39,6 +39,11 @@ public class IcNatEntity extends BaseEpmetEntity {
      */
 	private String pids;
 
+	/**
+	 * 是否客户下居民(0:否  1:是)
+	 */
+	private String isResiUser;
+
     /**
      * 居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
      */

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatRelationEntity.java

@@ -0,0 +1,52 @@
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 核酸记录关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-03-31
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_nat_relation")
+public class IcNatRelationEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 居民端上报时存储用户所在网格的组织id.居民信息的人存储居民所在组织id.单个新增或者导入的存储登录用户所属的组织id
+     */
+	private String agencyId;
+
+    /**
+     * 组织pids,包含当前agencyId值
+     */
+	private String pids;
+
+    /**
+     * 核酸记录表Id(ic_nat.id)
+     */
+	private String icNatId;
+
+    /**
+     * 	关系数据的绑定途径【居民端录入：resi;
+		数字社区录入：icresi;
+		导入的：import;
+		同步的：synchro】
+     */
+	private String userType;
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcNatRelationService.java

@@ -0,0 +1,14 @@
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.IcNatRelationEntity;
+
+/**
+ * 核酸记录关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-03-31
+ */
+public interface IcNatRelationService extends BaseService<IcNatRelationEntity> {
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@@ -226,6 +226,7 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      * @Date 2022/3/29 14:27
      */
     PageData<EpidemicPreventionResultDTO> epidemicPreventionList(EpidemicPreventionFormDTO formDTO);
+    PageData<EpidemicPreventionResultDTO> userList(EpidemicPreventionFormDTO formDTO);
 
     /**
      * 居民防疫信息详情

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatRelationServiceImpl.java

@@ -0,0 +1,19 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.IcNatRelationDao;
+import com.epmet.entity.IcNatRelationEntity;
+import com.epmet.service.IcNatRelationService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 核酸记录关系表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-03-31
+ */
+@Service
+public class IcNatRelationServiceImpl extends BaseServiceImpl<IcNatRelationDao, IcNatRelationEntity> implements IcNatRelationService {
+
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -1278,6 +1278,19 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         return new PageData<>(list, pageInfo.getTotal());
     }
 
+    @Override
+    public PageData<EpidemicPreventionResultDTO> userList(EpidemicPreventionFormDTO formDTO) {
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
+        List<EpidemicPreventionResultDTO> list = new ArrayList<>();
+        if (formDTO.getAttentionType().equals(NumConstant.TWO)){
+            list = baseDao.natList(formDTO);
+        }else if (formDTO.getAttentionType().equals(NumConstant.ONE)){
+            list = baseDao.vaccineList(formDTO);
+        }
+        PageInfo<EpidemicPreventionResultDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal());
+    }
+
     /**
      * 居民防疫信息详情
      *

epmet-user/epmet-user-server/src/main/resources/mapper/IcNatRelationDao.xml

@@ -0,0 +1,7 @@
+<?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.epmet.dao.IcNatRelationDao">
+
+
+</mapper>

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -724,4 +724,77 @@
             </if>
             ORDER BY `NAME`
     </select>
+    <select id="natList" resultType="com.epmet.dto.result.EpidemicPreventionResultDTO">
+        SELECT * FROM
+        (SELECT
+            ID,
+            `NAME`,
+            GRID_ID,
+            HOME_ID,
+            MOBILE,
+            a.ID_CARD,
+            c.created_time,
+            IFNULL( c.count, 0 ) AS natCount
+        FROM ic_resi_user a
+        LEFT JOIN ( SELECT ID_CARD, count( id ) AS count,created_time FROM ic_nat WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} GROUP BY ID_CARD ) c ON a.ID_CARD = c.ID_CARD
+        WHERE a.DEL_FLAG = '0'
+        <if test="customerId != null and customerId != ''">
+            AND a.CUSTOMER_ID = #{customerId}
+        </if>
+        <if test="agencyId != null and agencyId != ''">
+            AND (AGENCY_ID = #{agencyId} OR PIDS LIKE concat( '%', #{agencyId}, '%' ))
+        </if>
+        <if test="gridId != null and gridId != ''">
+            AND GRID_ID = #{gridId}
+        </if>
+        ) t
+        WHERE 1=1
+        <if test="startDate != null and startDate != ''">
+            AND date_format(created_time,'%Y%m%d') >= #{startDate}
+        </if>
+        <if test="endDate != null and endDate != ''">
+            AND date_format(created_time,'%Y%m%d') <![CDATA[ <= ]]> #{endDate}
+        </if>
+        <if test="natCount != null">
+            AND natCount <![CDATA[ <= ]]> #{natCount}
+        </if>
+        ORDER BY `NAME`
+    </select>
+
+    <select id="vaccineList" resultType="com.epmet.dto.result.EpidemicPreventionResultDTO">
+        SELECT * FROM
+        (SELECT
+        ID,
+        `NAME`,
+        GRID_ID,
+        HOME_ID,
+        MOBILE,
+        a.ID_CARD,
+        b.created_time,
+        IFNULL( b.count, 0 ) AS vaccineCount
+        FROM ic_resi_user a
+        LEFT JOIN ( SELECT ID_CARD, count( id ) AS count,created_time FROM ic_resi_vaccine WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} GROUP BY ID_CARD ) b ON a.ID_CARD = b.ID_CARD
+        WHERE a.DEL_FLAG = '0'
+        <if test="customerId != null and customerId != ''">
+            AND a.CUSTOMER_ID = #{customerId}
+        </if>
+        <if test="agencyId != null and agencyId != ''">
+            AND (AGENCY_ID = #{agencyId} OR PIDS LIKE concat( '%', #{agencyId}, '%' ))
+        </if>
+        <if test="gridId != null and gridId != ''">
+            AND GRID_ID = #{gridId}
+        </if>
+        ) t
+        WHERE 1=1
+        <if test="startDate != null and startDate != ''">
+            AND date_format(created_time,'%Y%m%d') >= #{startDate}
+        </if>
+        <if test="endDate != null and endDate != ''">
+            AND date_format(created_time,'%Y%m%d') <![CDATA[ <= ]]> #{endDate}
+        </if>
+        <if test="vaccineCount != null">
+            AND vaccineCount <![CDATA[ <= ]]> #{vaccineCount}
+        </if>
+        ORDER BY `NAME`
+    </select>
 </mapper>