From 73d54b1f4db3595253fe5650258bfb288ae5defc Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 07 七月 2025 10:01:33 +0800
Subject: [PATCH] zjh20250707
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 96 +++++++++++++++++++++---------------------------
1 files changed, 42 insertions(+), 54 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 6869d55..d7f1e2e 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -47,7 +47,9 @@
import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.NoTransactionException;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -89,11 +91,7 @@
@Resource
private ITjOrderRemarkService orderRemarkService;
@Resource
- private ITbTransitionService transitionService;
- @Resource
private ISysUserService userService;
- @Resource
- private RedisCache redisCache;
@Resource
private TjAsyncService asyncService;
@Resource
@@ -104,12 +102,6 @@
private ISysDeptService deptService;
@Resource
private TestMapper testMapper;
- @Resource
- private TjvLtkjvtjpatService tjvLtkjvtjpatService;
- @Resource
- private LtkjMiddleDetailService middleDetailService;
- @Resource
- private LtkjMiddleHeadService headService;
@Resource
private LtkjExamJcbgdService jcbgdService;
@Resource
@@ -135,11 +127,7 @@
@Autowired
private SysConfigController configController;
@Autowired
- private TjJcycxmService jcycxmService;
- @Resource
- private TjXdtgmdjgService xdtgmdjgService;
- @Resource
- private TjXdPictureController pictureController;
+ private TjReportController reportController;
@GetMapping("/ceshicc")
@ApiOperation(value = "娴嬭瘯璋冪敤瀛樺偍杩囩▼鑰楁椂鎺ュ彛")
@@ -1364,53 +1352,53 @@
@PutMapping("/getTjdetailList")
@ApiOperation(value = "鏍规嵁浣撴璁㈠崟鍙疯幏鍙栦綋妫�璇︽儏淇℃伅(骞朵慨鏀圭姸鎬�)鎺ュ彛")
// @PreAuthorize("@ss.hasPermi('check:check:getTjdetailList')")
+ @Transactional
public AjaxResult getTjdetailList(@ApiParam(value = "浣撴tjNumber") @RequestParam String tjNumber,
@ApiParam(value = "鎬绘寤鸿") @RequestParam(required = false) String advice,
@ApiParam(value = "瀹℃牳鐘舵��0寰呭鏍�1宸插鏍�") @RequestParam Integer checkStatus,
@ApiParam(value = "鑱屼笟缁撹") @RequestParam(required = false) String zhiyeJl,
@ApiParam(value = "鑱屼笟缁撴灉") @RequestParam(required = false) String zhiyeJg) {
- String config = configService.selectConfigByKey("sfjcwjhyqxm");
- if (null != config && config.equalsIgnoreCase("Y")) {
- int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
- if (num > 0) return AjaxResult.error("瀛樺湪鏈鎴栧欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
- }
- Date date = new Date();
- if (null != tjNumber) {
- Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
- SysUser sysUser = userService.getById(userId);
- LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjOrder::getTjNumber, tjNumber);
- TjOrder tjOrder = orderService.getOne(wq1);
- if (null != tjOrder) {
- tjOrder.setCheckAdvice(advice);
- tjOrder.setCheckStatus(checkStatus);
- tjOrder.setStatus(TjConstants.TJ_CHECK);
- tjOrder.setCheckDoctor(sysUser.getNickName());
- tjOrder.setCheckTime(date);
- tjOrder.setStatus(401);
- tjOrder.setFinishTime(date);
- if (StrUtil.isNotBlank(zhiyeJl))
- tjOrder.setZhiyeJl(zhiyeJl);
- if (StrUtil.isNotBlank(zhiyeJg))
- tjOrder.setZhiyeJg(zhiyeJg);
- if (orderService.updateById(tjOrder)) {
- TjCustomer customer = customerService.getById(tjOrder.getUserId());
- if (null != customer) {
- customer.setCusNumber(customer.getCusNumber() + 1);
- customer.setCardId("0");
- if (customerService.updateById(customer)) {
- asyncService.updateCheckType(tjNumber);
- return AjaxResult.success("鎿嶄綔鎴愬姛");
- }
- return AjaxResult.error("鎿嶄綔澶辫触");
- }
- }
- return AjaxResult.error("鎿嶄綔澶辫触");
+ try {
+ String config = configService.selectConfigByKey("sfjcwjhyqxm");
+ if (null != config && config.equalsIgnoreCase("Y")) {
+ int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
+ if (num > 0) return AjaxResult.error("瀛樺湪鏈鎴栧欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
}
- return AjaxResult.success("鏁版嵁涓嶅瓨鍦�");
+ Date date = new Date();
+ if (null != tjNumber) {
+ Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
+ SysUser sysUser = userService.getById(userId);
+ TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
+ if (null != tjOrder) {
+ tjOrder.setCheckAdvice(advice);
+ tjOrder.setCheckStatus(checkStatus);
+ tjOrder.setStatus(TjConstants.TJ_CHECK);
+ tjOrder.setCheckDoctor(sysUser.getNickName());
+ tjOrder.setCheckTime(date);
+ tjOrder.setStatus(401);
+ tjOrder.setFinishTime(date);
+ if (StrUtil.isNotBlank(zhiyeJl))
+ tjOrder.setZhiyeJl(zhiyeJl);
+ if (StrUtil.isNotBlank(zhiyeJg))
+ tjOrder.setZhiyeJg(zhiyeJg);
+ if (orderService.updateById(tjOrder)) {
+ AjaxResult pdf = reportController.toPdf(tjNumber);
+ if (!pdf.get("code").toString().equals("200") ) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎿嶄綔澶辫触!");
+ }
+ return AjaxResult.success("瀹℃牳骞剁敓鎴愭姤鍛婃垚鍔�!");
+ }
+ return AjaxResult.error("鎿嶄綔澶辫触");
+ }
+ return AjaxResult.success("鏁版嵁涓嶅瓨鍦�");
+ }
+ return AjaxResult.error();
+ } catch (Exception ex) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ throw new RuntimeException(ex);
}
- return AjaxResult.error();
}
--
Gitblit v1.8.0