From df9bb2c9fbb20b6215bf6866bcbb7773cbeb9d30 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Mon, 13 Mar 2023 10:31:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E5=AE=A1=E6=88=90=E5=8A=9F=E5=90=8E?= =?UTF-8?q?=20=E5=85=A5=E6=9A=82=E5=AD=98=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/NdWorkNoticeStagingServiceImpl.java | 1 - .../pmapi/staging/utils/WorkNoticeFlowMapUtil.java | 44 ---------------------- .../pmapi/todocenter/manage/TodoCenterManage.java | 8 ++++ 3 files changed, 8 insertions(+), 45 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/staging/service/impl/NdWorkNoticeStagingServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/staging/service/impl/NdWorkNoticeStagingServiceImpl.java index 360a740..0bf01da 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/staging/service/impl/NdWorkNoticeStagingServiceImpl.java +++ b/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; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/staging/utils/WorkNoticeFlowMapUtil.java b/pmapi/src/main/java/com/ningdatech/pmapi/staging/utils/WorkNoticeFlowMapUtil.java index 67b6327..291ed21 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/staging/utils/WorkNoticeFlowMapUtil.java +++ b/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> workNoticeFlowFunctionMap = Maps.newHashMap(); /** * key 重试的次数 , value 是增加是描述 */ public Map 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)); - // - //} - /** * 扫描的间隔越来越长 秒数 */ diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java index c1de2ae..107113f 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java +++ b/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: