From ab87cbb5c9b5d2b739e912b5990f617afb92d5fd Mon Sep 17 00:00:00 2001
From: zhouhefeng <zhouhefeng915@163.com>
Date: Tue, 18 Nov 2025 08:33:14 +0800
Subject: [PATCH] commit

---
 ...TeacherCongressDelegatePushController.java | 38 ++++++++++++++++++-
 .../views/layouts/v4/home/index.html          | 18 ++++-----
 2 files changed, 45 insertions(+), 11 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 e40b01a6..2541c0b5 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
@@ -378,8 +378,42 @@ public class TeacherCongressDelegatePushController {
         if (allocation == null) {
             return Result.success();
         }
-
         Sql sql = Sqls.create("""
+                SELECT
+                  info.*,
+                  ins.id AS instanceId,
+                  ins.businessNo,
+                  ins.state instanceState,
+                  ins.variable instanceVariable,
+                  ins.processDefineId instanceProcessDefineId,
+                  t.id taskId,
+                  t.taskName AS taskKey,
+                  t.displayName taskName,
+                  t.taskType,
+                  t.performType taskPerformType,
+                  t.taskState,
+                  t.finishTime,
+                  t.taskParentId,
+                  t.variable taskVariable,
+                  IFNULL(GROUP_CONCAT(DISTINCT nt.displayName),'结束') curTaskName,
+                  IF(rt.id IS NOT NULL, 1, 0) AS canRevoke
+                FROM
+                  wf_process_task t
+                  LEFT JOIN wf_process_instance ins ON ins.id = t.processInstanceId
+                  LEFT JOIN teacher_congress_delegate_push info ON info.id = ins.businessNo
+                  LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
+                  LEFT JOIN wf_process_task nt ON nt.processInstanceId = ins.id AND nt.taskState = 10
+                  LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10
+                $condition
+                """);
+        Cnd cnd = Cnd.NEW();
+        cnd.and("t.taskName", "=", "0cacd1e7-7bb2-47dd-818b-6a73062e0c62");
+        cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
+        cnd.andEX("info.sessionId", "=", sessionId);
+        cnd.andEX("info.unionId", "=", unionId);
+        cnd.andEX("info.representativeType", "=", "正式代表");
+        cnd.groupBy("t.id");
+      /*  Sql sql = Sqls.create("""
                 SELECT
                   info.*,
                   ins.id AS instanceId,
@@ -409,7 +443,7 @@ public class TeacherCongressDelegatePushController {
         cnd.andEX("info.sessionId", "=", sessionId);
         cnd.andEX("info.unionId", "=", unionId);
         cnd.andEX("info.representativeType", "=", "正式代表");
-        cnd.and("ins.state", "=", ProcessTaskStateEnum.FINISHED.getCode());
+        cnd.and("ins.state", "=", ProcessTaskStateEnum.FINISHED.getCode());*/
         sql.setCondition(cnd);
         List<NutMap> writeList = baseService.listMap(sql);
 
diff --git a/src/main/resources/views/layouts/v4/home/index.html b/src/main/resources/views/layouts/v4/home/index.html
index 57f47b69..48fb6273 100644
--- a/src/main/resources/views/layouts/v4/home/index.html
+++ b/src/main/resources/views/layouts/v4/home/index.html
@@ -3,7 +3,7 @@ layout("/layouts/v4/baseLayout.html"){
 #-->
 
 <style>
-	
+
     .section-banner {
         position: relative;
         overflow: hidden;
@@ -23,7 +23,7 @@ layout("/layouts/v4/baseLayout.html"){
     .section-wrapper {
         width: 100%;
     }
-    
+
     .home-grid {
 	    width: 80%;
 	    margin: 20px auto;
@@ -44,12 +44,12 @@ layout("/layouts/v4/baseLayout.html"){
 	    padding: 16px;
 	    transition: transform 0.2s, box-shadow 0.2s;
     }
-    
+
     .entry-card:hover {
 	    transform: translateY(-2px);
 	    box-shadow: 0 6px 16px rgba(0,0,0,0.12);
     }
-    
+
     .act-card {
 	    display: flex;
 	    align-items: center;
@@ -60,7 +60,7 @@ layout("/layouts/v4/baseLayout.html"){
 	    padding: 16px;
 	    transition: transform 0.2s, box-shadow 0.2s;
     }
-    
+
 </style>
 
 <div class="v4-container" id="v4-home-app">
@@ -71,20 +71,20 @@ layout("/layouts/v4/baseLayout.html"){
             <stats></stats>
         </div>
     </div>
-	
+
     <div class="">
 	    <user></user>
-	    
+
 	    <div class="home-grid">
 		    <div class="act-card">
 			    <act></act>
 		    </div>
-		    
+
 		    <div class="entry-card">
 			    <entry></entry>
 		    </div>
 	    </div>
-	    
+
 	    <jcdt :list="websiteNews.grassroots"></jcdt>
     </div>