终验接口

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/FinalAcceptanceManage.java

@@ -13,7 +13,6 @@ import com.ningdatech.basic.util.NdDateUtils;
 import com.ningdatech.pmapi.common.constant.BizConst;
 import com.ningdatech.pmapi.common.enumeration.ProjectProcessStageEnum;
 import com.ningdatech.pmapi.common.helper.UserInfoHelper;
-import com.ningdatech.pmapi.common.statemachine.util.StateMachineUtils;
 import com.ningdatech.pmapi.common.util.ExcelDownUtil;
 import com.ningdatech.pmapi.common.util.ExcelExportStyle;
 import com.ningdatech.pmapi.projectdeclared.model.dto.DeclaredProjectExportDTO;
@@ -23,12 +22,14 @@ import com.ningdatech.pmapi.projectlib.enumeration.InstTypeEnum;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectTypeEnum;
 import com.ningdatech.pmapi.projectlib.helper.ProjectHelper;
+import com.ningdatech.pmapi.projectlib.manage.ProjectLibManage;
 import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO;
 import com.ningdatech.pmapi.projectlib.model.entity.Project;
 import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq;
 import com.ningdatech.pmapi.projectlib.model.vo.ProjectLibListItemVO;
 import com.ningdatech.pmapi.projectlib.service.IProjectService;
 import com.ningdatech.pmapi.staging.enums.MsgTypeEnum;
+import com.ningdatech.pmapi.sys.manage.NoticeManage;
 import com.ningdatech.pmapi.todocenter.constant.WorkNoticeContant;
 import com.ningdatech.pmapi.user.security.auth.model.UserFullInfoDTO;
 import com.ningdatech.pmapi.user.util.LoginUserUtil;
@@ -43,7 +44,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Collections;
@@ -66,7 +66,6 @@ public class FinalAcceptanceManage {
 
     private final IProjectService projectService;
     private final UserInfoHelper userInfoHelper;
-    private final StateMachineUtils stateMachineUtils;
 
     private final ProcessModelService processModelService;
 
@@ -74,6 +73,10 @@ public class FinalAcceptanceManage {
 
     private final DefaultDeclaredProjectManage declaredProjectManage;
 
+    private final NoticeManage noticeManage;
+
+    private final ProjectLibManage projectLibManage;
+
     /**
      * 待采购的-项目列表
      * @param req
@@ -238,12 +241,12 @@ public class FinalAcceptanceManage {
 
         //保存终验项目
         //生成新版本 并且进入下一状态
-//        projectInfo = projectLibManage.saveProjectWithVersionAndPass(projectInfo,instanceId, InstTypeEnum.CONSTRUCTION_PLAN_REVIEW.getCode());
-//
-//
-//        //发送给第一个审批人消息
-//        noticeManage.sendFirtUser(projectInfo,model.getFormName(),instanceId,
-//                WorkNoticeContant.PASS_MSG_TEMPLATE, MsgTypeEnum.PROJECT_REVIEW);
+        projectInfo = projectLibManage.saveProjectWithVersionAndPass(projectInfo,instanceId, InstTypeEnum.CONSTRUCTION_PLAN_REVIEW.getCode());
+
+
+        //发送给第一个审批人消息
+        noticeManage.sendFirtUser(projectInfo,model.getFormName(),instanceId,
+                WorkNoticeContant.PASS_MSG_TEMPLATE, MsgTypeEnum.PROJECT_REVIEW);
 
         return instanceId;
     }