From 75a99e42ea313f3a01d04ed330d7d2ce2f8695a0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 27 Apr 2022 15:43:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=9F=E6=88=90id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcExportTemplateServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 Date: Wed, 27 Apr 2022 15:58:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/AttentionDetailFormDTO.java | 21 +++++++++++++++++++ .../dto/result/VaccinationListResultDTO.java | 1 + .../IcEpidemicSpecialAttentionController.java | 13 ++++++++++++ .../dao/IcEpidemicSpecialAttentionDao.java | 9 ++++++++ .../IcEpidemicSpecialAttentionService.java | 10 +++++++++ ...IcEpidemicSpecialAttentionServiceImpl.java | 11 ++++++++++ .../mapper/IcEpidemicSpecialAttentionDao.xml | 16 ++++++++++++-- 7 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AttentionDetailFormDTO.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AttentionDetailFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AttentionDetailFormDTO.java new file mode 100644 index 0000000000..484cc4e2d2 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AttentionDetailFormDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/4/27 15:30 + * @DESC + */ +@Data +public class AttentionDetailFormDTO implements Serializable { + + private static final long serialVersionUID = -8257288519752831619L; + + @NotBlank(message = "id不能为空",groups = VaccinationListFormDTO.VaccinationListForm.class) + private String id; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java index a2012686fe..01c7374dff 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java @@ -99,6 +99,7 @@ public class VaccinationListResultDTO implements Serializable { * 小区名+楼栋名+单元名+房屋名 */ private String allName; + private String id; public VaccinationListResultDTO() { this.vaccinationCount = NumConstant.ZERO; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java index 60bb98cc89..e2e046a047 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java @@ -17,6 +17,7 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcEpidemicSpecialAttentionDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.ImportTaskCommonResultDTO; +import com.epmet.dto.result.VaccinationListResultDTO; import com.epmet.excel.NatExportExcel; import com.epmet.excel.NatImportExcel; import com.epmet.excel.VaccinationExportExcel; @@ -67,6 +68,18 @@ public class IcEpidemicSpecialAttentionController { return new Result().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 @@ ) + + +