From b78b0b9d8e97066610f35486be31011666e01744 Mon Sep 17 00:00:00 2001
From: pengqiang <1067496116@qq.com>
Date: Tue, 19 Apr 2022 17:34:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E9=97=AE=E9=A2=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/palmte/work/service/ProjectEstimateService.java   | 4 ++--
 .../java/cn/palmte/work/service/ProjectInstanceService.java   | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cn/palmte/work/service/ProjectEstimateService.java b/src/main/java/cn/palmte/work/service/ProjectEstimateService.java
index 2d46828..0181da1 100644
--- a/src/main/java/cn/palmte/work/service/ProjectEstimateService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectEstimateService.java
@@ -253,7 +253,7 @@ public class ProjectEstimateService {
                                              Admin admin) throws Exception {
         Project p = estimateAddSave(project, estimateBean, admin, ApproveStatusEnum.APPROVAL_PENDING);
 
-        projectInstanceService.startEstimateProcessInstance(p, admin);
+        //projectInstanceService.startEstimateProcessInstance(p, admin);
 
         estimateApprove(0, p, admin);
 
@@ -270,7 +270,7 @@ public class ProjectEstimateService {
         Project p = projectService.addProject(project, admin, approveStatusEnum);
         saveEstimate(p, estimateBean);
 
-        return project;
+        return p;
     }
     /**
      * 编辑概算保存项目并发起审核
diff --git a/src/main/java/cn/palmte/work/service/ProjectInstanceService.java b/src/main/java/cn/palmte/work/service/ProjectInstanceService.java
index 243d6a7..d068700 100644
--- a/src/main/java/cn/palmte/work/service/ProjectInstanceService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectInstanceService.java
@@ -4,6 +4,8 @@ import cn.palmte.work.bean.ApproveStatusEnum;
 import cn.palmte.work.bean.StatusEnum;
 import cn.palmte.work.config.activiti.ActConstant;
 import cn.palmte.work.model.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import top.jfunc.common.utils.CollectionUtil;
@@ -19,6 +21,7 @@ import java.util.stream.Collectors;
  */
 @Service
 public class ProjectInstanceService {
+    private static final Logger logger = LoggerFactory.getLogger(ActProcInsService.class);
     @Autowired
     private ProjectRepository projectRepository;
     @Autowired
@@ -93,6 +96,7 @@ public class ProjectInstanceService {
         HashMap<String, Object> variables = new HashMap<>();
         variables.put(ActConstant.KEY_PROJECT_TYPE, project.getType());
         String businessKey = String.valueOf(project.getId());
+        logger.info("startProcess processDefkey:{}, businessKey：{}", processDefkey, businessKey);
         String processInstanceId = actProcInsService.startProcessInstance(processDefkey, businessKey, variables);
 
         //保存流程实例id与项目的关联关系