From 97cd691b670aac4e2a9c85756c6a863cc5dbba2e Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 14 二月 2025 14:10:31 +0800
Subject: [PATCH] zjh20250214
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 53 ++++++++++++++++++++++++++++-------------------------
1 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index fbf5621..0e3e053 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -314,18 +314,18 @@
TjOrder tjOrder = tjOrderService.getOrderByTjNum(tjNumber);
if (null != tjOrder) {
- String config = configService.selectConfigByKey("sfjcwjhyqxm");
- if(null != config && config.equalsIgnoreCase("Y")){
- int num = tjOrderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
- if (num > 0) {
- tjOrder.setReportTime(null);
- tjOrder.setCheckTime(null);
- tjOrder.setCheckStatus(0);
- tjOrder.setPrintLastTime(null);
- tjOrderService.updateById(tjOrder);
- return AjaxResult.error("瀛樺湪鏈鎴栧欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
+ String config = configService.selectConfigByKey("sfjcwjhyqxm");
+ if(null != config && config.equalsIgnoreCase("Y")){
+ int num = tjOrderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
+ if (num > 0) {
+ tjOrder.setReportTime(null);
+ tjOrder.setCheckTime(null);
+ tjOrder.setCheckStatus(0);
+ tjOrder.setPrintLastTime(null);
+ tjOrderService.updateById(tjOrder);
+ return AjaxResult.error("瀛樺湪鏈鎴栧欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
+ }
}
- }
//鍒ゆ柇琛ㄤ腑鏈夋病鏈夎浣撴鎶ュ憡 涓嶈兘閲嶅鐢熸垚
LambdaQueryWrapper<TjReport> wqa = new LambdaQueryWrapper<>();
wqa.eq(TjReport::getTjNumber, tjNumber);
@@ -420,7 +420,7 @@
tjOrder.setPrintLastTime(null);
tjOrderService.updateById(tjOrder);
- logger.error("鐢熸垚鎶ュ憡寮傚父");
+ logger.error(String.valueOf(e));
return AjaxResult.error("鐢熸垚鎶ュ憡澶辫触");
}
} else {
@@ -2139,20 +2139,8 @@
@GetMapping("/revocationReport/{TjNumber}")
@ApiOperation(value = "鎾ら攢鐢熸垚浣撴鎶ュ憡")
+ @Transactional
public AjaxResult revocationReport(@PathVariable("TjNumber") String tjNumber) {
- //閫昏緫鍒犻櫎鏁版嵁搴撻噷鐨勬姤鍛�
- QueryWrapper<TjReport> wq1 = new QueryWrapper<>();
- wq1.select("re_id");
- wq1.eq("tj_number", tjNumber);
- wq1.eq("type", "浣撴鎶ュ憡");
- TjReport tjReport = tjReportService.getOne(wq1);
- if (null != tjReport) {
- // 涓嶅湪浣跨敤閫昏緫鍒犻櫎 閫昏緫鍒犻櫎瀵艰嚧鎵撳嵃鎶ュ憡鐢熸垚 鏌ヨsql缂撴參
- int i = tjReportService.deleteTjReportByReId(tjReport.getReId());
- if (i == 0) {
- return AjaxResult.error("鏆傛棤浣撴鎶ュ憡,璇锋挙鍥炲埌鎬绘鏈鏍搁〉闈�,闇�鎬绘鍖荤敓閲嶆柊瀹℃牳骞剁敓鎴愭姤鍛�!");
- }
- }
TjOrder one = tjOrderService.getOrderByTjNum(tjNumber);
if(null !=one){
@@ -2173,6 +2161,21 @@
one.setPrintLastTime(null);
one.setDownloadLastTime(null);
if (tjOrderService.updateById(one)) {
+
+ //閫昏緫鍒犻櫎鏁版嵁搴撻噷鐨勬姤鍛�
+ QueryWrapper<TjReport> wq1 = new QueryWrapper<>();
+ wq1.select("re_id");
+ wq1.eq("tj_number", tjNumber);
+ wq1.eq("type", "浣撴鎶ュ憡");
+ TjReport tjReport = tjReportService.getOne(wq1);
+ if (null != tjReport) {
+ // 涓嶅湪浣跨敤閫昏緫鍒犻櫎 閫昏緫鍒犻櫎瀵艰嚧鎵撳嵃鎶ュ憡鐢熸垚 鏌ヨsql缂撴參
+ int i = tjReportService.deleteTjReportByReId(tjReport.getReId());
+ if (i == 0) {
+ return AjaxResult.error("鏆傛棤浣撴鎶ュ憡,璇锋挙鍥炲埌鎬绘鏈鏍搁〉闈�,闇�鎬绘鍖荤敓閲嶆柊瀹℃牳骞剁敓鎴愭姤鍛�!");
+ }
+ }
+
return AjaxResult.success("鎾ゅ洖鎴愬姛锛�");
}
}
--
Gitblit v1.8.0