diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java index 482d3af99d..bb951a2183 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.FieldConstant; @@ -155,7 +156,7 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl().ok(icEpidemicSpecialAttentionService.vaccinationList(formDTO)); } + /** + * Desc: 【疫苗接种关注名单,疫苗接种关注名单】详情 + * @param formDTO + * @author zxc + * @date 2022/4/27 15:47 + */ + @PostMapping("detail") + public Result detail(@RequestBody AttentionDetailFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO,VaccinationListFormDTO.VaccinationListForm.class); + return new Result().ok(icEpidemicSpecialAttentionService.detail(formDTO)); + } + /** * Desc:【疫苗接种关注名单,核酸检测关注名单】新增 * @param formDTO diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcEpidemicSpecialAttentionDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcEpidemicSpecialAttentionDao.java index ba1564855e..0fb3e579d1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcEpidemicSpecialAttentionDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcEpidemicSpecialAttentionDao.java @@ -1,6 +1,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.AttentionDetailFormDTO; import com.epmet.dto.form.VaccinationListFormDTO; import com.epmet.dto.result.VaccinationListResultDTO; import com.epmet.entity.IcEpidemicSpecialAttentionEntity; @@ -26,6 +27,14 @@ public interface IcEpidemicSpecialAttentionDao extends BaseDao vaccinationList(VaccinationListFormDTO formDTO); + /** + * Desc: 关注详情 + * @param formDTO + * @author zxc + * @date 2022/4/27 15:42 + */ + VaccinationListResultDTO nat(AttentionDetailFormDTO formDTO); + /** * Desc: 核酸检测关注名单 * @param formDTO diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcEpidemicSpecialAttentionService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcEpidemicSpecialAttentionService.java index 8a6eb03f04..5391f1c1ae 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcEpidemicSpecialAttentionService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcEpidemicSpecialAttentionService.java @@ -4,9 +4,11 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.IcEpidemicSpecialAttentionDTO; +import com.epmet.dto.form.AttentionDetailFormDTO; import com.epmet.dto.form.CancelAttentionPackageFormDTO; import com.epmet.dto.form.VaccinationAddFormDTO; import com.epmet.dto.form.VaccinationListFormDTO; +import com.epmet.dto.result.VaccinationListResultDTO; import com.epmet.entity.IcEpidemicSpecialAttentionEntity; import java.io.InputStream; @@ -130,4 +132,12 @@ public interface IcEpidemicSpecialAttentionService extends BaseService getHeSuanIdCardList(String customerId,List idCardSet); + + /** + * Desc: 详情 + * @param formDTO + * @author zxc + * @date 2022/4/27 15:33 + */ + VaccinationListResultDTO detail(AttentionDetailFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index 0cf1ee381b..6175e742c5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -467,6 +467,17 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl - SELECT + SELECT a.id, a.`NAME`, a.MOBILE, a.ID_CARD, @@ -144,4 +144,16 @@ ) + + +