diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatExportExcel.java index fd404ca278..4ff6036ea9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatExportExcel.java @@ -34,5 +34,76 @@ public class NatExportExcel { @Excel(name = "隔离状态",width = 20) private String isolatedState; + /** + * 管控开始时间yyyy-MM-dd,需求来源于磐石 + */ + @Excel(name = "管控开始时间",width = 30) + private String gkStartTime; + + /** + * 管控结束时间yyyy-MM-dd,需求来源于磐石 + */ + @Excel(name = "管控结束时间",width = 30) + private String gkEndTime; + + /** + * 镇(街)干部名称,需求来源于磐石 + */ + @Excel(name = "镇(街)干部名称",width = 30) + private String gbName; + + /** + * 镇(街)干部联系方式,需求来源于磐石 + */ + @Excel(name = "镇(街)干部联系方式",width = 30) + private String gbMobile; + + /** + * 村(社区)网格管理员,需求来源于磐石 + */ + @Excel(name = "村(社区)网格管理员",width = 30) + private String gridManager; + + /** + * 村(社区)网格管理员联系方式,需求来源于磐石 + */ + @Excel(name = "村(社区)网格管理员联系方式",width = 30) + private String gridManagerMobile; + + /** + * 基层医务工作者,需求来源于磐石 + */ + @Excel(name = "基层医务工作者",width = 30) + private String healthWorker; + + /** + * 基层医务工作者联系方式,需求来源于磐石 + */ + @Excel(name = "基层医务工作者联系方式",width = 30) + private String healthWorkerMobile; + + /** + * 民警,需求来源于磐石 + */ + @Excel(name = "民警",width = 30) + private String policeName; + + /** + * 民警联系方式,需求来源于磐石 + */ + @Excel(name = "民警联系方式",width = 30) + private String policeMobile; + + /** + * 志愿者,需求来源于磐石 + */ + @Excel(name = "志愿者",width = 30) + private String volunteerName; + + /** + * 志愿者联系方式,需求来源于磐石 + */ + @Excel(name = "志愿者联系方式",width = 30) + private String volunteerMobile; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatHistoryExportExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatHistoryExportExcel.java index 74bbd41676..76e4733310 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatHistoryExportExcel.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/NatHistoryExportExcel.java @@ -36,5 +36,76 @@ public class NatHistoryExportExcel { @Excel(name = "隔离状态",width = 20) private String isolatedState; + /** + * 管控开始时间yyyy-MM-dd,需求来源于磐石 + */ + @Excel(name = "管控开始时间",width = 30) + private String gkStartTime; + + /** + * 管控结束时间yyyy-MM-dd,需求来源于磐石 + */ + @Excel(name = "管控结束时间",width = 30) + private String gkEndTime; + + /** + * 镇(街)干部名称,需求来源于磐石 + */ + @Excel(name = "镇(街)干部名称",width = 30) + private String gbName; + + /** + * 镇(街)干部联系方式,需求来源于磐石 + */ + @Excel(name = "镇(街)干部联系方式",width = 30) + private String gbMobile; + + /** + * 村(社区)网格管理员,需求来源于磐石 + */ + @Excel(name = "村(社区)网格管理员",width = 30) + private String gridManager; + + /** + * 村(社区)网格管理员联系方式,需求来源于磐石 + */ + @Excel(name = "村(社区)网格管理员联系方式",width = 30) + private String gridManagerMobile; + + /** + * 基层医务工作者,需求来源于磐石 + */ + @Excel(name = "基层医务工作者",width = 30) + private String healthWorker; + + /** + * 基层医务工作者联系方式,需求来源于磐石 + */ + @Excel(name = "基层医务工作者联系方式",width = 30) + private String healthWorkerMobile; + + /** + * 民警,需求来源于磐石 + */ + @Excel(name = "民警",width = 30) + private String policeName; + + /** + * 民警联系方式,需求来源于磐石 + */ + @Excel(name = "民警联系方式",width = 30) + private String policeMobile; + + /** + * 志愿者,需求来源于磐石 + */ + @Excel(name = "志愿者",width = 30) + private String volunteerName; + + /** + * 志愿者联系方式,需求来源于磐石 + */ + @Excel(name = "志愿者联系方式",width = 30) + private String volunteerMobile; } 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 b3dd1195c7..34c11ea835 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,45 +41,4 @@ 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; - }