From 9f6a7019bfbfe07f238822752776d0c1b9fab38c Mon Sep 17 00:00:00 2001 From: WendyYang Date: Mon, 13 Mar 2023 10:31:15 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=85=E8=AF=84?= =?UTF-8?q?=E5=AE=A1=E4=BC=9A=E8=AE=AE=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningdatech/pmapi/meeting/mapper/MeetingExpertMapper.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/mapper/MeetingExpertMapper.xml b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/mapper/MeetingExpertMapper.xml index f1fe5d8..0d0f1ce 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/mapper/MeetingExpertMapper.xml +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/mapper/MeetingExpertMapper.xml @@ -74,22 +74,22 @@ - and exists(select 1 from nd_expert_review ner where ner.project_id = np.id and ner.create_by = + exists(select 1 from nd_expert_review ner where ner.project_id = np.id and ner.create_by = me.expert_id and is_final = true) - and not exists(select 1 from nd_expert_review ner where ner.project_id = np.id and ner.create_by = + not exists(select 1 from nd_expert_review ner where ner.project_id = np.id and ner.create_by = me.expert_id and is_final = true) - and exists(select 1 from nd_expert_review ner where ner.project_id = np.id and ner.create_by = + exists(select 1 from nd_expert_review ner where ner.project_id = np.id and ner.create_by = me.expert_id) - and not exists(select 1 from nd_expert_review ner where ner.project_id = np.id and ner.create_by = + not exists(select 1 from nd_expert_review ner where ner.project_id = np.id and ner.create_by = me.expert_id) @@ -104,7 +104,7 @@ inner join meeting_expert me on m.id = me.meeting_id where m.is_inner_project = true - if(me.is_headman,,) + and if(me.is_headman,,) and me.expert_id = #{p.userId} 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 2/9] =?UTF-8?q?=E9=A2=84=E5=AE=A1=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E5=90=8E=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: From 5c498c3f47f9233dc61472601894f5cbafeab9e4 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Mon, 13 Mar 2023 10:39:07 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=8A=BD=E5=8F=96=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ningdatech/pmapi/meeting/manage/MeetingManage.java | 2 +- .../com/ningdatech/pmapi/meeting/task/ExpertInviteTask.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java index 30f61d5..47fa752 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java @@ -209,7 +209,7 @@ public class MeetingManage { Assert.isTrue(checkCount >= inviteCount, "可供抽取的专家数量不足"); } expertInviteManage.expertInviteByMeetingCreate(meeting, randomRules, avoidInfo); - expertInviteTask.addInviteExpertTaskByMeetingCreate(meeting.getId(), 5); + expertInviteTask.addInviteTaskByMeetingCreate(meeting.getId(), 5); LambdaUpdateWrapper update = Wrappers.lambdaUpdate(Meeting.class); update.set(Meeting::getInviteStatus, false); update.eq(Meeting::getId, meeting.getId()); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/task/ExpertInviteTask.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/task/ExpertInviteTask.java index f58915e..cd6b57c 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/task/ExpertInviteTask.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/task/ExpertInviteTask.java @@ -109,7 +109,7 @@ public class ExpertInviteTask { return; } for (InviteCacheDTO cache : caches.values()) { - addInviteExpertTask(cache.getMeetingId(), true, properties.getInviteDelay(), cache.getInvitedRefused()); + addInviteTask(cache.getMeetingId(), true, properties.getInviteDelay(), cache.getInvitedRefused()); } } @@ -156,7 +156,7 @@ public class ExpertInviteTask { tmpInvitedRefused = invitedRefused[0]; } if (!INVITE_MAP.containsKey(meetingId)) { - addInviteExpertTask(meetingId, false, properties.getInviteDelay(), tmpInvitedRefused); + addInviteTask(meetingId, false, properties.getInviteDelay(), tmpInvitedRefused); log.info("重置会议的随机抽取状态：{}", meetingId); LambdaUpdateWrapper update = Wrappers.lambdaUpdate(Meeting.class); update.set(Meeting::getInviteStatus, false); @@ -176,7 +176,7 @@ public class ExpertInviteTask { * @param invitedRefused 是否可以邀请被拒绝的专家 * @author WendyYang **/ - public void addInviteExpertTask(Long meetingId, boolean checked, int delayedMinutes, boolean invitedRefused) { + public void addInviteTask(Long meetingId, boolean checked, int delayedMinutes, boolean invitedRefused) { if (checked && !inviteCountCheck(meetingId)) { // 如果抽取数量满足直接返回 return; @@ -201,9 +201,9 @@ public class ExpertInviteTask { * @param delayedMinutes 延迟时间 * @author WendyYang **/ - public void addInviteExpertTaskByMeetingCreate(Long meetingId, int delayedMinutes) { + public void addInviteTaskByMeetingCreate(Long meetingId, int delayedMinutes) { Assert.isTrue(properties.getEnable(), "随机邀请已关闭"); - addInviteExpertTask(meetingId, false, delayedMinutes, false); + addInviteTask(meetingId, false, delayedMinutes, false); InviteCacheDTO cacheVal = InviteCacheDTO.of(meetingId, false); cachePlusOps.hSet(getCacheKey(meetingId), cacheVal); } From d9953c41c71dd45e2a1a2bc0e7698c7e2b0ecc5e Mon Sep 17 00:00:00 2001 From: WendyYang Date: Mon, 13 Mar 2023 10:46:50 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=8A=BD=E5=8F=96=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/meeting/task/ExpertInviteTask.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/task/ExpertInviteTask.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/task/ExpertInviteTask.java index cd6b57c..8b0b0ac 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/task/ExpertInviteTask.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/task/ExpertInviteTask.java @@ -78,9 +78,9 @@ public class ExpertInviteTask { private final YxtCallOrSmsHelper yxtCallOrSmsHelper; /** - * 用来存入线程执行情况, 方便于停止定时任务时使用 + * 用来存入线程执行句柄, 停止定时任务时使用 */ - protected static final ConcurrentMap> INVITE_MAP = new ConcurrentHashMap<>(); + private static final ConcurrentMap> INVITE_TASK_MAP = new ConcurrentHashMap<>(); public ExpertInviteTask currProxy() { return (ExpertInviteTask) AopContext.currentProxy(); @@ -155,7 +155,7 @@ public class ExpertInviteTask { if (ArrayUtil.isNotEmpty(invitedRefused)) { tmpInvitedRefused = invitedRefused[0]; } - if (!INVITE_MAP.containsKey(meetingId)) { + if (!INVITE_TASK_MAP.containsKey(meetingId)) { addInviteTask(meetingId, false, properties.getInviteDelay(), tmpInvitedRefused); log.info("重置会议的随机抽取状态：{}", meetingId); LambdaUpdateWrapper update = Wrappers.lambdaUpdate(Meeting.class); @@ -190,7 +190,7 @@ public class ExpertInviteTask { log.error("执行专家邀请任务异常：{}", meetingId, e); } }, startTime, Duration.ofMinutes(properties.getInviteFixedRate())); - INVITE_MAP.putIfAbsent(meetingId, future); + INVITE_TASK_MAP.putIfAbsent(meetingId, future); log.info("添加专家抽取后台任务：{}", meetingId); } @@ -208,6 +208,12 @@ public class ExpertInviteTask { cachePlusOps.hSet(getCacheKey(meetingId), cacheVal); } + /** + * 抽取过程 + * + * @param meetingId 会议ID + * @param invitedRefused 是否可以邀请已拒绝的专家 + */ @Transactional(rollbackFor = Exception.class) public void invite(Long meetingId, Boolean invitedRefused) { log.info("开始进行专家后台抽取：{}", meetingId); @@ -269,9 +275,9 @@ public class ExpertInviteTask { log.info("终止专家抽取：{}", meetingId); meetingService.stopRandomInvite(meetingId); cachePlusOps.hDel(getCacheKey(meetingId)); - ScheduledFuture future = INVITE_MAP.get(meetingId); + ScheduledFuture future = INVITE_TASK_MAP.get(meetingId); if (future != null) { - INVITE_MAP.remove(meetingId); + INVITE_TASK_MAP.remove(meetingId); if (!future.isCancelled()) { future.cancel(true); } From 4a68ff1deede6d1082181771d55b833508a0c921 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Mon, 13 Mar 2023 11:02:58 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E9=A2=84=E5=AE=A1=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E5=90=8E=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 --- .../ningdatech/pmapi/todocenter/manage/TodoCenterManage.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 107113f..f1fb5ff 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 @@ -275,18 +275,18 @@ public class TodoCenterManage { switch (Objects.requireNonNull(ProjectStatusEnum.getValue(projectStatus))) { // 当前项目状态是单位内部审核中 case UNDER_INTERNAL_AUDIT: - // 当前项目状态是预审中 + // 当前项目状态是预审中 + case PRE_APPLYING: //先修改项目状态 updatePassProjectStatus(userId, declaredProject); //然后入库暂存库 projectStagingService.addByProject(declaredProject,"暂存入库 待提交部门联审"); break; - case PRE_APPLYING: - // 当前项目状态是部门联审中 + // 当前项目状态是部门联审中 case DEPARTMENT_JOINT_REVIEW: - // 当前项目状态是方案评审中 + // 当前项目状态是方案评审中 case SCHEME_UNDER_REVIEW: - // 当前项目状态是终验审核中 + // 当前项目状态是终验审核中 case FINAL_ACCEPTANCE_IS_UNDER_REVIEW: updatePassProjectStatus(userId, declaredProject); break; From afe86cdfb7ba08ba380d5a76cf9d331252ada476 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Mon, 13 Mar 2023 11:24:10 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E9=83=A8=E9=97=A8=E8=81=94=E5=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/projectdeclared/manage/ReviewByDeptJointManage.java | 4 ++-- .../com/ningdatech/pmapi/scheduler/task/ProjectStatusFlowTask.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewByDeptJointManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewByDeptJointManage.java index 5b91655..e21371f 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewByDeptJointManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewByDeptJointManage.java @@ -63,8 +63,8 @@ public class ReviewByDeptJointManage { */ @Transactional(rollbackFor = Exception.class) public Boolean startTheProcess(Project project) { - Long userId = LoginUserUtil.getUserId(); - VUtils.isTrue(Objects.isNull(userId)).throwMessage("获取登录用户失败!"); + //这里是任务发起的 所以用项目发起人 + Long userId = project.getSponsor(); VUtils.isTrue(Objects.isNull(project.getId())).throwMessage("提交失败 缺少项目ID!"); Project projectInfo = projectService.getById(project.getId()); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/ProjectStatusFlowTask.java b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/ProjectStatusFlowTask.java index be813f4..8865be1 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/ProjectStatusFlowTask.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/ProjectStatusFlowTask.java @@ -82,7 +82,7 @@ public class ProjectStatusFlowTask { projectStagingService.removeById(projectStaging); } }catch (Exception e){ - log.error("项目流转 异常 projectId:【" + projectStaging.getProjectId() + "】 异常内容:" + e); + log.error("项目流转 异常 projectId:【" + projectStaging.getProjectId() + "】 异常内容:" + e.getMessage()); }finally { //增加重试的次数 和下次扫描时间 projectStagingService.addRetryTimes(projectStaging); From b32d2eb98798b4bd08ffa2a101e7f3a24131e19c Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Mon, 13 Mar 2023 11:50:18 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E9=83=A8=E9=97=A8=E8=81=94=E5=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 f1fb5ff..83be119 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 @@ -273,8 +273,6 @@ public class TodoCenterManage { // 并向流程发起人发送浙政钉工作通知：【项目名称】已通过【流程名称】，请及时开始下一步操作。 if (HisProInsEndActId.END.equals(newInstance.getEndActivityId())) { switch (Objects.requireNonNull(ProjectStatusEnum.getValue(projectStatus))) { - // 当前项目状态是单位内部审核中 - case UNDER_INTERNAL_AUDIT: // 当前项目状态是预审中 case PRE_APPLYING: //先修改项目状态 @@ -282,6 +280,8 @@ public class TodoCenterManage { //然后入库暂存库 projectStagingService.addByProject(declaredProject,"暂存入库 待提交部门联审"); break; + // 当前项目状态是单位内部审核中 + case UNDER_INTERNAL_AUDIT: // 当前项目状态是部门联审中 case DEPARTMENT_JOINT_REVIEW: // 当前项目状态是方案评审中 From 1af0008fd06d5d10676455f0eb88728c60514d49 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Mon, 13 Mar 2023 11:52:33 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E9=83=A8=E9=97=A8=E8=81=94=E5=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/projectdeclared/manage/ReviewByDeptJointManage.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewByDeptJointManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewByDeptJointManage.java index e21371f..5159896 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewByDeptJointManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewByDeptJointManage.java @@ -51,8 +51,6 @@ public class ReviewByDeptJointManage { private final ProcessInstanceService processService; private final IProjectInstService projectInstService; - - private final UserInfoHelper userInfoHelper; private final DefaultDeclaredProjectManage declaredProjectManage; private final DefaultDeclaredProjectManage defaultDeclaredProjectManage; @@ -122,8 +120,6 @@ public class ReviewByDeptJointManage { try { project.setUpdateOn(LocalDateTime.now()); project.setInstCode(instanceId); - project.setStage(ProjectStatusEnum.NOT_APPROVED.getCode()); - project.setStatus(ProjectStatusEnum.UNDER_INTERNAL_AUDIT.getCode()); projectService.updateById(project); //保存项目和实例的关系 ProjectInst projectInst = new ProjectInst(); From 54ba54531ba3350eb016ceeb96dd20e55d367053 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Mon, 13 Mar 2023 15:43:20 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/expert/controller/ReviewTemplateSettingsController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ReviewTemplateSettingsController.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ReviewTemplateSettingsController.java index dc0dc15..244ea81 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ReviewTemplateSettingsController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ReviewTemplateSettingsController.java @@ -45,14 +45,14 @@ public class ReviewTemplateSettingsController { } @GetMapping("/template") - @ApiModelProperty("根据模版ID获取评审模版") + @ApiOperation("根据模版ID获取评审模版") @ApiImplicitParam(name = "templateId", defaultValue = "模版ID") public ReviewTemplateVO getTemplateById(@RequestParam Long templateId) { return reviewTemplateSettingsManage.getReviewTemplateSettings(templateId); } @GetMapping("/templates") - @ApiModelProperty("（批量）根据模版ID获取评审模版") + @ApiOperation("（批量）根据模版ID获取评审模版") @ApiImplicitParam(name = "templateIds", defaultValue = "模版ID集合") public List getTemplateById(@RequestParam List templateIds) { return reviewTemplateSettingsManage.listReviewTemplateSettings(templateIds);