diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 310ff06..d81d0d3 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 310ff06907d82bb878eda31bf6054542adc8cb5a +Subproject commit d81d0d313a4556e4c6317e7924f98a8b0f6ce2ff diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/excel/EpidecmicUserNewExcel.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/excel/EpidecmicUserNewExcel.java index 35a8311..df7ffb0 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/excel/EpidecmicUserNewExcel.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/excel/EpidecmicUserNewExcel.java @@ -12,6 +12,8 @@ import lombok.Data; @Data public class EpidecmicUserNewExcel{ + @Excel(name = "所属组织") + private String allDeptNames; @Excel(name = "县内居住地镇街") private String liveAddressName; @Excel(name = "社区/村庄") @@ -115,4 +117,4 @@ public class EpidecmicUserNewExcel{ @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/excel/VaccinationInfoExcel.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/excel/VaccinationInfoExcel.java index dc15209..7ad203c 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,6 +13,8 @@ import java.util.Date; */ @Data public class VaccinationInfoExcel { + @Excel(name = "所属组织") + private String allDeptNames; @Excel(name = "真实姓名") private String realName; @Excel(name = "身份证号") @@ -53,4 +55,4 @@ public class VaccinationInfoExcel { private Date createdTime; private String updatedBy; private Date updatedTime; -} \ No newline at end of file +} 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 55c294b..1180ada 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 @@ -109,11 +109,6 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl authParams = vaccinationUserRoleService.getVaccinationAuthParams(user.getId()); // params.putAll(authParams); - String companyId = params.get("companyId") == null ? null : params.get("companyId").toString(); - if (StringUtils.isNotBlank(companyId)) { - params.put("companyIds", Arrays.asList(companyId.split(","))); - } - // 街道和超管有权查看所有数据 if (NumConstant.ZERO == user.getSuperAdmin() && !user.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_PARTY)) { @@ -126,6 +121,10 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl getVaccinationInfoList(Map params) { + String companyId = params.get("companyId") == null ? null : params.get("companyId").toString(); + if (StringUtils.isNotBlank(companyId)) { + params.put("companyIds", Arrays.asList(companyId.split(","))); + } List companyList = vaccineCompanyService.compantyList(); Map companyMap = companyList.stream().collect(Collectors.toMap(VaccineDto::getValue, VaccineDto::getLabel, (key1, key2) -> key2)); List siteList = vaccinationSiteService.getSiteList();