ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 法规合规评估流程 法规工程师通过

Browse Source
This commit is contained in:
lijiarao
2024-01-22 17:38:17 +08:00
parent 8667a2e3bf
commit 87c29b5243
13 changed files with 736 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/controller/ActivitiController.java
+10 -10
View File
@@ -147,9 +147,9 @@ public class ActivitiController {
public Result<Object> complete(@RequestBody Map<String,Object> map) {
//todo 判断当前节点，执行不同的操作
String taskId = map.get("taskId").toString();
Integer commitFlag = Integer.valueOf(map.get("commitFlag").toString());
String commitText = map.get("commitText").toString();
String commitFile = map.get("commitFile").toString();
//Integer commitFlag = Integer.valueOf(map.get("commitFlag").toString());
//String commitText = map.get("commitText").toString();
//String commitFile = map.get("commitFile").toString();
Task task=taskService.createTaskQuery() // 创建任务查询
@@ -161,13 +161,13 @@ public class ActivitiController {
}else if ("其他起草人线下填写，上传".equals(taskName)){
}
//更新审批表为完成，填充数据
ProcessApprovalRecord approvalRecord = processApprovalRecordService.getToDoByTaskId(taskId);
approvalRecord.setCommitFlag(commitFlag == 1? CommitFlagEnum.PASS.getValue() : CommitFlagEnum.REJECT.getValue());
approvalRecord.setCommitText(commitText);
approvalRecord.setCommitFile(commitFile);
approvalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue());
approvalRecord.setEndTime(new Date());
processApprovalRecordService.updateById(approvalRecord);
//ProcessApprovalRecord approvalRecord = processApprovalRecordService.getToDoByTaskId(taskId);
//approvalRecord.setCommitFlag(commitFlag == 1? CommitFlagEnum.PASS.getValue() : CommitFlagEnum.REJECT.getValue());
//approvalRecord.setCommitText(commitText);
//approvalRecord.setCommitFile(commitFile);
//approvalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue());
//approvalRecord.setEndTime(new Date());
//processApprovalRecordService.updateById(approvalRecord);
//审批节点
taskService.complete(taskId, map);
return Result.OK();