疫苗接种 方法提交

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcVaccineListResultDTO.java

@@ -0,0 +1,95 @@
+package com.epmet.dto.result;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.HeadStyle;
+import com.alibaba.excel.enums.poi.FillPatternTypeEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 核酸检测-我的上报记录
+ * @Author sun
+ */
+@HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 44)
+@Data
+public class IcVaccineListResultDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 核酸记录Id
+     */
+    @ExcelIgnore
+    private String icNatId;
+    /**
+     * 组织Id
+     */
+    @ExcelIgnore
+    private String agencyId;
+    /**
+     * 居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
+     */
+    @ExcelIgnore
+    private String userId;
+
+    /**
+     * 居民端小程序的人：resi;数字社区的居民：icresi;未关联上的：other
+     */
+    @ExcelIgnore
+    private String userType;
+
+    /**
+     * 姓名
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "姓名",order = 1)
+    private String name;
+
+    /**
+     * 手机号
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "手机号",order = 2)
+    private String mobile;
+
+    /**
+     * 身份证号
+     */
+    @ColumnWidth(25)
+    @ExcelProperty(value = "身份证号",order = 3)
+    private String idCard;
+
+    /**
+     * 检测时间,yyyy-MM-dd HH:mm
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    @ColumnWidth(25)
+    @ExcelProperty(value = "检测时间",order = 4)
+    private Date natTime;
+
+    /**
+     * 检测结果
+     */
+    @ColumnWidth(20)
+    @ExcelProperty(value = "检测结果",order = 5)
+    private String natResult;
+
+    /**
+     * 是否客户下居民(0:否  1:是)
+     */
+    @ExcelIgnore
+    private String isResiUser;
+
+    /**
+     * 检测地点
+     */
+    @ColumnWidth(30)
+    @ExcelProperty(value = "检测地点",order = 7)
+    private String natAddress;
+
+
+}

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

@@ -21,6 +21,7 @@ import com.epmet.dto.IcNatDTO;
 import com.epmet.dto.form.AddIcNatFormDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
 import com.epmet.dto.form.VaccineListFormDTO;
+import com.epmet.dto.result.IcVaccineListResultDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.dto.result.NatListCommonExcelResultDTO;
 import com.epmet.dto.result.NatListResultDTO;
@@ -99,10 +100,10 @@ public class IcVaccineController  implements ResultDataResolver {
      **/
     @NoRepeatSubmit
     @PostMapping("natlist")
-    public Result<PageData<NatListResultDTO>> natList(@LoginUser TokenDto tokenDto, @RequestBody VaccineListFormDTO formDTO) {
+    public Result<PageData<IcVaccineListResultDTO>> natList(@LoginUser TokenDto tokenDto, @RequestBody VaccineListFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
-        return new Result<PageData<NatListResultDTO>>().ok(icVaccineService.natList(formDTO));
+        return new Result<PageData<IcVaccineListResultDTO>>().ok(icVaccineService.natList(formDTO));
     }
 
     /**

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

@@ -5,9 +5,10 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcNatDTO;
 import com.epmet.dto.form.AddIcNatFormDTO;
 import com.epmet.dto.form.MyNatListFormDTO;
+import com.epmet.dto.form.VaccineListFormDTO;
+import com.epmet.dto.result.IcVaccineListResultDTO;
 import com.epmet.dto.result.MyNatListResultDTO;
 import com.epmet.dto.result.NatListDTO;
-import com.epmet.dto.result.NatListResultDTO;
 import com.epmet.entity.IcVaccineEntity;
 
 import java.nio.file.Path;
@@ -37,8 +38,9 @@ public interface IcVaccineService extends BaseService<IcVaccineEntity> {
      * @Author sun
      * @Description 【核酸】核酸检测信息列表
      *
+     * @param formDTO
      * @return*/
-    PageData<NatListResultDTO> natList(MyNatListFormDTO formDTO);
+    PageData<IcVaccineListResultDTO> natList(VaccineListFormDTO formDTO);
 
     /**
      * @Author sun

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

@@ -24,10 +24,7 @@ import com.epmet.dao.IcVaccineDao;
 import com.epmet.dao.UserBaseInfoDao;
 import com.epmet.dto.IcNatDTO;
 import com.epmet.dto.IcNoticeDTO;
-import com.epmet.dto.form.AddIcNatFormDTO;
-import com.epmet.dto.form.ImportTaskCommonFormDTO;
-import com.epmet.dto.form.MyNatListFormDTO;
-import com.epmet.dto.form.SendNoticeFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcNatRelationEntity;
 import com.epmet.entity.IcResiUserEntity;
@@ -157,9 +154,10 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
      * @Author sun
      * @Description 【核酸】本组织及下级核酸检测信息列表
      *
+     * @param formDTO
      * @return*/
     @Override
-    public PageData<NatListResultDTO> natList(MyNatListFormDTO formDTO) {
+    public PageData<IcVaccineListResultDTO> natList(VaccineListFormDTO formDTO) {
         //1.根据是查询客户数据还是本辖区数据走不同逻辑
         if ("current".equals(formDTO.getOrgType())) {
             //本辖区数据