From 1307506b0a80c1afc7571efb68172404078adfe2 Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Fri, 14 Feb 2025 17:04:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/HuzhouFieldchangehistoryServiceImpl.java      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java
index 4c8498b..1c0bfb5 100644
--- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java
+++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java
@@ -75,6 +75,7 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl<HuzhouField
         LambdaQueryWrapper<HuzhouFieldchangehistory> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.like(HuzhouFieldchangehistory::getFieldValue,fieldValue);
         queryWrapper.eq(HuzhouFieldchangehistory::getProjectid,projectid);
+        // 1进行中 2已完成
         queryWrapper.eq(HuzhouFieldchangehistory::getStatus,"1");
         List<HuzhouFieldchangehistory> fieldchangehistoryList = fieldchangehistoryMapper.selectList(queryWrapper);
         if(fieldchangehistoryList!=null&&fieldchangehistoryList.size()>0){
@@ -227,7 +228,12 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl<HuzhouField
                 huzhouFieldchangehistory.setStatus("1");
                 save(huzhouFieldchangehistory);
                 String superLeader = projectinfo.getSuperLeader();
-                WorkFlow workFlow = workflowService.createFlow("fieldChange",groupid);
+                WorkFlow workFlow =new WorkFlow();
+                if("manager".equals(fieldValue)){
+                    workFlow = workflowService.createFlow("manager",groupid);
+                }else {
+                    workFlow = workflowService.createFlow("fieldChange",groupid);
+                }
                 Task task = workFlow.getTask();
                 String taskId = task.getId();
                 String processInstanceId = workFlow.getProcessInstanceId();
@@ -359,7 +365,7 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl<HuzhouField
         List<HuzhouFieldchangehistory> list = list(queryWrapper);
         Map<String, HuzhouFieldchangehistory> nameMap = list.stream().collect(Collectors.toMap(HuzhouFieldchangehistory::getFieldValue, o -> o));
         List<HuzhouFieldchangehistory> result = new ArrayList<>();
-        List<String> sortList = Arrays.asList("projectName","constructionPeriod","superLeader","reformName","workplaceProperties","dutyWorkplace","adminDivision","projectContacts","totalMoney","centralMoney","provincialMoney","cityMoney",
+        List<String> sortList = Arrays.asList("projectName","manager","constructionPeriod","superLeader","reformName","workplaceProperties","dutyWorkplace","adminDivision","projectContacts","totalMoney","centralMoney","provincialMoney","cityMoney",
                 "countyMoney","selfMoney","payamount2023Money","payamount2024Money","payamount2025Money");
         for(String name:sortList){
             if(nameMap.get(name)!=null){