Merge branch 'dev_resi_export' into develop

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

@@ -0,0 +1,27 @@
+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 IcVaccineFormDTO extends PageFormDTO {
+
+    private static final long serialVersionUID = -6809065476616323072L;
+
+    public interface Detail extends CustomerClientShowGroup {
+    }
+
+    /**
+     * 核酸记录Id
+     */
+    @NotBlank(message = "疫苗接种记录Id不能为空", groups = {Detail.class})
+    private String vaccineId;
+
+}

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

@@ -19,6 +19,8 @@ import com.epmet.commons.tools.utils.*;
 import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.constants.ImportTaskConstants;
+import com.epmet.dto.IcVaccineDTO;
+import com.epmet.dto.form.IcVaccineFormDTO;
 import com.epmet.dto.form.VaccineListFormDTO;
 import com.epmet.dto.result.IcVaccineListCommonExcelResultDTO;
 import com.epmet.dto.result.IcVaccineListResultDTO;
@@ -224,5 +226,16 @@ public class IcVaccineController  implements ResultDataResolver {
         }
     }
 
+    /**
+     * @Author sun
+     * @Description 疫苗接种情况-列表点击查询详情
+     **/
+    @NoRepeatSubmit
+    @PostMapping("detail")
+    public Result<IcVaccineDTO> detail(@RequestBody IcVaccineFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, IcVaccineFormDTO.Detail.class);
+        return new Result<IcVaccineDTO>().ok(icVaccineService.detail(formDTO.getVaccineId()));
+    }
+
 
 }

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

@@ -2,6 +2,7 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IcVaccineDTO;
 import com.epmet.dto.form.VaccineListFormDTO;
 import com.epmet.dto.result.IcVaccineListResultDTO;
 import com.epmet.dto.result.VaccineListDTO;
@@ -53,4 +54,10 @@ public interface IcVaccineService extends BaseService<IcVaccineEntity> {
      * @Date 2022/3/30 10:24
      */
     List<VaccineListDTO> getVaccineList(String customerId, String idCard);
+
+    /**
+     * @Author sun
+     * @Description 疫苗接种情况-列表点击查询详情
+     **/
+    IcVaccineDTO detail(String vaccineId);
 }

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

@@ -13,14 +13,13 @@ import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
-import com.epmet.commons.tools.utils.DateUtils;
-import com.epmet.commons.tools.utils.EpmetRequestHolder;
-import com.epmet.commons.tools.utils.FileUtils;
-import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.*;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcResiUserDao;
 import com.epmet.dao.IcVaccineDao;
 import com.epmet.dao.IcVaccineRelationDao;
+import com.epmet.dto.IcVaccineDTO;
+import com.epmet.dto.UserAdviceDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
 import com.epmet.dto.form.VaccineListFormDTO;
 import com.epmet.dto.result.IcVaccineListResultDTO;
@@ -30,6 +29,7 @@ import com.epmet.dto.result.VaccineListDTO;
 import com.epmet.entity.IcResiUserEntity;
 import com.epmet.entity.IcVaccineEntity;
 import com.epmet.entity.IcVaccineRelationEntity;
+import com.epmet.entity.UserAdviceEntity;
 import com.epmet.excel.data.IcNatImportExcelData;
 import com.epmet.excel.data.IcVaccineImportExcelData;
 import com.epmet.excel.handler.IcVaccineExcelImportListener;
@@ -468,4 +468,14 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
         }).collect(Collectors.toList());
     }
 
+    /**
+     * @Author sun
+     * @Description 疫苗接种情况-列表点击查询详情
+     **/
+    @Override
+    public IcVaccineDTO detail(String vaccineId) {
+        IcVaccineEntity entity = baseDao.selectById(vaccineId);
+        return ConvertUtils.sourceToTarget(entity, IcVaccineDTO.class);
+    }
+
 }