触发重新归档

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

@@ -80,6 +80,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.UUID;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import static com.srm.bpm.logic.constant.BillStatus.CANCEL;
 import static com.srm.bpm.logic.constant.NodeLinkType.create;
@@ -652,6 +653,9 @@ public class BillBpmnLogicImpl implements BillBpmnLogic {
         } catch (Exception e) {
             log.error("检查归档条件并触发回调时发生异常。billId: {}, taskId: {}, 错误: {}",
                     bill != null ? bill.getId() : null, taskId, e.getMessage(), e);
+            // 设置事务回滚，确保异常不会导致事务提交
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            throw new RuntimeException("检查归档条件并触发回调时发生异常: " + e.getMessage(), e);
         }
     }
 
@@ -678,6 +682,9 @@ public class BillBpmnLogicImpl implements BillBpmnLogic {
             }
         } catch (Exception e) {
             log.error("触发审批单完成逻辑和回调时发生异常。billId: {}, 错误: {}", bill.getId(), e.getMessage(), e);
+            // 设置事务回滚，确保异常不会导致事务提交
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            throw new RuntimeException("触发审批单完成逻辑和回调时发生异常: " + e.getMessage(), e);
         }
     }
 
@@ -745,6 +752,9 @@ public class BillBpmnLogicImpl implements BillBpmnLogic {
             }
         } catch (Exception e) {
             log.error("检查审批单完成状态时发生异常。billId: {}, 错误: {}", bill.getId(), e.getMessage(), e);
+            // 设置事务回滚，确保异常不会导致事务提交
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            throw new RuntimeException("检查审批单完成状态时发生异常: " + e.getMessage(), e);
         }
     }
     

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