From f84acd29105807cec335f0be29639098cd994d88 Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Fri, 28 Mar 2025 16:56:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=9F=A5=E8=AF=A2sql?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml    | 2 +-
 .../huzhou/service/impl/HuzhouPlaninfoServiceImpl.java        | 4 ++++
 .../huzhou/service/impl/HuzhouProjectinfoServiceImpl.java     | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml
index d708ef7..127042f 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml
@@ -563,7 +563,7 @@ order by create_date desc
     </select>
     <select id="getTaskNames" resultType="java.lang.String" >
         select distinct(ta.name_) from act_ru_task ta where ta.execution_id_ in
-        (select ex.id_ from act_ru_execution ex where ex.proc_inst_id_=(select pro.processInstanceId from huzhou_processinfo pro where pro.projectId=#{planId} and pro.processstatus!=0))
+        (select ex.id_ from act_ru_execution ex where ex.proc_inst_id_=(select pro.processInstanceId from huzhou_processinfo pro where pro.projectId=#{planId} and pro.processstatus =1))
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java
index cd6e11e..6963b7e 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java
@@ -858,6 +858,10 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
 //        runtimeService.deleteProcessInstance("423634","停止流程");
 //        runtimeService.deleteProcessInstance("415628","停止流程");
 //        runtimeService.deleteProcessInstance("415680","停止流程");
+        //runtimeService.deleteProcessInstance("379365","停止流程");
+        //runtimeService.deleteProcessInstance("505605","停止流程");
+        //runtimeService.deleteProcessInstance("505605","停止流程");
+
 
         IPage<HuzhouProjectinfoOV> infoPageList = projectinfoService.getProjectInfoAndChildPageList(projectinfo, pageNo, pageSize,newStage);
         return infoPageList;
diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
index 0e4c16d..d082084 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java
@@ -1595,6 +1595,9 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
             ));
 
             // 分组
+            for (ProjectSummaryOV record : records) {
+                log.info("{}", record.getDutyWorkplace());
+            }
             Map<String, List<ProjectSummaryOV>> groupedRecords = new HashMap<>();
             groupedRecords.put("市卫健委", records.stream().filter(r -> shiweiJianwei.contains(r.getDutyWorkplace())).collect(Collectors.toList()));
             groupedRecords.put("市级医院", records.stream().filter(r -> shijiYiyuan.contains(r.getDutyWorkplace())).collect(Collectors.toList()));