From 32d85d167c9d9531540cbdfc694f4ece5403dc9b Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Wed, 19 Apr 2023 09:54:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E5=AF=BC=E5=85=A5?= =?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/todocenter/manage/HandlerManage.java | 43 +++++++++++---------- .../pmapi/todocenter/manage/TodoCenterManage.java | 3 ++ ...2023年数字化项目年度计划编辑表.xls | Bin 30720 -> 31744 bytes 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/HandlerManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/HandlerManage.java index e0bdff9..49c6e3e 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/HandlerManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/HandlerManage.java @@ -1,6 +1,25 @@ package com.ningdatech.pmapi.todocenter.manage; -import cn.hutool.core.collection.CollUtil; +import static com.ningdatech.pmapi.todocenter.constant.WorkNoticeContant.*; + +import java.time.LocalDateTime; +import java.util.HashMap; +import java.util.List; +import java.util.Objects; +import java.util.Optional; +import java.util.stream.Collectors; + +import org.apache.commons.lang3.StringUtils; +import org.flowable.engine.HistoryService; +import org.flowable.engine.RuntimeService; +import org.flowable.engine.TaskService; +import org.flowable.engine.history.HistoricProcessInstance; +import org.flowable.engine.task.Comment; +import org.flowable.variable.api.history.HistoricVariableInstance; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ningdatech.basic.exception.BizException; @@ -20,7 +39,6 @@ import com.ningdatech.pmapi.staging.enums.MsgTypeEnum; import com.ningdatech.pmapi.staging.service.IProjectStagingService; import com.ningdatech.pmapi.sys.manage.NoticeManage; import com.ningdatech.pmapi.todocenter.constant.TodoCenterContant; -import com.ningdatech.pmapi.user.service.IUserInfoService; import com.ningdatech.pmapi.user.util.LoginUserUtil; import com.wflow.contants.HisProInsEndActId; import com.wflow.workflow.bean.process.ProgressNode; @@ -28,24 +46,10 @@ import com.wflow.workflow.bean.process.enums.NodeTypeEnum; import com.wflow.workflow.bean.vo.ProcessProgressVo; import com.wflow.workflow.enums.ProcessHandlerEnum; import com.wflow.workflow.service.ProcessInstanceService; + +import cn.hutool.core.collection.CollUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.flowable.engine.HistoryService; -import org.flowable.engine.RuntimeService; -import org.flowable.engine.TaskService; -import org.flowable.engine.history.HistoricProcessInstance; -import org.flowable.engine.task.Comment; -import org.flowable.variable.api.history.HistoricVariableInstance; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - -import java.time.LocalDateTime; -import java.util.*; -import java.util.stream.Collectors; - -import static com.ningdatech.pmapi.todocenter.constant.WorkNoticeContant.*; /** * @Classname HandlerManage @@ -62,7 +66,6 @@ public class HandlerManage { private final TaskService taskService; private final HistoryService historyService; - private final IUserInfoService userInfoService; private final IProjectService projectService; private final StateMachineUtils stateMachineUtils; private final ProcessInstanceService processInstanceService; @@ -125,7 +128,7 @@ public class HandlerManage { throw new IllegalStateException("Unexpected value: " + declaredProject.getStatus()); } //发送消息 - noticeManage.sendNotice(currentEmployeeCode,userId,declaredProject,instance.getProcessDefinitionName(), + noticeManage.sendNotice(instance.getStartUserId(),userId,declaredProject,instance.getProcessDefinitionName(), PASS_MSG_TEMPLATE2,MsgTypeEnum.PROJECT_REVIEW_PASS); } else { // 若有下一个审核人(当前节点的用户)， 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 1c81f09..516db34 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 @@ -209,6 +209,7 @@ public class TodoCenterManage { Project projectInfo = projectInfoMap.get(d.getInstanceId()); ResToBeProcessedVO res = new ResToBeProcessedVO(); BeanUtils.copyProperties(projectInfo, res); + res.setInstCode(d.getInstanceId()); res.setProjectId(projectInfo.getId()); res.setBuildOrg(projectInfo.getBuildOrgName()); res.setDeclaredAmount(projectInfo.getDeclareAmount()); @@ -524,6 +525,7 @@ public class TodoCenterManage { ResToBeProcessedVO res = new ResToBeProcessedVO(); Project projectInfo = projectInfoMap.get(d.getInstanceId()); BeanUtils.copyProperties(projectInfo, res); + res.setInstCode(d.getInstanceId()); res.setBuildOrg(projectInfo.getBuildOrgName()); res.setDeclaredAmount(projectInfo.getDeclareAmount()); res.setProjectId(projectInfo.getId()); @@ -802,6 +804,7 @@ public class TodoCenterManage { ResToBeProcessedVO res = new ResToBeProcessedVO(); Project project = projectInfoMap.get(d.getInstanceId()); BeanUtils.copyProperties(project, res); + res.setInstCode(d.getInstanceId()); res.setNodeId(d.getNodeId()); res.setProjectId(project.getId()); res.setBuildOrg(project.getBuildOrgName()); diff --git a/template/丽水市2023年数字化项目年度计划编辑表.xls b/template/丽水市2023年数字化项目年度计划编辑表.xls index 04432a460dc4fe4451f107f0f4de29fc77241fe0..d078e2ab7bd1bfd59b168e64110c5e1dd201ebc9 100644 GIT binary patch delta 2448 zcmZ`*ZA@Eb6h80ew&k0)z}iwenUjwSD`oN}Utu#rXM`~qluQQ!+5)q{r7+xNONqum zekAIfEXHJhB$^l_33?O%EX$UdxL^L+ek>SSwnhJ#pfmoEk+Ax__qHz-YMXm|pZ7WE zIp;m+^xnJlfGusX4?0-$cbzvFYv&f_hOd!`ns7WyBog9i#r4xT+HiE}_Y@cVNR8(7 z-@0@1)z~U);b+yi6vw!}sorOd^fl{Ox%?AHfG;`RTyr}4FOELGg6kS*P}iK z`q#z5EN*uPx#n)xyIhwTo8{|nmwEQgvNEDUgcBd-dc|ETAsa4dxzFPQ>mfR4aFWe7 z*j|H$?=CjiU@uD6;pndDu1G1H?D96tz)Iyj!*^|)&EQ*5CbAN79R%H7zMYa~cIfVk zJ0)3%9lr23_nQxyS$?@}7&X}{6O}3T)~BMR`S%;SGLGO7kES610L|_TdJ9pJ_P!cKdf%$ZT?G^zsW@lV#UH08@c%{e--oa zO@D`8TYE*xIz*NHw?M%1FICZbA(PcWLA|K{TCU|G9iunI(!RqOho^`u1@t_r#9Ahb zhAXH+Uu|nID_M5lX#o<(WxOlIFQS1pILfg(XJnP>0=i6 z5?iE2iclE;<0%>;jb5NhnxlEdn5O`)!W6^G2t}!n&cbHYSji(MXbt2Hox#!=%#Trs z3NjIW@SlQF=`J#!beo2=5DFoJ5SqmGH07Jtqgb3o_z)e1%$$*4j!B73d$15QGTvkV z44sEu6oKugeaJ{O3Yi$LLKHuOv}T|$5^$O}BLLG_5sF&K*si%eP!(U{TF5TzN!DJdYdMH_eVDS?R5 zB%wNyE|4l={r}f)|Us&Q>luP0c{4RNMHW33Vmq?-a$R|-2(0++j zpvNS#z^_6gE4Tv^*}y$6Q8v&)f#OE^9Ka_enF~}YQ65m0MEO9~5)~jsjYNe&eu;{J zo|MQAR4b7KsLnu5V)ssn9+G4+P(Y#*pn8c)fr3PQd8pTWP8AR8qxjxLH@>At)}=V< z2P=`ve;u!M^hiY9~`4VqZ`pwyZ^*?Uf@$>)y delta 1325 zcmZuxYe*DP6h3!$c2?Kd&ek^j8rw1xt$c)!k`(Pv6c`m0k)`yoG&I)0FjEktUlolV z2niH|f`}yT{wz%}vOfjYuO5a4{fMxPz)aHZ+*xoktm=R^$YeJ35ap!%gywszhEDDDEO|iG?y3#a)!Q!9rCRafu!6H<7}0Vz4w8TW0 zb{?&>12O=aRSaJ4%^b5@b-@ z9TAjfz>R9gEEZ?pusJ}(=UMBS7k^}Jv;PDioD=>$bHjjS{|)JIp45r>Jjex!9zTEzmqwtCGpLs^YQ~-41JZ)SUQeX7D$r^xpw%LyQP3JTxP%t64h{$ctnsC(iGC7b_di!Dpu77*lKL4{ge`#W5}k@8a!R6 z>uW7r0`bx;Es?Z!{C3@0i7BYn=OufHBx>@IC<;GNe~)3Pq4ePyuOtt4z3aeWxFe4K kbad=P5quf;;$YZIZH{4iqsAw~A7llZIsNDO>!xhwA7+