From e3504f84dc3873ef12434edfbbd3d53c55d763d1 Mon Sep 17 00:00:00 2001
From: = <=>
Date: Mon, 8 Dec 2025 10:34:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E4=BB=A3=E4=BC=9A=E4=BB=A3=E8=A1=A8?=
 =?UTF-8?q?=20-->=20=E6=95=99=E4=BB=A3=E4=BC=9A/=E5=B7=A5=E4=BB=A3?=
 =?UTF-8?q?=E4=BC=9A=E4=BB=A3=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TeacherCongressDelegatePushController.java     |  4 ++--
 ...acherCongressDelegatePushZgAuditController.java |  4 ++--
 .../teachercongress/delegate/push/dwFzrAudit.html  | 14 +++++++-------
 .../teachercongress/delegate/push/dwSjAudit.html   | 14 +++++++-------
 .../teachercongress/delegate/push/index.html       |  2 +-
 .../delegate/push/push-statistics-table.js         |  2 +-
 .../delegate/push/unionFzrAudit.html               | 14 +++++++-------
 .../teachercongress/delegate/push/zcAudit.html     | 14 +++++++-------
 8 files changed, 34 insertions(+), 34 deletions(-)

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"){
                         <span v-else>否</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="教代会代表" prop="isJdh">
+                <el-table-column label="教代会/工代会代表" prop="isJdh">
                     <template v-slot="{row}">
                         <span v-if="row.isJdh" style="color:#0037ff;">是</span>
                         <span v-else>否</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="工代会代表" prop="isGdh">
-                    <template v-slot="{row}">
-                        <span v-if="row.isGdh" style="color:#0037ff;">是</span>
-                        <span v-else>否</span>
-                    </template>
-                </el-table-column>
+<!--                <el-table-column label="工代会代表" prop="isGdh">-->
+<!--                    <template v-slot="{row}">-->
+<!--                        <span v-if="row.isGdh" style="color:#0037ff;">是</span>-->
+<!--                        <span v-else>否</span>-->
+<!--                    </template>-->
+<!--                </el-table-column>-->
                 <el-table-column label="代表类型" prop="representativeType"></el-table-column>
                 <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
                 <el-table-column prop="instanceState" label="流程状态">
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"){
                         <span v-else>否</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="教代会代表" prop="isJdh">
+                <el-table-column label="教代会/工代会代表" prop="isJdh">
                     <template v-slot="{row}">
                         <span v-if="row.isJdh" style="color:#0037ff;">是</span>
                         <span v-else>否</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="工代会代表" prop="isGdh">
-                    <template v-slot="{row}">
-                        <span v-if="row.isGdh" style="color:#0037ff;">是</span>
-                        <span v-else>否</span>
-                    </template>
-                </el-table-column>
+<!--                <el-table-column label="工代会代表" prop="isGdh">-->
+<!--                    <template v-slot="{row}">-->
+<!--                        <span v-if="row.isGdh" style="color:#0037ff;">是</span>-->
+<!--                        <span v-else>否</span>-->
+<!--                    </template>-->
+<!--                </el-table-column>-->
                 <el-table-column label="代表类型" prop="representativeType"></el-table-column>
                 <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
                 <el-table-column prop="instanceState" label="流程状态">
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"){
                         ></el-checkbox>
                     </template>
                 </el-table-column>
-                <el-table-column label="教代会代表" prop="isJdh" min-width="100">
+                <el-table-column label="教代会/工代会代表" prop="isJdh" min-width="100">
                     <template v-slot="{row}">
                         <el-checkbox
                                 v-if="row"
diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-statistics-table.js b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-statistics-table.js
index accfd5f..68ff924 100644
--- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-statistics-table.js
+++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/push-statistics-table.js
@@ -61,7 +61,7 @@ const PushStatisticsTable = {
                         ></el-checkbox>
                     </template>
                 </el-table-column>
-                <el-table-column label="教代会代表" prop="isJdh" min-width="100">
+                <el-table-column label="教代会/工代会代表" prop="isJdh" min-width="100">
                     <template v-slot="{row}">
                         <el-checkbox
                                 v-if="row"
diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/unionFzrAudit.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/unionFzrAudit.html
index f36c729..9b1473c 100644
--- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/unionFzrAudit.html
+++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegate/push/unionFzrAudit.html
@@ -79,18 +79,18 @@ layout("/layouts/platform.html"){
                         <span v-else>否</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="教代会代表" prop="isJdh">
+                <el-table-column label="教代会/工代会代表" prop="isJdh">
                     <template v-slot="{row}">
                         <span v-if="row.isJdh" style="color:#0037ff;">是</span>
                         <span v-else>否</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="工代会代表" prop="isGdh">
-                    <template v-slot="{row}">
-                        <span v-if="row.isGdh" style="color:#0037ff;">是</span>
-                        <span v-else>否</span>
-                    </template>
-                </el-table-column>
+<!--                <el-table-column label="工代会代表" prop="isGdh">-->
+<!--                    <template v-slot="{row}">-->
+<!--                        <span v-if="row.isGdh" style="color:#0037ff;">是</span>-->
+<!--                        <span v-else>否</span>-->
+<!--                    </template>-->
+<!--                </el-table-column>-->
                 <el-table-column label="代表类型" prop="representativeType"></el-table-column>
                 <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
                 <el-table-column prop="instanceState" label="流程状态">
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"){
                         <span v-else>否</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="教代会代表" prop="isJdh">
+                <el-table-column label="教代会/工代会代表" prop="isJdh">
                     <template v-slot="{row}">
                         <span v-if="row.isJdh" style="color:#0037ff;">是</span>
                         <span v-else>否</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="工代会代表" prop="isGdh">
-                    <template v-slot="{row}">
-                        <span v-if="row.isGdh" style="color:#0037ff;">是</span>
-                        <span v-else>否</span>
-                    </template>
-                </el-table-column>
+<!--                <el-table-column label="工代会代表" prop="isGdh">-->
+<!--                    <template v-slot="{row}">-->
+<!--                        <span v-if="row.isGdh" style="color:#0037ff;">是</span>-->
+<!--                        <span v-else>否</span>-->
+<!--                    </template>-->
+<!--                </el-table-column>-->
                 <el-table-column label="代表类型" prop="representativeType"></el-table-column>
                 <el-table-column prop="curTaskName" label="当前节点"></el-table-column>
                 <el-table-column prop="instanceState" label="流程状态">