Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/OverProjectFlowEnum.java

@@ -11,8 +11,8 @@ import java.util.Map;
 public enum OverProjectFlowEnum {
     竣工资料上传确认("1", "竣工资料上传确认", "ZLSCQR", "竣工资料上传待确认", "审核确认", "待确认"),
     上传竣工资料("2", "上传竣工资料", "SCJGZL", "竣工资料待上传", "竣工资料上传", "待上传"),
-    竣工资料审核并填写审核意见("3", "竣工资料审核并填写审核意见", "JGZLSH", "竣工资料待审核", "竣工资料审核", "待审核");
-
+    竣工资料审核并填写审核意见("3", "竣工资料审核并填写审核意见", "JGZLSH", "竣工资料待审核", "竣工资料审核", "待审核"),
+    竣工流程结束("4","竣工流程结束！","JGLCJS","项目已竣工","","");
     private final String status;
     private final String name;
     private final String code;

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectInitiationServiceImpl.java

@@ -556,7 +556,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
             //修改project表的流程状态
             Project project = projectService.getById(overProjectDto.getProjectId());
             project.setInstanceId(instanceId);
-            project.setStatus(getFlowTaskName(instanceId));
+            project.setStatus(getOverProjectFlowTaskName(instanceId));
             projectService.updateById(project);
             processRelationService.savePR(instanceId, project.getSequenceNbr(), ProcessTypeEnum.项目结项.getName());
             ProjectInitiation projectInitiation = new ProjectInitiation();
@@ -644,9 +644,28 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
         LambdaQueryWrapper<Project> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(Project::getInstanceId,instanceId);
         Project project = projectService.getOne(wrapper);
-        project.setStatus(getFlowTaskName(instanceId));
+        project.setStatus(getOverProjectFlowTaskName(instanceId));
         projectService.updateById(project);
         return project;
     }
 
+
+    /**
+     * 获取竣工流程当前任务名称
+     * @param instanceId
+     * @return
+     */
+    public String getOverProjectFlowTaskName(String instanceId){
+        AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
+        JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
+        String taskName = "竣工流程结束！";
+        try {
+            taskName=jsonObject.getString("name");
+        }catch (Exception e) {
+            log.error("当前流程名称为空");
+        }
+        return taskName;
+    }
+
+
 }