zjh20241205-1

zjh

2024-12-05 3eeaad61513758f2e05277995fb2af3a21f72b35

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java

@@ -1161,7 +1161,7 @@
                addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser,null);

            }

//            pacsApiMethodService.OrderAdd(tjCustomer,tjOrder);
            return AjaxResult.success(tjNumber);
        }
        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -2774,6 +2774,7 @@
//            if (null != payByTjNum) {
//                return AjaxResult.error("该用户已收费不可撤销签到!");
//            }
            if(null !=order.getFinishTime()) return AjaxResult.error("该人员已签离,不可撤销!!!");
            tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
            tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
            remarkService.deletedOrderRemarkByTjNum(tjNum);