From c42f62b32bac302a7ac9fcde7489f7c5fc6e11aa Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 06 十二月 2024 15:35:17 +0800
Subject: [PATCH] zjh20241205-3
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 72fa5e1..5441cdd 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
@@ -58,7 +58,7 @@
*/
@RestController
@RequestMapping("/system/report")
-@Api(tags = "浣撴鎶ュ憡")
+@Api(tags = "AAAA_浣撴鎶ュ憡")
@Transactional
public class TjReportController extends BaseController {
@Resource
@@ -106,12 +106,14 @@
public AjaxResult savePdf() {
//浠庢枃浠跺湴鍧�璇诲叆PDF鏂囦欢 浠呭瓨鍌ㄤ竴娆�
String base64String = PDFBinaryUtil.getPDFBinary(configService.selectConfigByKey("default_pdf5Template"));
+ reportTemplateService.remove(new LambdaQueryWrapper<TjReportTemplate>().eq(TjReportTemplate::getName,"浣撴鎶ュ憡妯℃澘5"));
TjReportTemplate tem = new TjReportTemplate();
tem.setName("浣撴鎶ュ憡妯℃澘5");
tem.setRemark("浣撴鎶ュ憡妯℃澘5");
tem.setTemplate(base64String);
tem.setFlag("1");
tem.setOpen("0");
+ tem.setCreateTime(DateUtil.date());
final boolean save = reportTemplateService.save(tem);
if (save) {
return AjaxResult.success("淇濆瓨鎴愬姛");
@@ -297,9 +299,10 @@
// return error;
// }
// return AjaxResult.success("璇ョ敤鎴蜂綋妫�鏈畬鎴愶紝涓嶈兘鎵撳嵃鎶ュ憡锛侊紒锛�");
- int num = tjOrderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
- if (num > 0) {
- return AjaxResult.error("鏈夊欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
+ String config = configService.selectConfigByKey("sfjcwjhyqxm");
+ if(null != config && config.equalsIgnoreCase("Y")){
+ int num = tjOrderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
+ if (num > 0) return AjaxResult.error("瀛樺湪鏈鎴栧欢鏈熼」鐩殏涓嶈兘鐢熸垚鎶ュ憡!!!");
}
// String configByKey = configService.selectConfigByKey("sfkqdyhis");
@@ -2049,6 +2052,7 @@
} else {
one.setStatus(TjConstants.TJ_CONFIRM);
}
+ one.setReportTime(null);
//灏嗙姸鎬佹敼涓烘湭瀹℃牳
// UpdateWrapper updateWrapper=new UpdateWrapper();
// updateWrapper.eq("tj_number",tjNumber);
--
Gitblit v1.8.0