From 5173c99276023cac788875d5fa8d5cad84112777 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 04 八月 2025 00:36:00 +0800
Subject: [PATCH] dnc导入导出格式修改
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java | 62 +++++++++++-------------------
1 files changed, 23 insertions(+), 39 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 d644a61..b098e0a 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
@@ -38,6 +38,25 @@
String processDefinitionKey = flowCommonService.getDefinitionKey(processInstanceId);
+ 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(processInstanceId);
+ rec.setProcessDefinitionKey(processDefinitionKey);
+ 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);
@@ -46,7 +65,7 @@
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(processInstanceId);
@@ -57,57 +76,22 @@
save(rec);
}
- //妫�鏌cprogram涓簄ull鐨勬暟鎹�
- updateApproveRecords(processInstanceId,refList);
}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);
}
}
-
- /**
- * 鏇存柊浠ュ墠鏃犳枃浠舵椂鍊欑殑鏁版嵁銆�
- * @param processInstanceId
- */
- void updateApproveRecords(String processInstanceId,List<ProcessProgRef> refList) {
-
- 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