From 3a61407d9b86b5ef9eb622ef009abd5ed3e777dd Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 13 十二月 2024 17:38:58 +0800
Subject: [PATCH] 20241213
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index d124182..81a60ad 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -997,6 +997,7 @@
AjaxResult result = processOrderWithTransaction(tjOrder, tjCustomer, tjReservation, tjFlowingWater, mallOrder, sysUser);
if (!result.get("code").toString().equals("200"))
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ tjOrderService.tjQiandaodengji(tjOrder.getTjNumber());
return result;
}
} finally {
@@ -1717,6 +1718,11 @@
transitionService.deletedTbTransitionListByCusIdAndPac(cusId, cardId);
List<TjPackageProject> ppList = tjPackageProjectService.getTjPackageProjectListByPacId(String.valueOf(pacId));
if (null != ppList && !ppList.isEmpty()) {
+ String string = transitionService.panduantaocanshifouchongfu(cusId,pacId);
+ if(!StringUtils.isBlank(string)){
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎿嶄綔澶辫触! 浠ヤ笅椤圭洰宸插瓨鍦�: "+string);
+ }
transitionService.saveRedisTransitionByPacId(cusId, cardId, pacId);
}
}
@@ -2593,8 +2599,12 @@
LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjCustomer::getCusId, byId.getUserId());
TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
+ LambdaQueryWrapper<TjReportTemplate> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjReportTemplate::getFlag,"4");
+ wrapper.eq(TjReportTemplate::getOpen,"1");
+ TjReportTemplate zongJianYiShiQianMing = reportTemplateService.getOne(wrapper);
try {
- shengchengbgmoban(byId.getTjNumber(), byId, tjCustomer, reportTemplate);
+ shengchengbgmoban(byId.getTjNumber(), byId, tjCustomer, reportTemplate,zongJianYiShiQianMing);
byId.setStatus(TjConstants.TJ_END);
byId.setReportTime(date);
byId.setPrintLastTime(date);
@@ -2621,8 +2631,10 @@
}
- public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) throws Exception {
- AjaxResult ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
+ public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate,TjReportTemplate zongJianYiShiQianMing) throws Exception {
+// AjaxResult ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
+// AjaxResult ajaxResult = hisPDFUtil.hisPDFNew(tjOrder, tjCustomer, reportTemplate);
+ AjaxResult ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
if (!ajaxResult.get("code").toString().equals("200")) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
} else {
@@ -3129,5 +3141,19 @@
}
+ @GetMapping("/chushenyemianqijianjiekou")
+ @ApiOperation(value = "鍒濆椤甸潰寮冩鎺ュ彛")
+ @Transactional
+ public AjaxResult chushenyemianqijianjiekou(@RequestParam String tjNUm,@RequestParam String proId) {
+ LambdaQueryWrapper<TjOrderRemark> wq=new LambdaQueryWrapper<>();
+ wq.eq(TjOrderRemark::getTjNumber,tjNUm);
+ wq.eq(TjOrderRemark::getProId,proId);
+ TjOrderRemark remark = remarkService.getOne(wq);
+ remark.setType(1);
+ remarkService.updateById(remark);
+ return AjaxResult.success("鎿嶄綔鎴愬姛!");
+ }
+
+
}
--
Gitblit v1.8.0