代码还原

jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/service/impl/BillApproveStatusService.java

@@ -1,6 +1,5 @@
 package com.jeelowcode.service.bpm.service.impl;
 
-import cn.hutool.json.JSONObject;
 import com.jeelowcode.core.framework.entity.FormEntity;
 import com.jeelowcode.core.framework.enums.ApproveStatusEnum;
 import com.jeelowcode.core.framework.mapper.FormMapper;
@@ -10,9 +9,13 @@ import com.jeelowcode.service.bpm.controller.vo.instance.BpmProcessInstanceRespV
 import com.jeelowcode.service.bpm.service.IBpmProcessInstanceService;
 import com.jeelowcode.tool.framework.datapermission.core.annotation.DataPermission;
 import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.impl.persistence.entity.ExecutionEntityImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
 
 @Service
 @Slf4j
@@ -24,6 +27,8 @@ public class BillApproveStatusService {
 
 
     public void afterSubmit(String processInstanceId){
+
+        Map<String,Object> map = new HashMap<>();
         //流程实例id
         BpmProcessInstanceRespVO vo = SpringUtils.getBean(IBpmProcessInstanceService.class).getProcessInstanceVO(processInstanceId);
         //获取到的自定义表单数据id
@@ -32,16 +37,17 @@ public class BillApproveStatusService {
         Long formId = vo.getProcessDefinition().getFormId();
         FormEntity formEntity = SpringUtils.getBean(FormMapper.class).getByWebId(formId);
 
-        // 使用 editJsonData 方法，这样会触发增强机制
+        Map<String,Object> json = new HashMap<>();
-        JSONObject json = new JSONObject();
-        json.put("id", id);
         json.put(ApproveStatusEnum.codeField, ApproveStatusEnum.APPROVING.getCode());
         json.put(ApproveStatusEnum.nameField, ApproveStatusEnum.APPROVING.getDesc());
-        json.put("processInstanceId", processInstanceId);
+        json.put("ProcessInstanceId", processInstanceId);
-        dbformDataService.editJsonData(formEntity.getId(), json);
+        dbformDataService.update(formEntity.getTableName(),id,json);
+
     }
 
     public void afterApproved(String processInstanceId){
+
+        Map<String,Object> map = new HashMap<>();
         //流程实例id
         BpmProcessInstanceRespVO vo = SpringUtils.getBean(IBpmProcessInstanceService.class).getProcessInstanceVO(processInstanceId);
         //获取到的自定义表单数据id
@@ -49,15 +55,17 @@ public class BillApproveStatusService {
         //数据表id
         Long formId = vo.getProcessDefinition().getFormId();
         FormEntity formEntity = SpringUtils.getBean(FormMapper.class).getByWebId(formId);
-        // 使用 editJsonData 方法，这样会触发增强机制
+
-        JSONObject json = new JSONObject();
+        Map<String,Object> json = new HashMap<>();
-        json.put("id", id);
         json.put(ApproveStatusEnum.codeField, ApproveStatusEnum.APPROVED.getCode());
         json.put(ApproveStatusEnum.nameField, ApproveStatusEnum.APPROVED.getDesc());
-        dbformDataService.editJsonData(formEntity.getId(), json);
+        dbformDataService.update(formEntity.getTableName(),id,json);
+
     }
 
     public void afterRejected(String processInstanceId){
+
+        Map<String,Object> map = new HashMap<>();
         //流程实例id
         BpmProcessInstanceRespVO vo = SpringUtils.getBean(IBpmProcessInstanceService.class).getProcessInstanceVO(processInstanceId);
         //获取到的自定义表单数据id
@@ -65,16 +73,18 @@ public class BillApproveStatusService {
         //数据表id
         Long formId = vo.getProcessDefinition().getFormId();
         FormEntity formEntity = SpringUtils.getBean(FormMapper.class).getByWebId(formId);
-        // 使用 editJsonData 方法，这样会触发增强机制
+
-        JSONObject json = new JSONObject();
+        Map<String,Object> json = new HashMap<>();
-        json.put("id", id);
         json.put(ApproveStatusEnum.codeField, ApproveStatusEnum.REJECTED.getCode());
         json.put(ApproveStatusEnum.nameField, ApproveStatusEnum.REJECTED.getDesc());
-        dbformDataService.editJsonData(formEntity.getId(), json);
+        dbformDataService.update(formEntity.getTableName(),id,json);
+
     }
 
 
     public void afterCancel(String processInstanceId){
+
+        Map<String,Object> map = new HashMap<>();
         //流程实例id
         BpmProcessInstanceRespVO vo = SpringUtils.getBean(IBpmProcessInstanceService.class).getProcessInstanceVO(processInstanceId);
         //获取到的自定义表单数据id
@@ -82,11 +92,11 @@ public class BillApproveStatusService {
         //数据表id
         Long formId = vo.getProcessDefinition().getFormId();
         FormEntity formEntity = SpringUtils.getBean(FormMapper.class).getByWebId(formId);
-        // 使用 editJsonData 方法，这样会触发增强机制
+
-        JSONObject json = new JSONObject();
+        Map<String,Object> json = new HashMap<>();
-        json.put("id", id);
         json.put(ApproveStatusEnum.codeField, ApproveStatusEnum.UNAPPROVED.getCode());
         json.put(ApproveStatusEnum.nameField, ApproveStatusEnum.UNAPPROVED.getDesc());
-        dbformDataService.editJsonData(formEntity.getId(), json);
+        dbformDataService.update(formEntity.getTableName(),id,json);
+
     }
 }