触发重新归档

bpm-core/src/main/java/com/srm/bpm/logic/service/impl/BillLogicImpl.java

@@ -109,7 +109,12 @@ import com.srm.common.data.exception.RbException;
 import com.srm.common.util.bean.BeanUtil;
 import com.srm.common.util.datetime.DateTimeUtil;
 
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.TaskService;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.activiti.engine.runtime.ProcessInstanceQuery;
+import org.activiti.engine.task.Task;
+import org.activiti.engine.task.TaskQuery;
 import org.apache.commons.codec.binary.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.lang3.tuple.Triple;
@@ -136,6 +141,7 @@ import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.transaction.support.TransactionSynchronizationAdapter;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.transaction.support.TransactionTemplate;
@@ -176,6 +182,8 @@ public class BillLogicImpl implements BillLogic {
     private final FlowMsgLogic flowMsgLogic;
     private final BillTitleLogic billTitleLogic;
     private final SerialNumberLogic serialNumberLogic;
+    private final RuntimeService runtimeService;
+    private final TaskService taskService;
     private final FormValidationService formValidationService;
     private final FormSettingService formSettingService;
     private final CallBackLogic callBackLogic;
@@ -750,6 +758,20 @@ public class BillLogicImpl implements BillLogic {
                                                 nextApprover, actionParam.getFormData(),
                                                 billTask.getTaskNodeKey(), billTask.getTaskId());
 
+                                        // 检查流程是否已结束，如果结束则在当前事务中调用 complete()
+                                        // 通过 Spring 代理调用确保 @Transactional 生效，加入当前事务
+                                        if (isProcessEnded(billId)) {
+                                            log.debug("流程已结束，在当前事务中调用 complete()。billId: {}", billId);
+                                            // 重新查询最新的 bill 对象，确保使用最新状态
+                                            ToaBillEntity latestBill = billService.getById(billId);
+                                            if (latestBill != null) {
+                                                BillLogic billLogicProxy = SpringContextHolder.getBean(BillLogic.class);
+                                                billLogicProxy.complete(latestBill, BillAction.agree.name());
+                                            } else {
+                                                log.warn("流程已结束，但无法查询到审批单。billId: {}", billId);
+                                            }
+                                        }
+
                                     } else {
                                         this.billTaskService.agreeTask(billTask, userCode,
                                                 actionParam);
@@ -895,41 +917,130 @@ public class BillLogicImpl implements BillLogic {
     /**
      * 结束并设置完成审批单
      *
-     * @param bill 审批单ID
+     * 事务管理：
+     * - 使用 @Transactional(rollbackFor = Exception.class)，默认传播行为为 PROPAGATION_REQUIRED
+     * - 当从 agreeFlow() 等已有事务的方法调用时（通过 Spring 代理），会自动加入现有事务
+     * - 当从 ProcessBillListener 等无事务的方法调用时，会创建新事务
+     * - 如果 callBack() 失败抛出异常，整个事务（包括 bill_task 和 toa_bill 的更新）都会回滚
+     *
+     * 调用场景：
+     * 1. 从 agreeFlow() 调用：在 agreeFlow() 完成 Activiti 任务后，检查流程是否结束，如果结束则通过 Spring 代理调用此方法，确保在同一事务中
+     * 2. 从 ProcessBillListener 调用：在 Activiti 流程结束时，通过监听器调用此方法，会在新事务中执行
+     *
+     * 幂等性保证：
+     * - 方法内部会检查审批单状态，如果已经完成（COMPLETE），则直接返回，避免重复处理
+     *
+     * @param bill 审批单实体（注意：方法内部会重新查询最新的审批单数据，确保使用最新状态）
+     * @param action 操作类型（agree 或 refuse）
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void complete(ToaBillEntity bill, String action) {
+        // 重新查询最新的bill数据，确保使用最新状态
+        final ToaBillEntity latestBill = billService.getById(bill.getId());
+        if (latestBill == null) {
+            log.error("审批单不存在，无法完成流程。billId: {}", bill.getId());
+            throw new RbException(BillCode.BILL_NOT_FOUND);
+        }
+
+        // 检查是否已经完成，避免重复处理
+        if (latestBill.getStatus() == BillStatus.COMPLETE.getStatus()) {
+            log.debug("审批单已完成，无需再次处理。billId: {}", bill.getId());
+            return;
+        }
+
+        // 更新审批单状态
         final int dateline = DateTimeUtil.unixTime();
-        bill.setCompletionTime(dateline);
-        bill.setStatus(BillStatus.COMPLETE.getStatus());
-        bill.setArchivedTime(dateline);
-        TimerTask businessTask = new TimerTask() {
-            @Override
-            public void run() {
-                billService.upldate(bill);
-                log.info("查询到的审批单数据:{}", bill);
-                if (action.equals(BillAction.refuse.name())) {
-                    callBackLogic.callBack(bill.getProcessId(), bill.getId(),
-                            BillTaskStatus.REFUSE.getStatus());
-                } else {
-                    BillTaskEntity a = new BillTaskEntity();
-                    a.setBillId(bill.getId());
-                    a.setUserCode(bill.getSender());
-                    a.setNodeStatus(BillTaskStatus.COMPLATE.getStatus());//这里应该是16，但是这么多年一直都是错的，数据库里审批通过的也是2（同意）
-                    a.setNodeName(bill.getTitle());
-                    a.setOpinion("通过");
-                    flowMsgLogic.sendMsg(Lists.newArrayList(a));
-                    callBackLogic.callBack(bill.getProcessId(), bill.getId(), BillStatus.COMPLETE.getStatus());//这里是16，但是回调函数接收的却是8
+        latestBill.setCompletionTime(dateline);
+        latestBill.setStatus(BillStatus.COMPLETE.getStatus());
+        latestBill.setArchivedTime(dateline);
+        billService.upldate(latestBill);
+        log.info("审批单完成，已更新状态:{}", latestBill);
+
+        // 执行回调（如果失败，会抛出异常导致整个事务回滚）
+        if (action.equals(BillAction.refuse.name())) {
+            callBackLogic.callBack(latestBill.getProcessId(), latestBill.getId(),
+                    BillTaskStatus.REFUSE.getStatus());
+        } else {
+            BillTaskEntity a = new BillTaskEntity();
+            a.setBillId(latestBill.getId());
+            a.setUserCode(latestBill.getSender());
+            a.setNodeStatus(BillTaskStatus.COMPLATE.getStatus());//这里应该是16，但是这么多年一直都是错的，数据库里审批通过的也是2（同意）
+            a.setNodeName(latestBill.getTitle());
+            a.setOpinion("通过");
+            flowMsgLogic.sendMsg(Lists.newArrayList(a));
+            callBackLogic.callBack(latestBill.getProcessId(), latestBill.getId(), BillStatus.COMPLETE.getStatus());//这里是16，但是回调函数接收的却是8
+        }
+    }
+
+    /**
+     * 检查流程是否已结束
+     * 
+     * 通过检查以下条件判断流程是否结束：
+     * 1. 是否有活动的 Activiti 流程实例
+     * 2. 是否有活动的 Activiti 任务
+     * 3. 是否还有待审批的 bill_task（状态为 APPROVAL）
+     * 
+     * 如果以上都没有，说明流程已结束
+     *
+     * @param billId 审批单ID
+     * @return true 如果流程已结束，false 否则
+     */
+    private boolean isProcessEnded(long billId) {
+        try {
+            // 1. 检查是否有活动的 Activiti 流程实例
+            String businessKey = String.valueOf(billId);
+            ProcessInstanceQuery processInstanceQuery = runtimeService.createProcessInstanceQuery()
+                    .processInstanceBusinessKey(businessKey)
+                    .active();
+            List<ProcessInstance> activeProcessInstances = processInstanceQuery.list();
+            
+            if (CollectionUtil.isNotEmpty(activeProcessInstances)) {
+                // 有活动的流程实例，检查是否有活动的任务
+                for (ProcessInstance processInstance : activeProcessInstances) {
+                    TaskQuery taskQuery = taskService.createTaskQuery()
+                            .processInstanceId(processInstance.getId())
+                            .active();
+                    List<Task> activeTasks = taskQuery.list();
+                    if (CollectionUtil.isNotEmpty(activeTasks)) {
+                        // 有活动的任务，流程未结束
+                        log.debug("流程未结束：存在活动的 Activiti 任务。billId: {}, processInstanceId: {}, taskCount: {}", 
+                                billId, processInstance.getId(), activeTasks.size());
+                        return false;
+                    }
                 }
             }
-        };
-        CallBackThreadPoolManager.me().executeLog(businessTask);
+            
+            // 2. 检查是否还有待审批的 bill_task（状态为 APPROVAL）
+            List<BillTaskEntity> pendingTasks = billTaskService.list(
+                    Wrappers.lambdaQuery(BillTaskEntity.class)
+                            .eq(BillTaskEntity::getBillId, billId)
+                            .eq(BillTaskEntity::getNodeStatus, BillTaskStatus.APPROVAL.getStatus())
+                            .eq(BillTaskEntity::getIsDeleted, 0)
+            );
+            
+            if (CollectionUtil.isNotEmpty(pendingTasks)) {
+                // 有待审批的任务，流程未结束
+                log.debug("流程未结束：存在待审批的 bill_task。billId: {}, pendingTaskCount: {}", 
+                        billId, pendingTasks.size());
+                return false;
+            }
+            
+            // 所有检查都通过，流程已结束
+            log.debug("流程已结束。billId: {}", billId);
+            return true;
+        } catch (Exception e) {
+            // 检查过程中出现异常，保守处理：认为流程未结束，避免误判
+            log.error("检查流程是否结束时发生异常。billId: {}, error: {}", billId, e.getMessage(), e);
+            return false;
+        }
+    }
+
 
 /*        try {
             log.info("查询到的审批单数据:{}", bill);
             billService.upldate(bill);
-            
+
             if (action.equals(BillAction.refuse.name())) {
                 callBackLogic.callBack(bill.getProcessId(), bill.getId(), BillTaskStatus.REFUSE.getStatus());
             } else {
@@ -943,12 +1054,12 @@ public class BillLogicImpl implements BillLogic {
                 callBackLogic.callBack(bill.getProcessId(), bill.getId(), BillTaskStatus.COMPLATE.getStatus());
             }
         } catch (Exception e) {
-            log.error("流程完成失败: billId={}, action={}, error={}", 
+            log.error("流程完成失败: billId={}, action={}, error={}",
                       bill.getId(), action, e.getMessage(), e);
             throw new RbException("流程完成失败：" + e.getMessage());
         }*/
 
-    }
+
     /*@Override
     @Transactional(rollbackFor = Exception.class)
     public void complete(ToaBillEntity bill, String action) {
@@ -1038,7 +1149,7 @@ public class BillLogicImpl implements BillLogic {
      * @return 审批历史记录
      */
     @Override
-    public List<BillApprovalHistoryVO> findBillApprovalHistory(long billId) {
+    public List<BillApprovalHistoryVO> findBillApprovalHistory ( long billId){
         final ToaBillEntity bill = billService.getById(billId);
         if (bill == null) {
             throw new RbException(BillCode.BILL_NOT_FOUND);
@@ -1096,7 +1207,7 @@ public class BillLogicImpl implements BillLogic {
      * @param actionParam 审批操作参数
      */
     @Override
-    public void recallFlow(BillActionParamDTO actionParam) {
+    public void recallFlow (BillActionParamDTO actionParam){
         final long billId = actionParam.getBillId();
         final String taskId = actionParam.getTaskId();
         final String opinion = actionParam.getOpinion();
@@ -1111,9 +1222,9 @@ public class BillLogicImpl implements BillLogic {
         billBpmnLogic.recall(bill, taskId, opinion, userCode);
     }
 
-    private void refuseApproval(
+    private void refuseApproval (
             String taskId, String opinion, ToaBillEntity bill, String userCode, BillTaskEntity task
-    ) {
+    ){
         final Optional<ProcessNodeExtendEntity> nodeExtendOpt;
         final Long processId = bill.getProcessId();
         final String taskNodeKey = task.getTaskNodeKey();
@@ -1156,7 +1267,7 @@ public class BillLogicImpl implements BillLogic {
     }
 
     @Override
-    public boolean agreeIsGoOn(BillTaskEntity billTask) {
+    public boolean agreeIsGoOn (BillTaskEntity billTask){
         final Long id = billTask.getId();
         final String taskId = billTask.getTaskId();
         final Long billId = billTask.getBillId();
@@ -1202,7 +1313,7 @@ public class BillLogicImpl implements BillLogic {
         return false;
     }
 
-    private Page<BillItemVO> toItemVOList(Page page, List<BillItemPO> billDatas, String userCode) {
+    private Page<BillItemVO> toItemVOList (Page page, List < BillItemPO > billDatas, String userCode){
         Page<BillItemVO> resultPage = new Page<>(page.getCurrent(), page.getSize());
         resultPage.setTotal(page.getTotal());
         if (CollectionUtil.isNotEmpty(billDatas)) {
@@ -1230,10 +1341,10 @@ public class BillLogicImpl implements BillLogic {
         return resultPage;
     }
 
-    private ToaBillEntity createBill(
+    private ToaBillEntity createBill (
             ProcessDetailPO processDetail, BillStatus billStatus, BillDataContext billDataValue,
             UserInfoDTO userInfoDTO
-    ) {
+    ){
         ToaBillEntity bill = new ToaBillEntity();
         bill.setId(billDataValue.getId());
         bill.setProcessId(processDetail.getId());
@@ -1283,9 +1394,9 @@ public class BillLogicImpl implements BillLogic {
      * @return 解析后的表单数据
      */
     @Override
-    public BillDataContext resolveFormData(
-            long billId, ProcessDetailPO processDetail, Map<String, Object> formDataMap
-    ) {
+    public BillDataContext resolveFormData (
+            long billId, ProcessDetailPO processDetail, Map < String, Object > formDataMap
+    ){
 
         long processId = processDetail.getId();
 
@@ -1401,7 +1512,7 @@ public class BillLogicImpl implements BillLogic {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void endorse(BillActionParamDTO actionParam) {
+    public void endorse (BillActionParamDTO actionParam){
         final String endorseApprover = actionParam.getEndorseApprover();
         final String opinion = actionParam.getOpinion();
         final String taskId = actionParam.getTaskId();
@@ -1466,7 +1577,7 @@ public class BillLogicImpl implements BillLogic {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void repulseFlow(BillActionParamDTO actionParam) {
+    public void repulseFlow (BillActionParamDTO actionParam){
         final String opinion = actionParam.getOpinion();
         final String taskId = actionParam.getTaskId();
         final long billId = actionParam.getBillId();
@@ -1559,9 +1670,9 @@ public class BillLogicImpl implements BillLogic {
      * @param turnUser 移交用户
      */
     @Override
-    public void turnUser(
+    public void turnUser (
             long billId, String taskId, String turnUser, String userCode, String opinion
-    ) {
+    ){
         List<BillTaskEntity> billTaskEntities =
                 billTaskService.findApprovingByBillAndTaskId(billId, taskId);
         Set<String> collect = billTaskEntities.stream()
@@ -1625,7 +1736,7 @@ public class BillLogicImpl implements BillLogic {
      * @param opinion       转办意见
      */
     @Override
-    public void transferUser(long billId, String taskId, String transferUser, String userCode, String opinion) {
+    public void transferUser ( long billId, String taskId, String transferUser, String userCode, String opinion){
         // 查找当前用户的任务（只查找状态为APPROVAL的任务）
         final Optional<BillTaskEntity> taskOpt = billBpmnLogic
                 .findTaskBybillAndEmployeeAndTaskId(billId, taskId, userCode);
@@ -1663,7 +1774,7 @@ public class BillLogicImpl implements BillLogic {
             }
 
             //
-            BillTaskEntity transferTask = new  BillTaskEntity();
+            BillTaskEntity transferTask = new BillTaskEntity();
 
             transferTask.setBillId(billId);
             transferTask.setUserCode(targetUser);
@@ -1711,25 +1822,25 @@ public class BillLogicImpl implements BillLogic {
 
         //链接OA统一待办审批
         BillItemVO billItemVO = new BillItemVO();
-        OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client o1 = new  OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client();
+        OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client o1 = new OfsTodoDataWebServicePortType_OfsTodoDataWebServiceHttpPort_Client();
         billItemVO.setId(billId);
         //给已转发的发送已办
         billItemVO.setStatus(14);
         billItemVO.setTaskid(taskId);
         List<ReceiveRequestInfoByJsonDto> requestInfoByJsonDtos2 = this.findrequestInfo(billItemVO);
-        String token =this.getToken4();
-        for (ReceiveRequestInfoByJsonDto requestInfoByJsonDto:requestInfoByJsonDtos2){
-            String requestdata =o1.getRequestData(requestInfoByJsonDto,"2");
-            o1.ofsTodoDatabyEten(requestdata,token);
+        String token = this.getToken4();
+        for (ReceiveRequestInfoByJsonDto requestInfoByJsonDto : requestInfoByJsonDtos2) {
+            String requestdata = o1.getRequestData(requestInfoByJsonDto, "2");
+            o1.ofsTodoDatabyEten(requestdata, token);
         }
 
         //给审批中的发送待办
         billItemVO.setStatus(1);
         billItemVO.setTaskid(taskId);
         List<ReceiveRequestInfoByJsonDto> requestInfoByJsonDtos1 = this.findrequestInfo(billItemVO);
-        for (ReceiveRequestInfoByJsonDto requestInfoByJsonDto:requestInfoByJsonDtos1){
-            String requestdata =o1.getRequestData(requestInfoByJsonDto,"0");
-            o1.ofsTodoDatabyEten(requestdata,token);
+        for (ReceiveRequestInfoByJsonDto requestInfoByJsonDto : requestInfoByJsonDtos1) {
+            String requestdata = o1.getRequestData(requestInfoByJsonDto, "0");
+            o1.ofsTodoDatabyEten(requestdata, token);
         }
     }
 
@@ -1740,7 +1851,7 @@ public class BillLogicImpl implements BillLogic {
      * @return 审批单数据信息
      */
     @Override
-    public BillDetailVO<List<FormFieldVO>> createByApp(long processId) {
+    public BillDetailVO<List<FormFieldVO>> createByApp ( long processId){
         ProcessDetailDTO process = checkProcess(processId);
         final List<FormFieldVO> fieldVOS =
                 formBasicConvert.FormFieldPOToVO(formFieldService.findVoByProcessId(processId));
@@ -1777,9 +1888,9 @@ public class BillLogicImpl implements BillLogic {
      * @return 验证结果
      */
     @Override
-    public ValidationResultDTO validation(
+    public ValidationResultDTO validation (
             long processId, long billId, String formDataJson, String userCode
-    ) {
+    ){
         final Map<String, Object> dataMap =
                 JSON.parseObject(formDataJson, FastJsonType.MAP_OBJECT_TR);
         final BillDataContext billDataValue;
@@ -1798,7 +1909,7 @@ public class BillLogicImpl implements BillLogic {
      * @return 节点条件
      */
     @Override
-    public List<String> getNodeCondition(long processId, long billId, String taskId) {
+    public List<String> getNodeCondition ( long processId, long billId, String taskId){
         final List<BillTaskEntity> list = billTaskService.list(
                 Wrappers.lambdaQuery(BillTaskEntity.class)
                         .eq(BillTaskEntity::getBillId, billId)
@@ -1839,7 +1950,7 @@ public class BillLogicImpl implements BillLogic {
      * @return 待我审批数量
      */
     @Override
-    public String findTodoSize() {
+    public String findTodoSize () {
         List<Integer> statusList =
                 Lists.newArrayList(BillStatus.APPROVAL.getStatus(), BillStatus.REFUSE.getStatus());
         final String userCode = loginUserHolder.getUserCode();
@@ -1848,18 +1959,18 @@ public class BillLogicImpl implements BillLogic {
     }
 
     @Override
-    public Pair<List<BillItemVO>, Long> findAllByQuery(
+    public Pair<List<BillItemVO>, Long> findAllByQuery (
             Integer pageNo, Integer pageSize, DraftBillQuery query
-    ) {
+    ){
         Page page = new Page(pageNo, pageSize);
         final List<BillItemPO> billDatas = this.billService.findAllByQuery(page, query);
         final Page<BillItemVO> billItemVOPage = toItemVOList(page, billDatas, null);
         return Pair.of(billItemVOPage.getRecords(), billItemVOPage.getTotal());
     }
 
-    private ValidationResultDTO validataionWithResult(
+    private ValidationResultDTO validataionWithResult (
             BillDataContext billDataValue, String userCode, BillValidationLogic validationService
-    ) {
+    ){
 
         if (null != validationService) {
             return validationService.validation(billDataValue, userCode);
@@ -1871,7 +1982,7 @@ public class BillLogicImpl implements BillLogic {
         }
     }
 
-    private BillValidationLogic getValidationService(long processId) {
+    private BillValidationLogic getValidationService ( long processId){
         FormValidationEntity formValidation = formValidationService.findByProcessId(processId);
         if (null == formValidation) {
             return null;
@@ -1881,9 +1992,9 @@ public class BillLogicImpl implements BillLogic {
     }
 
     @Transactional(readOnly = true, rollbackFor = Exception.class)
-    public BillDataContext resolveFormDataByValidation(
-            long billId, ProcessDetailPO processDetail, Map<String, Object> formDataMap
-    ) {
+    public BillDataContext resolveFormDataByValidation (
+            long billId, ProcessDetailPO processDetail, Map < String, Object > formDataMap
+    ){
         long processId = processDetail.getId();
 
         final List<FormFieldPO> formFieldVOS = this.formFieldService.findVoByProcessId(processId);
@@ -1978,7 +2089,7 @@ public class BillLogicImpl implements BillLogic {
      * @param bill 审批单
      * @return 审批信息
      */
-    private List<BillOpinionVO> billOpinions(ToaBillEntity bill) {
+    private List<BillOpinionVO> billOpinions (ToaBillEntity bill){
         long processId = MoreObjects.firstNonNull(bill.getProcessId(), 0L);
         final List<BillOpinionVO> opinionVOS = Lists.newArrayList();
         final List<ProcessNodeExtendEntity> taskNodes =
@@ -1997,13 +2108,13 @@ public class BillLogicImpl implements BillLogic {
         return opinionVOS;
     }
 
-    private <T> BillDetailVO.BillDetailVOBuilder<T> billDetailBuilder(
+    private <T > BillDetailVO.BillDetailVOBuilder < T > billDetailBuilder(
             BillDataJsonEntity billDataJson, ToaBillEntity bill
     ) {
         return billDetailBuilder(billDataJson, bill, StringPool.EMPTY);
     }
 
-    private <T> BillDetailVO.BillDetailVOBuilder<T> billDetailBuilder(
+    private <T > BillDetailVO.BillDetailVOBuilder < T > billDetailBuilder(
             BillDataJsonEntity billDataJson, ToaBillEntity bill, String page
     ) {
         long billId = bill.getId();
@@ -2126,7 +2237,7 @@ public class BillLogicImpl implements BillLogic {
      * @param processId 业务流程ID
      * @return 业务流程信息，如果状态或者业务流程不存在，则抛出异常
      */
-    private ProcessDetailDTO checkProcess(long processId) {
+    private ProcessDetailDTO checkProcess ( long processId){
         final ProcessDetailPO process = this.processService.findDetailById(processId);
         if (process == null) {
             throw new RbException(StringPool.EMPTY, ProcessCode.BILL_SAVE_PROCESS_NIL);
@@ -2145,9 +2256,9 @@ public class BillLogicImpl implements BillLogic {
      * @param title   审批标题
      * @return 封装后的表单字段信息
      */
-    private Map<String, Object> bizFormData(
+    private Map<String, Object> bizFormData (
             ProcessDetailDTO process, UserInfoDTO userInfoDTO, String title
-    ) {
+    ){
         final long processId = process.getId();
         final long processCodeId = Objects.isNull(process.getCodeId()) ? 0 : process.getCodeId();
         final List<FormFieldEntity> bizFields =
@@ -2203,7 +2314,7 @@ public class BillLogicImpl implements BillLogic {
     }
 
     @Override
-    public List<ProcessTypeVO> findTodoCateSize() {
+    public List<ProcessTypeVO> findTodoCateSize () {
         LambdaQueryWrapper<ProcessTypeEntity> wrapper =
                 Wrappers.lambdaQuery(ProcessTypeEntity.class);
 
@@ -2242,12 +2353,12 @@ public class BillLogicImpl implements BillLogic {
     }
 
     @Override
-    public List<ReceiveRequestInfoByJsonDto> findrequestInfo(BillItemVO billItemVO) {
+    public List<ReceiveRequestInfoByJsonDto> findrequestInfo (BillItemVO billItemVO){
         return billService.findrequestInfo(billItemVO);
     }
 
     @Override
-    public String getToken4() {
+    public String getToken4 () {
         return billService.getToken4();
     }
 }

bpm-server/src/main/java/com/srm/bpmserver/logic/impl/CallBackLogicImpl.java

@@ -11,6 +11,7 @@ import com.srm.common.data.rest.R;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -31,12 +32,17 @@ public class CallBackLogicImpl implements CallBackLogic {
 
     /**
      * 回调
+     * 
+     * 使用 @Transactional(propagation = PROPAGATION_REQUIRED) 确保：
+     * - 如果已有活动事务，会加入现有事务（如从 agreeFlow() -> complete() -> callBack()）
+     * - 如果没有活动事务，会创建新事务（如独立调用时）
      *
      * @param processId 流程id
      * @param billId    审批单id
      * @param status    状态
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void callBack(Long processId, Long billId, Integer status) {
         log.info("触发了回调:{},{},{}", processId, billId, status);
         JSONObject data = new JSONObject();

bpm-server/src/main/resources/application.yml

@@ -49,15 +49,15 @@ spring:
     druid:
       #MySQL
       driver-class-name: com.mysql.jdbc.Driver
-#      url: jdbc:mysql://172.16.0.48:3306/jqh_srm_9000?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT%2B8
-#      username: root
-#      password: jqh_srm_2022
+      url: jdbc:mysql://172.16.0.48:3306/jqh_srm_9000?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT%2B8
+      username: root
+      password: jqh_srm_2022
 #      url: jdbc:mysql://172.16.0.71:3306/jqh_srm_9001?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT%2B8
 #      username: root
 #      password: jqh_srm_123123
-      url: jdbc:mysql://172.16.0.66:3306/jqh_srm_9000?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT%2B8
-      username: root
-      password: jqh_srm_2022
+#      url: jdbc:mysql://172.16.0.66:3306/jqh_srm_9000?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT%2B8
+#      username: root
+#      password: jqh_srm_2022
       initial-size: 10
       max-active: 20
       min-idle: 2