From 8b7bf3238a081dc7be206949b691cafeef443e7f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 1 Nov 2022 16:14:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=98=B2=E7=96=AB?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=88=97=EF=BC=8C=E7=A6=85=E9=81=93713=20=E5=88=97=E8=A1=A8m?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/IcEpidemicSpecialAttentionDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From ad373c4bd3334184dbfccdddcc6da308d54b6fae Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 1 Nov 2022 16:29:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=98=B2=E7=96=AB?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E7=A3=90=E7=9F=B3=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=88=97=EF=BC=8C=E7=A6=85=E9=81=93713=20=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/excel/VaccinationExportExcel.java | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) 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; + }