From 3483d6e13fcf86b10ddd96494c3063e57c3455cd Mon Sep 17 00:00:00 2001 From: yujt Date: Sat, 8 May 2021 16:20:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=96=AB=E8=8B=97=E6=8E=A5?= =?UTF-8?q?=E7=A7=8D=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-commons-yushan | 2 +- .../controller/VaccinationInfoController.java | 16 +++++++++ .../vaccine/vim/dao/VaccinationInfoDao.java | 13 +++++++ .../vim/dto/result/EpdcAppDoseInfoDTO.java | 25 +++++++++++++ .../dto/result/EpdcAppVimInfoResultDTO.java | 30 ++++++++++++++++ .../vim/service/VaccinationInfoService.java | 12 +++++++ .../impl/VaccinationInfoServiceImpl.java | 5 +++ .../mapper/vim/VaccinationInfoDao.xml | 35 ++++++++++++++++++- 8 files changed, 136 insertions(+), 2 deletions(-) create mode 100644 epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dto/result/EpdcAppDoseInfoDTO.java create mode 100644 epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dto/result/EpdcAppVimInfoResultDTO.java diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index 60b469f..9596cd2 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit 60b469fb3d9fccb7220f65c3ddbaa412033ecc01 +Subproject commit 9596cd2ada0a9e7de4bfdc86d85791d71040965b diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/controller/VaccinationInfoController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/controller/VaccinationInfoController.java index a4b4272..50cec96 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/controller/VaccinationInfoController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/controller/VaccinationInfoController.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.vaccine.vim.controller; import com.elink.esua.epdc.commons.tools.annotation.LogOperation; +import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -11,6 +12,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService; import com.elink.esua.epdc.vaccine.vim.dto.VaccinationInfoDTO; +import com.elink.esua.epdc.vaccine.vim.dto.result.EpdcAppVimInfoResultDTO; import com.elink.esua.epdc.vaccine.vim.excel.VaccinationInfoExcel; import com.elink.esua.epdc.vaccine.vim.service.VaccinationInfoService; import org.springframework.beans.factory.annotation.Autowired; @@ -97,4 +99,18 @@ public class VaccinationInfoController { return vaccinationInfoService.importManualScoreExcel(file); } + /** + * 查询用户疫苗接种信息 + * + * @param userName 人员姓名 + * @param idCard 身份证号 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2021/5/8 15:29 + */ + @GetMapping(Constant.EPDC_APP + "query") + public Result getUserVimInfo(String userName, String idCard) { + return new Result().ok(vaccinationInfoService.getUserVimInfo(userName, idCard)); + } + } \ No newline at end of file diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dao/VaccinationInfoDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dao/VaccinationInfoDao.java index 08e83ac..a8277a6 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dao/VaccinationInfoDao.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dao/VaccinationInfoDao.java @@ -1,7 +1,9 @@ package com.elink.esua.epdc.vaccine.vim.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.vaccine.vim.dto.VaccinationInfoDTO; +import com.elink.esua.epdc.vaccine.vim.dto.result.EpdcAppVimInfoResultDTO; import com.elink.esua.epdc.vaccine.vim.entity.VaccinationInfoEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -35,4 +37,15 @@ public interface VaccinationInfoDao extends BaseDao { * @date 2021/5/7 15:16 */ void deleteDistinctDose(@Param("deleteVaccArr") List deleteVaccArr); + + /** + * 查询用户疫苗接种信息 + * + * @param userName 人员姓名 + * @param idCard 身份证号 + * @return com.elink.esua.epdc.vaccine.vim.dto.result.EpdcAppVimInfoResultDTO + * @author work@yujt.net.cn + * @date 2021/5/8 15:48 + */ + EpdcAppVimInfoResultDTO getUserVimInfo(@Param("userName") String userName, @Param("idCard") String idCard); } \ No newline at end of file diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dto/result/EpdcAppDoseInfoDTO.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dto/result/EpdcAppDoseInfoDTO.java new file mode 100644 index 0000000..e7fa4c7 --- /dev/null +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dto/result/EpdcAppDoseInfoDTO.java @@ -0,0 +1,25 @@ +package com.elink.esua.epdc.vaccine.vim.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 疫苗剂次信息 + * + * @author work@yujt.net.cn + */ +@Data +public class EpdcAppDoseInfoDTO implements Serializable { + + private static final long serialVersionUID = 8069426262502587441L; + + private Integer vaccinationNum; + + private String vaccinationTime; + + private String vaccinationSite; + + private String vaccinationCompany; + +} diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dto/result/EpdcAppVimInfoResultDTO.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dto/result/EpdcAppVimInfoResultDTO.java new file mode 100644 index 0000000..b6c04c7 --- /dev/null +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dto/result/EpdcAppVimInfoResultDTO.java @@ -0,0 +1,30 @@ +package com.elink.esua.epdc.vaccine.vim.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 疫苗接种信息 + * + * @author work@yujt.net.cn + */ +@Data +public class EpdcAppVimInfoResultDTO implements Serializable { + + private static final long serialVersionUID = -1040033718387829191L; + + private String idCard; + + private String userName; + + /** + * 接种状态 + */ + private String vaccinationState; + + private String nextDoseDate; + + private List vaccinationList; +} diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/VaccinationInfoService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/VaccinationInfoService.java index 25b6aee..25fa597 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/VaccinationInfoService.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/VaccinationInfoService.java @@ -4,6 +4,7 @@ package com.elink.esua.epdc.vaccine.vim.service; import com.elink.esua.epdc.commons.mybatis.service.CrudService; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.vaccine.vim.dto.VaccinationInfoDTO; +import com.elink.esua.epdc.vaccine.vim.dto.result.EpdcAppVimInfoResultDTO; import com.elink.esua.epdc.vaccine.vim.entity.VaccinationInfoEntity; import org.springframework.web.multipart.MultipartFile; @@ -76,4 +77,15 @@ public interface VaccinationInfoService extends CrudService - UPDATE vaccination_info SET DEL_FLAG = '1' @@ -26,4 +25,38 @@ + + + + + + + + + + + + + + \ No newline at end of file