Commit 1bc472b528a300bc4a3521561eb8aa6541b65d16
1 parent
555bac15
feat: 添加创建人以及创建事件
Showing
3 changed files
with
7 additions
and
0 deletions
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/candidate/BpmCandidateSourceInfo.java
| @@ -33,6 +33,9 @@ public class BpmCandidateSourceInfo { | @@ -33,6 +33,9 @@ public class BpmCandidateSourceInfo { | ||
| 33 | @NotEmpty(message = "不允许空规则") | 33 | @NotEmpty(message = "不允许空规则") |
| 34 | private Set<BpmTaskCandidateRuleVO> rules; | 34 | private Set<BpmTaskCandidateRuleVO> rules; |
| 35 | 35 | ||
| 36 | + @Schema(description = "发起抄送的用户") | ||
| 37 | + private String creator; | ||
| 38 | + | ||
| 36 | public void addRule(BpmTaskCandidateRuleVO vo) { | 39 | public void addRule(BpmTaskCandidateRuleVO vo) { |
| 37 | assert vo != null; | 40 | assert vo != null; |
| 38 | if (rules == null) { | 41 | if (rules == null) { |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/cc/BpmProcessInstanceCopyServiceImpl.java
| @@ -16,6 +16,7 @@ import org.springframework.stereotype.Service; | @@ -16,6 +16,7 @@ import org.springframework.stereotype.Service; | ||
| 16 | import org.springframework.validation.annotation.Validated; | 16 | import org.springframework.validation.annotation.Validated; |
| 17 | 17 | ||
| 18 | import javax.annotation.Resource; | 18 | import javax.annotation.Resource; |
| 19 | +import java.time.LocalDateTime; | ||
| 19 | import java.util.ArrayList; | 20 | import java.util.ArrayList; |
| 20 | import java.util.List; | 21 | import java.util.List; |
| 21 | import java.util.Set; | 22 | import java.util.Set; |
| @@ -71,6 +72,8 @@ public class BpmProcessInstanceCopyServiceImpl implements BpmProcessInstanceCopy | @@ -71,6 +72,8 @@ public class BpmProcessInstanceCopyServiceImpl implements BpmProcessInstanceCopy | ||
| 71 | } | 72 | } |
| 72 | copyDO.setStartUserId(FlowableUtils.getStartUserIdFromProcessInstance(processInstance)); | 73 | copyDO.setStartUserId(FlowableUtils.getStartUserIdFromProcessInstance(processInstance)); |
| 73 | copyDO.setName(FlowableUtils.getFlowName(processInstance.getProcessDefinitionId())); | 74 | copyDO.setName(FlowableUtils.getFlowName(processInstance.getProcessDefinitionId())); |
| 75 | + copyDO.setCreator(sourceInfo.getCreator()); | ||
| 76 | + copyDO.setCreateTime(LocalDateTime.now()); | ||
| 74 | List<BpmProcessInstanceCopyDO> copyList = new ArrayList<>(ccCandidates.size()); | 77 | List<BpmProcessInstanceCopyDO> copyList = new ArrayList<>(ccCandidates.size()); |
| 75 | for (Long userId : ccCandidates) { | 78 | for (Long userId : ccCandidates) { |
| 76 | BpmProcessInstanceCopyDO copy = BpmProcessInstanceCopyConvert.INSTANCE.copy(copyDO); | 79 | BpmProcessInstanceCopyDO copy = BpmProcessInstanceCopyConvert.INSTANCE.copy(copyDO); |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
| @@ -249,6 +249,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { | @@ -249,6 +249,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { | ||
| 249 | sourceInfo.setTaskId(reqVO.getId()); | 249 | sourceInfo.setTaskId(reqVO.getId()); |
| 250 | sourceInfo.setProcessInstanceId(instance.getId()); | 250 | sourceInfo.setProcessInstanceId(instance.getId()); |
| 251 | sourceInfo.addRule(reqVO.getCcCandidateRule()); | 251 | sourceInfo.addRule(reqVO.getCcCandidateRule()); |
| 252 | + sourceInfo.setCreator(String.valueOf(userId)); | ||
| 252 | if (!processInstanceCopyService.makeCopy(sourceInfo)) { | 253 | if (!processInstanceCopyService.makeCopy(sourceInfo)) { |
| 253 | throw new RuntimeException("抄送任务失败"); | 254 | throw new RuntimeException("抄送任务失败"); |
| 254 | } | 255 | } |