补充显示

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){