From da7dd957342aa96b31f17e3d61792896e006d6e2 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 28 七月 2025 17:38:32 +0800
Subject: [PATCH] zjh20250728-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 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 f17511f..3355e2d 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
@@ -51,6 +51,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -136,6 +137,8 @@
private ITjProAdvicerulesService tjProAdvicerulesService;
@Autowired
private TjOrderYcxmService ycxmService;
+ @Autowired
+ private TjReportController reportController;
@Autowired
private ISysDictDataService sysDictDataService;
@@ -1137,9 +1140,6 @@
/**
* 鏍规嵁浣撴璁㈠崟鍙疯幏鍙栦綋妫�璇︽儏淇℃伅鎺ュ彛
*
- * @param tjNumber
- * @param advice
- * @param checkStatus
* @return
*/
@PostMapping("/getTjdetailList")
@@ -1170,7 +1170,12 @@
if (StrUtil.isNotBlank(dto.getZhiyeJg()))
tjOrder.setZhiyeJg(dto.getZhiyeJg());
if (orderService.updateById(tjOrder)) {
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ AjaxResult pdf = reportController.toPdf(dto.getTjNumber());
+ if (!pdf.get("code").toString().equals("200") ) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎿嶄綔澶辫触!");
+ }
+ return AjaxResult.success("瀹℃牳骞剁敓鎴愭姤鍛婃垚鍔�!");
}
return AjaxResult.error("鎿嶄綔澶辫触");
}
@@ -1601,19 +1606,25 @@
public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
try {
if (StrUtil.isNotBlank(tjNum)) {
+ List<Map<String, Object>> maps = new ArrayList<>();
TjOrder one = orderService.getOrderByTjNum(tjNum);
if (one == null) {
return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
}
yichangxiangmu(tjNum);
- LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrderYcxm::getTjh, tjNum);
- List<TjOrderYcxm> list = ycxmService.list(wq);
- if (null != list && !list.isEmpty()) {
- Collections.reverse(list);
- return getOrderYcxmList(list);
- } else {
+ List<TjOrderYcxm> tjOrderYcxmList= ycxmService.selectListByTjh(tjNum);
+ if(null!=tjOrderYcxmList&&!tjOrderYcxmList.isEmpty()){
+ LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderYcxm::getTjh, tjNum);
+ List<TjOrderYcxm> list = ycxmService.list(wq);
+ if (null != list && !list.isEmpty()) {
+ Collections.reverse(list);
+ return getOrderYcxmList(list);
+ } else {
+ return AjaxResult.success(maps);
+ }
+ }else {
return zongjianyishengchakanyichangxiangmu(tjNum);
}
}
--
Gitblit v1.8.0