diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java index 34c11ea835..b3dd1195c7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/VaccinationExportExcel.java @@ -41,4 +41,45 @@ public class VaccinationExportExcel { @Excel(name = "所属房屋",width = 40) private String allName; + /** + * 管控开始时间yyyy-MM-dd,需求来源于磐石 + * gkStartTime-gkEndTime + */ + @Excel(name = "管控时间",width = 35) + private String gkTime; + + /** + * 镇(街)干部名称联系方式,需求来源于磐石 + * gbName+gbMobile + */ + @Excel(name = "镇(街)干部及联系方式",width = 35) + private String gb; + + + /** + * 村(社区)网格管理员gridManager,需求来源于磐石 + * gridManager+gridManagerMobile + */ + @Excel(name = "村(社区)网格管理员及联系方式",width = 35) + private String gridManagerShow; + + /** + * 基层医务工作者联系方式,需求来源于磐石 + * healthWorker+healthWorkerMobile + */ + @Excel(name = "基层医务工作者及联系方式",width = 35) + private String healthWorkerShow; + + /** + * 民警联系方式,需求来源于磐石 + * policeName+policeMobile + */ + @Excel(name = "民警及联系方式",width = 35) + private String policeShow; + /** + * 志愿者+联系方式,需求来源于磐石 + */ + @Excel(name = "志愿者及联系方式",width = 35) + private String volunteerShow; + } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml index 57ee4bfd58..1c53a83ed9 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcEpidemicSpecialAttentionDao.xml @@ -96,7 +96,7 @@ concat(a.GB_NAME,a.GB_MOBILE) as gb, concat(a.GRID_MANAGER,a.GRID_MANAGER_MOBILE) as gridManagerShow, concat(a.HEALTH_WORKER,a.HEALTH_WORKER_MOBILE) as healthWorkerShow, - concat(a.POLICE_NAMEm,a.POLICE_MOBILE) as policeShow, + concat(a.POLICE_NAME,a.POLICE_MOBILE) as policeShow, concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteerShow FROM ic_epidemic_special_attention a LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' and b.CUSTOMER_ID=a.CUSTOMER_ID @@ -171,7 +171,7 @@ concat(a.GB_NAME,a.GB_MOBILE) as gb, concat(a.GRID_MANAGER,a.GRID_MANAGER_MOBILE) as gridManagerShow, concat(a.HEALTH_WORKER,a.HEALTH_WORKER_MOBILE) as healthWorkerShow, - concat(a.POLICE_NAMEm,a.POLICE_MOBILE) as policeShow, + concat(a.POLICE_NAME,a.POLICE_MOBILE) as policeShow, concat(a.VOLUNTEER_NAME,a.VOLUNTEER_MOBILE) as volunteerShow FROM ic_epidemic_special_attention a LEFT JOIN ic_resi_user b ON a.id_card = b.id_card AND b.del_flag = '0' and a.CUSTOMER_ID = b.CUSTOMER_ID