回滚

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

@@ -897,15 +897,13 @@ public class BillLogicImpl implements BillLogic {
      *
      * @param bill 审批单ID
      */
-    /*@Override
+    @Override
     @Transactional(rollbackFor = Exception.class)
     public void complete(ToaBillEntity bill, String action) {
         final int dateline = DateTimeUtil.unixTime();
         bill.setCompletionTime(dateline);
         bill.setStatus(BillStatus.COMPLETE.getStatus());
         bill.setArchivedTime(dateline);
-
-
         TimerTask businessTask = new TimerTask() {
             @Override
             public void run() {
@@ -918,20 +916,17 @@ public class BillLogicImpl implements BillLogic {
                     BillTaskEntity a = new BillTaskEntity();
                     a.setBillId(bill.getId());
                     a.setUserCode(bill.getSender());
-                    a.setNodeStatus(BillTaskStatus.COMPLATE.getStatus());
+                    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());
+                    callBackLogic.callBack(bill.getProcessId(), bill.getId(), BillStatus.COMPLETE.getStatus());//这里是16，但是回调函数接收的却是8
                 }
             }
         };
-
         CallBackThreadPoolManager.me().executeLog(businessTask);
 
-
-        *//*try {
+/*        try {
             log.info("查询到的审批单数据:{}", bill);
             billService.upldate(bill);
             
@@ -951,10 +946,10 @@ public class BillLogicImpl implements BillLogic {
             log.error("流程完成失败: billId={}, action={}, error={}", 
                       bill.getId(), action, e.getMessage(), e);
             throw new RbException("流程完成失败：" + e.getMessage());
-        }*//*
+        }*/
 
-    }*/
-    @Override
+    }
+    /*@Override
     @Transactional(rollbackFor = Exception.class)
     public void complete(ToaBillEntity bill, String action) {
         final int dateline = DateTimeUtil.unixTime();
@@ -1034,7 +1029,7 @@ public class BillLogicImpl implements BillLogic {
                     }
                 }
         );
-    }
+    }*/
 
     /**
      * 获取某个审批单的审批历史记录