From 56f5157ae8dba22eb30fb6c7cb132f80b7161932 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 07 九月 2025 00:53:08 +0800
Subject: [PATCH] 派工界面增加选择主管工艺
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java | 76 +++++++++++++++++---------------------
1 files changed, 34 insertions(+), 42 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java
index 5160903..2ac2343 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java
@@ -1,9 +1,9 @@
package org.springblade.mdm.flow.service;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.flowable.task.api.Task;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
@@ -11,9 +11,7 @@
import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.mapper.ApproveRecordMapper;
import org.springblade.mdm.flow.vo.ApproveRecordVO;
-import org.springblade.mdm.program.entity.ProcessProgRef;
import org.springblade.mdm.program.service.ProcessProgRefService;
-import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -28,11 +26,35 @@
@AllArgsConstructor
public class ApproveRecordService extends BizServiceImpl<ApproveRecordMapper, ApproveRecord> {
private final ProcessProgRefService processProgRefService;
+ private final FlowCommonService flowCommonService;
public List<ApproveRecordVO> listByNcProgramId(Long ncProgramId) {
return this.getBaseMapper().listByNcProgramId(ncProgramId);
}
- public void saveApproveRecords(Task task, String processInstanceId, String operateResult, String comment) {
+ public void saveApproveRecords(Task task, String operateResult, String comment) {
+
+ String processDefinitionKey = flowCommonService.getDefinitionKey(task.getProcessInstanceId());
+
+ ApproveRecord rec = new ApproveRecord();
+ rec.setTaskName(task.getName());
+ rec.setComment(comment==null? StringUtils.EMPTY:comment);
+ //rec.setNcProgramId(refObj.getNcProgramId());
+ rec.setOperateResult(operateResult);//瀹℃壒缁撴灉
+ rec.setOperateTime(DateUtil.now());
+ rec.setProcessInstanceId(task.getProcessInstanceId());
+ rec.setProcessDefinitionKey(processDefinitionKey);
+ rec.setTaskDefinitionKey(task.getTaskDefinitionKey());
+ rec.setUserId(AuthUtil.getUserId());
+ rec.setUserNickname(AuthUtil.getNickName());
+
+ save(rec);
+ }
+ /*
+
+ public void saveApproveRecordsOld(Task task, String processInstanceId, String operateResult, String comment) {
+
+ String processDefinitionKey = flowCommonService.getDefinitionKey(processInstanceId);
+
LambdaQueryWrapper<ProcessProgRef> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ProcessProgRef::getProcessInstanceId, processInstanceId);
List<ProcessProgRef> refList = processProgRefService.list(queryWrapper);
@@ -40,64 +62,34 @@
for (ProcessProgRef refObj : refList) {
ApproveRecord rec = new ApproveRecord();
rec.setTaskName(task.getName());
- rec.setComment(comment);
- rec.setNcProgramId(refObj.getNcProgramId());
+ rec.setComment(comment==null? StringUtils.EMPTY:comment);
+
rec.setOperateResult(operateResult);//瀹℃壒缁撴灉
rec.setOperateTime(DateUtil.now());
rec.setProcessInstanceId(processInstanceId);
+ rec.setProcessDefinitionKey(processDefinitionKey);
rec.setUserId(AuthUtil.getUserId());
rec.setUserNickname(AuthUtil.getNickName());
save(rec);
}
- //妫�鏌cprogram涓簄ull鐨勬暟鎹�
- updateApproveRecords(processInstanceId);
}else{
//濡傛灉杩樻病鏈夊叧鑱旂殑绋嬪簭鏁版嵁锛屽垯鎻掑叆涓�涓猵rogramId涓簄ull鐨�
ApproveRecord rec = new ApproveRecord();
rec.setTaskName(task.getName());
+ rec.setTaskDefinitionId(task.getTaskDefinitionId());
+
+ rec.setComment(comment==null? StringUtils.EMPTY:comment);
rec.setProcessInstanceId(processInstanceId);
+ rec.setProcessDefinitionKey(processDefinitionKey);
rec.setOperateResult(operateResult);
rec.setOperateTime(DateUtil.now());
- rec.setNcProgramId(null);//绌虹殑绋嬪簭id
rec.setUserId(AuthUtil.getUserId());
rec.setUserNickname(AuthUtil.getNickName());
save(rec);
}
}
-
- void updateApproveRecords(String processInstanceId) {
- LambdaQueryWrapper<ProcessProgRef> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(ProcessProgRef::getProcessInstanceId, processInstanceId).isNull(ProcessProgRef::getNcProgramId);
- List<ProcessProgRef> refList = processProgRefService.list(queryWrapper);
- if(refList.isEmpty()) {
- return;
- }
- List<ApproveRecord> records = this.lambdaQuery().isNull(ApproveRecord::getNcProgramId).eq(ApproveRecord::getProcessInstanceId, processInstanceId).list();
- if(records.isEmpty()) {
- return;
- }
-
- for(ApproveRecord record:records) {
-
- for(int j=0;j< refList.size();j++) {
- ProcessProgRef refObj = refList.get(j);
-
- ApproveRecord record2 = new ApproveRecord();
- BeanUtils.copyProperties(record, record2);
- record2.setNcProgramId(refObj.getNcProgramId());
-
- if(j>0){
- record2.setId(null);
- save(record2);
- }else{
- updateById(record2);
- }
- }
-
- }
-
- }
+ */
}
--
Gitblit v1.9.3