From 3a8e53f4b729d17db68ab0f7250318a94491b547 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 28 May 2021 15:24:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E6=8E=A5?= =?UTF-8?q?=E7=A7=8D=E5=9C=B0=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/VaccinationInfoController.java | 2 +- .../vaccine/vim/dto/VaccinationInfoDTO.java | 2 ++ .../vim/excel/VaccinationInfoExcel.java | 24 ++++--------------- .../vim/service/VaccinationInfoService.java | 11 +++++++++ .../impl/VaccinationInfoServiceImpl.java | 17 ++++++++++++- .../mapper/vim/VaccinationInfoDao.xml | 3 +++ 6 files changed, 38 insertions(+), 21 deletions(-) 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 0af80e7..e246b1a 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 @@ -79,7 +79,7 @@ public class VaccinationInfoController { @GetMapping("export") @LogOperation("导出") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = vaccinationInfoService.list(params); + List list = vaccinationInfoService.getVaccinationInfoList(params); ExcelUtils.exportExcelToTarget(response, null, list, VaccinationInfoExcel.class); } diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dto/VaccinationInfoDTO.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dto/VaccinationInfoDTO.java index 8542ebe..e1653d6 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dto/VaccinationInfoDTO.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/dto/VaccinationInfoDTO.java @@ -75,9 +75,11 @@ public class VaccinationInfoDTO implements Serializable { // @ApiModelProperty(value = "生产企业id") private Long companyId; + private String company; // @ApiModelProperty(value = "接种单位/地点ID") private Long siteId; + private String site; // @ApiModelProperty(value = "疫苗生成批次、批号") private String batchNo; diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/excel/VaccinationInfoExcel.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/excel/VaccinationInfoExcel.java index 68d43d6..dc15209 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/excel/VaccinationInfoExcel.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/excel/VaccinationInfoExcel.java @@ -13,8 +13,6 @@ import java.util.Date; */ @Data public class VaccinationInfoExcel { - @Excel(name = "ID") - private Long id; @Excel(name = "真实姓名") private String realName; @Excel(name = "身份证号") @@ -23,11 +21,9 @@ public class VaccinationInfoExcel { private String mobile; @Excel(name = "性别") private String sex; - @Excel(name = "接种人县/区") private String county; @Excel(name = "接种人街道/乡镇") private String street; - @Excel(name = "接种人街道/乡镇ID") private String streetId; @Excel(name = "接种人社区/村") private String community; @@ -43,28 +39,18 @@ public class VaccinationInfoExcel { private Integer age; @Excel(name = "剂次，第几针") private Integer dose; - @Excel(name = "疫苗种类id") + private String vaccine; private Long vaccineId; - @Excel(name = "生产企业id") + @Excel(name = "生产企业") + private String company; private Long companyId; - @Excel(name = "接种单位/地点ID") + @Excel(name = "接种单位/地点") + private String site; private Long siteId; @Excel(name = "疫苗生成批次、批号") private String batchNo; - @Excel(name = "删除标识 0：未删除，1：已删除") - private String delFlag; - @Excel(name = "乐观锁") - private Integer revision; - @Excel(name = "创建人") private String createdBy; - @Excel(name = "创建时间") private Date createdTime; - @Excel(name = "更新人") private String updatedBy; - @Excel(name = "更新时间") private Date updatedTime; - @Excel(name = "创建人姓名") - private String creatorName; - @Excel(name = "是否接种",replace = { "未接种_0", "接种中_1", "接种完成_2"}) - private Integer vaccinationState; } \ No newline at end of file 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 fc768bc..0be039b 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 @@ -9,6 +9,7 @@ import com.elink.esua.epdc.vaccine.vim.entity.VaccinationInfoEntity; import org.springframework.web.multipart.MultipartFile; import java.util.List; +import java.util.Map; /** * 接种信息 @@ -28,6 +29,16 @@ public interface VaccinationInfoService extends CrudService checkVaccination(VaccinationInfoDTO dto); + /** + * 获取接种信息 + * + * @param params + * @return java.util.List + * @author zhy + * @date 2021/5/28 10:10 + */ + List getVaccinationInfoList(Map params); + /** * 删除前校验 * diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/impl/VaccinationInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/impl/VaccinationInfoServiceImpl.java index cd164c2..349a7d3 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/impl/VaccinationInfoServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/impl/VaccinationInfoServiceImpl.java @@ -88,10 +88,24 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl page(Map params) { IPage page = getPage(params, FieldConstant.CREATED_TIME, false); - List list = baseDao.getVaccinationInfoList(params); + List list = getVaccinationInfoList(params); return new PageData<>(list, page.getTotal()); } + @Override + public List getVaccinationInfoList(Map params) { + List companyList = vaccineCompanyService.compantyList(); + Map companyMap = companyList.stream().collect(Collectors.toMap(VaccineDto::getValue, VaccineDto::getLabel, (key1, key2) -> key2)); + List siteList = vaccinationSiteService.getSiteList(); + Map siteMap = siteList.stream().collect(Collectors.toMap(VaccineDto::getValue, VaccineDto::getLabel, (key1, key2) -> key2)); + List list = baseDao.getVaccinationInfoList(params); + list.forEach(dto -> { + dto.setCompany(companyMap.get(dto.getCompanyId())); + dto.setSite(siteMap.get(dto.getSiteId())); + }); + return list; + } + @Override public List checkVaccination(VaccinationInfoDTO dto) { return baseDao.checkVaccination(dto); @@ -171,6 +185,7 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl AND v.COMPANY_ID = #{companyId} + + AND v.SITE_ID = #{siteId} + AND u.DEL_FLAG = '0' AND u.VACCINATION_STATE = 1