Commit 7a6d1bdd791cc84f4746d6a096b6d0c7dc28bb2b

Authored by YunaiV
1 parent b88c09f4

【代码评审】BPM:删除表单数据触发器

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java
@@ -160,10 +160,10 @@ public interface BpmProcessInstanceService { @@ -160,10 +160,10 @@ public interface BpmProcessInstanceService {
160 /** 160 /**
161 * 删除 ProcessInstance 的变量 161 * 删除 ProcessInstance 的变量
162 * 162 *
163 - * @param processInstanceId 流程编号 163 + * @param id 流程编号
164 * @param variableNames 流程变量名 164 * @param variableNames 流程变量名
165 */ 165 */
166 - void removeProcessInstanceVariables(String processInstanceId, Collection<String> variableNames); 166 + void removeProcessInstanceVariables(String id, Collection<String> variableNames);
167 167
168 // ========== Event 事件相关方法 ========== 168 // ========== Event 事件相关方法 ==========
169 169
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
@@ -790,8 +790,8 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService @@ -790,8 +790,8 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
790 } 790 }
791 791
792 @Override 792 @Override
793 - public void removeProcessInstanceVariables(String processInstanceId, Collection<String> variableNames) {  
794 - runtimeService.removeVariables(processInstanceId, variableNames); 793 + public void removeProcessInstanceVariables(String id, Collection<String> variableNames) {
  794 + runtimeService.removeVariables(id, variableNames);
795 } 795 }
796 796
797 // ========== Event 事件相关方法 ========== 797 // ========== Event 事件相关方法 ==========
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/trigger/BpmFormDeleteTrigger.java
@@ -43,10 +43,10 @@ public class BpmFormDeleteTrigger implements BpmTrigger { @@ -43,10 +43,10 @@ public class BpmFormDeleteTrigger implements BpmTrigger {
43 return; 43 return;
44 } 44 }
45 45
46 - // 2.获取流程变量 46 + // 2. 获取流程变量
47 Map<String, Object> processVariables = processInstanceService.getProcessInstance(processInstanceId).getProcessVariables(); 47 Map<String, Object> processVariables = processInstanceService.getProcessInstance(processInstanceId).getProcessVariables();
48 48
49 - // 3.获取需要删除的表单字段 49 + // 3.1 获取需要删除的表单字段
50 Set<String> deleteFields = new HashSet<>(); 50 Set<String> deleteFields = new HashSet<>();
51 settings.forEach(setting -> { 51 settings.forEach(setting -> {
52 if (CollUtil.isEmpty(setting.getDeleteFields())) { 52 if (CollUtil.isEmpty(setting.getDeleteFields())) {
@@ -64,7 +64,7 @@ public class BpmFormDeleteTrigger implements BpmTrigger { @@ -64,7 +64,7 @@ public class BpmFormDeleteTrigger implements BpmTrigger {
64 } 64 }
65 }); 65 });
66 66
67 - // 4. 删除流程变量 67 + // 3.2 删除流程变量
68 if (CollUtil.isNotEmpty(deleteFields)) { 68 if (CollUtil.isNotEmpty(deleteFields)) {
69 processInstanceService.removeProcessInstanceVariables(processInstanceId, deleteFields); 69 processInstanceService.removeProcessInstanceVariables(processInstanceId, deleteFields);
70 } 70 }
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/trigger/BpmFormUpdateTrigger.java
@@ -41,10 +41,10 @@ public class BpmFormUpdateTrigger implements BpmTrigger { @@ -41,10 +41,10 @@ public class BpmFormUpdateTrigger implements BpmTrigger {
41 return; 41 return;
42 } 42 }
43 43
44 - // 2.获取流程变量 44 + // 2. 获取流程变量
45 Map<String, Object> processVariables = processInstanceService.getProcessInstance(processInstanceId).getProcessVariables(); 45 Map<String, Object> processVariables = processInstanceService.getProcessInstance(processInstanceId).getProcessVariables();
46 46
47 - // 3.更新流程变量 47 + // 3. 更新流程变量
48 for (FormTriggerSetting setting : settings) { 48 for (FormTriggerSetting setting : settings) {
49 if (CollUtil.isEmpty(setting.getUpdateFormFields())) { 49 if (CollUtil.isEmpty(setting.getUpdateFormFields())) {
50 continue; 50 continue;