Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/staging/service/impl/NdWorkNoticeStagingServiceImpl.java

@@ -2,7 +2,6 @@ package com.ningdatech.pmapi.staging.service.impl;
 
 import com.ningdatech.pmapi.staging.contants.StagingContant;
 import com.ningdatech.pmapi.staging.enums.MsgTypeEnum;
-import com.ningdatech.pmapi.staging.model.entity.ProjectStaging;
 import com.ningdatech.pmapi.staging.model.entity.WorkNoticeStaging;
 import com.ningdatech.pmapi.staging.mapper.NdWorkNoticeStagingMapper;
 import com.ningdatech.pmapi.staging.service.INdWorkNoticeStagingService;

pmapi/src/main/java/com/ningdatech/pmapi/staging/utils/WorkNoticeFlowMapUtil.java

@@ -1,23 +1,9 @@
 package com.ningdatech.pmapi.staging.utils;
 
-import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
-
 import javax.annotation.PostConstruct;
-
-import com.ningdatech.pmapi.common.util.SendWorkNoticeUtil;
-import com.ningdatech.pmapi.staging.enums.MsgTypeEnum;
-import com.ningdatech.pmapi.staging.model.entity.WorkNoticeStaging;
-import com.ningdatech.pmapi.todocenter.bean.entity.WorkNoticeInfo;
 import org.springframework.stereotype.Component;
-
 import com.google.common.collect.Maps;
-import com.ningdatech.pmapi.projectdeclared.manage.ReviewByDeptJointManage;
-import com.ningdatech.pmapi.projectdeclared.manage.ReviewByProvincialDeptManage;
-import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
-import com.ningdatech.pmapi.projectlib.model.entity.Project;
-
 import lombok.RequiredArgsConstructor;
 
 /**
@@ -29,41 +15,11 @@ import lombok.RequiredArgsConstructor;
 @Component
 @RequiredArgsConstructor
 public class WorkNoticeFlowMapUtil {
-    //public Map<Integer, Function<WorkNoticeInfo,Boolean>> workNoticeFlowFunctionMap = Maps.newHashMap();
     /**
      * key 重试的次数 , value 是增加是描述
      */
     public Map<Integer, Integer> intervalTimeMap = Maps.newHashMap();
 
-    ///**
-    // *  初始化工作通知分派逻辑,代替了if-else部分
-    // *  key: 枚举 消息类型
-    // *  value: lambda表达式,最终会获取发送工作通知的函数
-    // */
-    //@PostConstruct
-    //public void workNoticeFlowFunctionInit(){
-    //    // 待审核
-    //    workNoticeFlowFunctionMap.put(MsgTypeEnum.AUDIT.getCode(),
-    //            workNoticeInfos-> SendWorkNoticeUtil.sendWorkNotice(workNoticeInfos));
-    //
-    //    // 审核通过
-    //    workNoticeFlowFunctionMap.put(MsgTypeEnum.PASS.getCode(),
-    //            workNoticeInfos-> SendWorkNoticeUtil.sendWorkNotice(workNoticeInfos));
-    //
-    //    // 被驳回
-    //    workNoticeFlowFunctionMap.put(MsgTypeEnum.REJECTED.getCode(),
-    //            workNoticeInfos-> SendWorkNoticeUtil.sendWorkNotice(workNoticeInfos));
-    //
-    //    // 被退回
-    //    workNoticeFlowFunctionMap.put(MsgTypeEnum.BACKED.getCode(),
-    //            workNoticeInfos-> SendWorkNoticeUtil.sendWorkNotice(workNoticeInfos));
-    //
-    //    // 被驳回
-    //    workNoticeFlowFunctionMap.put(MsgTypeEnum.REJECTED.getCode(),
-    //            workNoticeInfos-> SendWorkNoticeUtil.sendWorkNotice(workNoticeInfos));
-    //
-    //}
-
     /**
      *  扫描的间隔越来越长 秒数
      */

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java

@@ -32,6 +32,7 @@ import com.ningdatech.pmapi.projectlib.service.IProjectApplicationService;
 import com.ningdatech.pmapi.projectlib.service.IProjectService;
 import com.ningdatech.pmapi.staging.enums.MsgTypeEnum;
 import com.ningdatech.pmapi.staging.service.INdWorkNoticeStagingService;
+import com.ningdatech.pmapi.staging.service.IProjectStagingService;
 import com.ningdatech.pmapi.todocenter.bean.entity.WorkNoticeInfo;
 import com.ningdatech.pmapi.todocenter.model.dto.AdjustHandleDTO;
 import com.ningdatech.pmapi.todocenter.model.vo.ProcessProgressDetailVo;
@@ -105,6 +106,8 @@ public class TodoCenterManage {
     private final UserInfoHelper userInfoHelper;
     private final BuildUserUtils buildUserUtils;
 
+    private final IProjectStagingService projectStagingService;
+
 
     /**
      * 待办中心待我处理项目列表查询
@@ -273,6 +276,11 @@ public class TodoCenterManage {
                         // 当前项目状态是单位内部审核中
                         case UNDER_INTERNAL_AUDIT:
                             // 当前项目状态是预审中
+                            //先修改项目状态
+                            updatePassProjectStatus(userId, declaredProject);
+                            //然后入库暂存库
+                            projectStagingService.addByProject(declaredProject,"暂存入库 待提交部门联审");
+                            break;
                         case PRE_APPLYING:
                             // 当前项目状态是部门联审中
                         case DEPARTMENT_JOINT_REVIEW: