报销审批最后节点通过时，流程状态改成5

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/common/CommonApi.java

@@ -0,0 +1,52 @@
+package com.jeeplus.test.cw.common;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.extra.spring.SpringUtil;
+import com.jeeplus.sys.utils.StringUtils;
+import io.swagger.annotations.Api;
+import org.flowable.bpmn.model.BpmnModel;
+import org.flowable.bpmn.model.FlowNode;
+import org.flowable.engine.RepositoryService;
+import org.flowable.engine.RuntimeService;
+import org.flowable.engine.TaskService;
+import org.flowable.task.api.Task;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(value = "/commonApi")
+public class CommonApi {
+
+    @Autowired
+    private TaskService taskService;
+    @Autowired
+    private RuntimeService runtimeService;
+
+    /**
+     * 根据procInsId获取当前流程节点名称
+     * @param procInsId
+     * @return
+     */
+    @GetMapping("/getTaskNameByProcInsId")
+    public ResponseEntity<String> getTaskNameByProcInsId(@RequestParam("procInsId") String procInsId) {
+        Task task = taskService.createTaskQuery().processInstanceId(procInsId).active().singleResult();
+        if (task!=null) {
+            //获取流程发布Id信息
+            String definitionId = runtimeService.createProcessInstanceQuery().processInstanceId(procInsId).singleResult().getProcessDefinitionId();
+            //获取bpm对象
+            BpmnModel bpmnModel = SpringUtil.getBean (RepositoryService.class).getBpmnModel(definitionId);
+            //传节点定义key 获取当前节点
+            FlowNode flowNode = (FlowNode) bpmnModel.getFlowElement(task.getTaskDefinitionKey());
+            if (ObjectUtil.isNotEmpty(flowNode)) {
+                if (StringUtils.isNotBlank(flowNode.getName())) {
+                    return ResponseEntity.ok(flowNode.getName());
+                }
+            }
+        }
+        return ResponseEntity.ok("");
+    }
+}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/common/FindUtils.java

@@ -9,7 +9,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class FindUtils {
+public class CommonUtils {
 
     /**
      * 判断当前用户是否拥有 “ 财务部门主任 ” 的角色

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/service/CwProjectRecordsService.java

@@ -4,24 +4,18 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.sys.domain.User;
 import com.jeeplus.sys.mapper.UserMapper;
-import com.jeeplus.sys.service.dto.RoleDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
-import com.jeeplus.sys.utils.Global;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.UserUtils;
-import com.jeeplus.test.cw.common.FindUtils;
-import com.jeeplus.test.cw.contractRegistration.domain.ContractFile;
+import com.jeeplus.test.cw.common.CommonUtils;
 import com.jeeplus.test.cw.contractRegistration.domain.ContractInfo;
 import com.jeeplus.test.cw.contractRegistration.mapper.ContractInfoMapper;
 import com.jeeplus.test.cw.projectRecords.domain.CwProjectClientContact;
@@ -38,25 +32,14 @@ import com.jeeplus.test.cw.projectRecords.service.mapstruct.CwProjectMembersWrap
 import com.jeeplus.test.cw.projectRecords.service.mapstruct.CwProjectRecordsWrapper;
 import com.jeeplus.test.cw.workClientInfo.domain.CwWorkClientContact;
 import com.jeeplus.test.cw.workClientInfo.service.CwWorkClientContactService;
-import com.jeeplus.test.cw.workClientInfo.service.CwWorkClientService;
 import com.jeeplus.test.cw.workClientInfo.service.dto.CwWorkClientBaseDTO;
 import com.jeeplus.test.mould.service.SerialnumTplService;
-import com.jeeplus.test.oss.domain.WorkAttachment;
-import com.jeeplus.test.oss.service.OSSClientService;
 import com.jeeplus.test.oss.service.OssService;
-import com.jeeplus.test.signature.domain.*;
-import com.jeeplus.test.signature.utils.SignaturePostUtil;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.data.redis.connection.jedis.JedisUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 
 import javax.annotation.Resource;
-import java.io.File;
-import java.lang.reflect.Type;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -129,7 +112,7 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
         // 如果当前用户是员工，则可以查看自己创建的项目以及所属项目组的项目
         String isBmzr = "0";
         UserDTO userDTO = UserUtils.getCurrentUserDTO();
-        if (FindUtils.haveRoleCwBmzr()) {
+        if (CommonUtils.haveRoleCwBmzr()) {
             isBmzr = "1";
         } else {
             isBmzr = "0";

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/service/CwProjectReportService.java

@@ -11,26 +11,17 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.google.gson.Gson;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.flowable.model.Flow;
 import com.jeeplus.flowable.service.FlowTaskService;
-import com.jeeplus.sys.domain.User;
 import com.jeeplus.sys.service.UserService;
 import com.jeeplus.sys.mapper.UserMapper;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.Global;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.UserUtils;
-import com.jeeplus.test.cw.common.FindUtils;
+import com.jeeplus.test.cw.common.CommonUtils;
 import com.jeeplus.test.cw.common.flowable.dto.CommitParamDTO;
-import com.jeeplus.test.cw.contractRegistration.domain.ContractInfo;
-import com.jeeplus.test.cw.invoice.domain.CwFinanceInvoice;
-import com.jeeplus.test.cw.invoice.service.dto.CwFinanceInvoiceDTO;
-import com.jeeplus.test.cw.invoice.service.mapstruct.CwFinanceInvoiceWrapper;
-import com.jeeplus.test.cw.projectRecords.domain.CwProjectRecords;
-import com.jeeplus.test.cw.projectRecords.service.dto.CwProjectRecordsDTO;
-import com.jeeplus.test.cw.projectRecords.service.mapstruct.CwProjectRecordsWrapper;
 import com.jeeplus.test.cw.projectReport.domain.*;
 import com.jeeplus.test.cw.projectReport.mapper.*;
 import com.jeeplus.test.cw.projectReport.service.dto.CwProjectReportDTO;
@@ -51,14 +42,12 @@ import com.jeeplus.test.oss.service.OssService;
 import com.jeeplus.test.signature.domain.*;
 import com.jeeplus.test.signature.utils.SignaturePostUtil;
 import com.jeeplus.test.workContract.service.dto.WorkAttachmentDto;
-import org.apache.commons.beanutils.BeanMap;
 import org.apache.commons.collections4.CollectionUtils;
 import org.flowable.bpmn.model.FlowNode;
 import org.flowable.engine.TaskService;
 import org.flowable.task.api.Task;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.connection.jedis.JedisUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -67,7 +56,6 @@ import javax.annotation.Resource;
 import java.io.File;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
 
 /**
  * @author: 王强
@@ -471,7 +459,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
         }
         String isBmzr = "0";
         UserDTO userDTO = UserUtils.getCurrentUserDTO();
-        if (FindUtils.haveRoleCwBmzr()) {
+        if (CommonUtils.haveRoleCwBmzr()) {
             isBmzr = "1";
         } else {
             isBmzr = "0";

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/service/CwProjectReportArchiveService.java

@@ -15,28 +15,22 @@ import com.jeeplus.sys.mapper.UserMapper;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.UserUtils;
-import com.jeeplus.test.cw.common.FindUtils;
+import com.jeeplus.test.cw.common.CommonUtils;
 import com.jeeplus.test.cw.projectRecords.domain.CwProjectRecords;
-import com.jeeplus.test.cw.projectReport.domain.CwProjectInfoData;
 import com.jeeplus.test.cw.projectReport.mapper.CwProjectInfoMapper;
 import com.jeeplus.test.cw.projectReportArchive.domain.CwProjectReportArchive;
 import com.jeeplus.test.cw.projectReportArchive.domain.CwProjectReportArchiveFile;
-import com.jeeplus.test.cw.projectReportArchive.domain.CwProjectReportArchiveReport;
 import com.jeeplus.test.cw.projectReportArchive.mapper.CwProjectReportArchiveFileMapper;
 import com.jeeplus.test.cw.projectReportArchive.mapper.CwProjectReportArchiveMapper;
 import com.jeeplus.test.cw.projectReportArchive.mapper.CwProjectReportArchiveReportMapper;
 import com.jeeplus.test.cw.projectRecords.mapper.CwProjectRecordsMapper;
 import com.jeeplus.test.cw.projectReportArchive.service.dto.CwProjectReportArchiveDTO;
-import com.jeeplus.test.cw.projectReportArchive.service.dto.CwProjectReportArchiveDetailDTO;
-import com.jeeplus.test.cw.projectReportArchive.service.dto.CwProjectReportArchiveReportDTO;
 import com.jeeplus.test.cw.projectReportArchive.service.dto.ReportDTO;
-import com.jeeplus.test.cw.projectReportArchive.service.mapstruct.CwProjectReportArchiveReportWrapper;
 import com.jeeplus.test.cw.projectReportArchive.service.mapstruct.CwProjectReportArchiveWrapper;
 import com.jeeplus.test.mould.service.SerialnumTplService;
 import com.jeeplus.test.oss.domain.WorkAttachment;
 import com.jeeplus.test.oss.mapper.OssServiceMapper;
 import com.jeeplus.test.oss.service.OssService;
-import com.jeeplus.test.program.configuration.projectList.service.dto.ProjectListDto;
 import com.jeeplus.test.workContract.service.dto.WorkAttachmentDto;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -46,7 +40,6 @@ import javax.annotation.Resource;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @Service
 @Transactional
@@ -139,7 +132,7 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
         }
         String isBmzr = "0";
         UserDTO userDTO = UserUtils.getCurrentUserDTO();
-        if (FindUtils.haveRoleCwBmzr()) {
+        if (CommonUtils.haveRoleCwBmzr()) {
             isBmzr = "1";
         } else {
             isBmzr = "0";