疫苗接种 方法提交

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

@@ -0,0 +1,67 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description 疫苗接种信息查询
+ * @Author sun
+ */
+@Data
+public class VaccineListFormDTO extends PageFormDTO {
+
+    private static final long serialVersionUID = -6809065476616323072L;
+
+    public interface Detail extends CustomerClientShowGroup {
+    }
+    public interface Del extends CustomerClientShowGroup {
+    }
+    public interface Synchro extends CustomerClientShowGroup {
+    }
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+    /**
+     * 当前组织:current 根组织：all
+     */
+    private String searchType;
+    private String agencyId;
+    /**
+     * 姓名
+     */
+    private String name;
+    /**
+     * 手机号
+     */
+    private String mobile;
+    /**
+     * 是否客户下居民(0:否  1:是)
+     */
+    private String isResiUser;
+    /**
+     * 检测开始时间yyyy-MM-dd HH:mm
+     */
+    private String startTime;
+    /**
+     * 检测结束时间yyyy-MM-dd HH:mm间yy-mm-dd
+     */
+    private String endTime;
+
+    /**
+     * 核酸记录Id
+     */
+    @NotBlank(message = "疫苗接种记录Id不能为空", groups = { Detail.class, Del.class, Synchro.class})
+    private String icVaccineId;
+
+    /**
+     * token里设置
+     */
+    private String customerId;
+    private String userId;
+
+}

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

@@ -20,9 +20,8 @@ import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dto.IcNatDTO;
 import com.epmet.dto.form.AddIcNatFormDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
-import com.epmet.dto.form.MyNatListFormDTO;
+import com.epmet.dto.form.VaccineListFormDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
-import com.epmet.dto.result.MyNatListResultDTO;
 import com.epmet.dto.result.NatListCommonExcelResultDTO;
 import com.epmet.dto.result.NatListResultDTO;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
@@ -93,17 +92,6 @@ public class IcVaccineController  implements ResultDataResolver {
         return new Result();
     }
 
-    /**
-     * @Author sun
-     * @Description 核酸检测-居民端我的上报
-     **/
-    @NoRepeatSubmit
-    @PostMapping("mynatlist")
-    public Result<List<MyNatListResultDTO>> myNatList(@LoginUser TokenDto tokenDto, @RequestBody MyNatListFormDTO formDTO) {
-        formDTO.setCustomerId(tokenDto.getCustomerId());
-        formDTO.setUserId(tokenDto.getUserId());
-        return new Result<List<MyNatListResultDTO>>().ok(icVaccineService.myNatList(formDTO));
-    }
 
     /**
      * @Author sun
@@ -111,7 +99,7 @@ public class IcVaccineController  implements ResultDataResolver {
      **/
     @NoRepeatSubmit
     @PostMapping("natlist")
-    public Result<PageData<NatListResultDTO>> natList(@LoginUser TokenDto tokenDto, @RequestBody MyNatListFormDTO formDTO) {
+    public Result<PageData<NatListResultDTO>> natList(@LoginUser TokenDto tokenDto, @RequestBody VaccineListFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
         return new Result<PageData<NatListResultDTO>>().ok(icVaccineService.natList(formDTO));
@@ -123,8 +111,8 @@ public class IcVaccineController  implements ResultDataResolver {
      **/
     @NoRepeatSubmit
     @PostMapping("detail")
-    public Result<IcNatDTO> detail(@RequestBody MyNatListFormDTO formDTO) {
+    public Result<IcNatDTO> detail(@RequestBody VaccineListFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, MyNatListFormDTO.Detail.class);
+        ValidatorUtils.validateEntity(formDTO, VaccineListFormDTO.Detail.class);
         return new Result<IcNatDTO>().ok(icVaccineService.detail(formDTO));
     }
 
@@ -148,8 +136,8 @@ public class IcVaccineController  implements ResultDataResolver {
      **/
     @NoRepeatSubmit
     @PostMapping("del")
-    public Result del(@RequestBody MyNatListFormDTO formDTO) {
+    public Result del(@RequestBody VaccineListFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, MyNatListFormDTO.Del.class);
+        ValidatorUtils.validateEntity(formDTO, VaccineListFormDTO.Del.class);
         icVaccineService.del(formDTO);
         return new Result<>();
     }
@@ -160,8 +148,8 @@ public class IcVaccineController  implements ResultDataResolver {
      **/
     @NoRepeatSubmit
     @PostMapping("synchro")
-    public Result synchro(@LoginUser TokenDto tokenDto, @RequestBody MyNatListFormDTO formDTO) {
+    public Result synchro(@LoginUser TokenDto tokenDto, @RequestBody VaccineListFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, MyNatListFormDTO.Synchro.class);
+        ValidatorUtils.validateEntity(formDTO, VaccineListFormDTO.Synchro.class);
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
         icVaccineService.synchro(formDTO);
@@ -174,8 +162,8 @@ public class IcVaccineController  implements ResultDataResolver {
      **/
     @NoRepeatSubmit
     @PostMapping("cancelsynchro")
-    public Result cancelSynchro(@LoginUser TokenDto tokenDto, @RequestBody MyNatListFormDTO formDTO) {
+    public Result cancelSynchro(@LoginUser TokenDto tokenDto, @RequestBody VaccineListFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, MyNatListFormDTO.Synchro.class);
+        ValidatorUtils.validateEntity(formDTO, VaccineListFormDTO.Synchro.class);
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
         icVaccineService.cancelSynchro(formDTO);
@@ -266,7 +254,7 @@ public class IcVaccineController  implements ResultDataResolver {
      **/
     @NoRepeatSubmit
     @PostMapping("export")
-    public void export(@LoginUser TokenDto tokenDto, @RequestBody MyNatListFormDTO formDTO, HttpServletResponse response) {
+    public void export(@LoginUser TokenDto tokenDto, @RequestBody VaccineListFormDTO formDTO, HttpServletResponse response) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
 
@@ -280,7 +268,7 @@ public class IcVaccineController  implements ResultDataResolver {
         int pageNo = formDTO.getPageNo();
         try {
             // 这里 需要指定写用哪个class去写
-            String fileName = "核酸检测信息.xlsx";
+            String fileName = "疫苗接种信息.xlsx";
             if ("all".equals(formDTO.getOrgType())) {
                 excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), NatListResultDTO.class).build();
             }else {