diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java index 929c5bb..e32a888 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushController.java @@ -561,8 +561,8 @@ public class TeacherCongressDelegatePushController { entityList.add(new ExcelExportEntity("是否中级职称及以下", "intermediateBelow", 20)); entityList.add(new ExcelExportEntity("是否干部", "cadre", 20)); entityList.add(new ExcelExportEntity("是否工人", "worker", 20)); - entityList.add(new ExcelExportEntity("教代会代表", "isJdh", 20)); - entityList.add(new ExcelExportEntity("工代会代表", "isGdh", 20)); + entityList.add(new ExcelExportEntity("教代会/工代会代表", "isJdh", 20)); +// entityList.add(new ExcelExportEntity("工代会代表", "isGdh", 20)); entityList.add(new ExcelExportEntity("代表类型", "representativeType", 20)); ExportParams exportParams = new ExportParams(); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java index d9cd01b..eb838d1 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegate/controller/TeacherCongressDelegatePushZgAuditController.java @@ -149,8 +149,8 @@ public class TeacherCongressDelegatePushZgAuditController { entityList.add(new ExcelExportEntity("是否中级职称及以下", "intermediateBelow", 20)); entityList.add(new ExcelExportEntity("是否干部", "cadre", 20)); entityList.add(new ExcelExportEntity("是否工人", "worker", 20)); - entityList.add(new ExcelExportEntity("教代会代表", "isJdh", 20)); - entityList.add(new ExcelExportEntity("工代会代表", "isGdh", 20)); + entityList.add(new ExcelExportEntity("教代会/工代会代表", "isJdh", 20)); +// entityList.add(new ExcelExportEntity("工代会代表", "isGdh", 20)); entityList.add(new ExcelExportEntity("代表类型", "representativeType", 20)); entityList.add(new ExcelExportEntity("状态", "instanceStateName", 20)); diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/dwFzrAudit.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/dwFzrAudit.html index 576c8aa..04fa65d 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/dwFzrAudit.html +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/dwFzrAudit.html @@ -78,18 +78,18 @@ layout("/layouts/platform.html"){ - + - - - + + + + + + diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/dwSjAudit.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/dwSjAudit.html index 5e03e47..9665e32 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/dwSjAudit.html +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/dwSjAudit.html @@ -74,18 +74,18 @@ layout("/layouts/platform.html"){ - + - - - + + + + + + diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html index c938a13..3b27e23 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/index.html @@ -136,7 +136,7 @@ layout("/layouts/platform.html"){ > - + - + - + - - - + + + + + + diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html index 834973a..ab89669 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/zcAudit.html @@ -80,18 +80,18 @@ layout("/layouts/platform.html"){ - + - - - + + + + + +