From e12b37ce15c67b522e94f399e3b8c18c2c0e7289 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期一, 25 十二月 2023 10:31:13 +0800
Subject: [PATCH] zjh 本地 2023/12/25 -2
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 fc62ae9..603b14f 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
@@ -90,7 +90,8 @@
@Autowired
private ISysDictDataService dictDataService;
-
+ @Resource
+ private ITbTransitionService transitionService;
// /* *//**
// * 鏌ヨ浣撴鎶ュ憡瀛樺偍鍒楄〃
@@ -270,6 +271,7 @@
if (null != tjOrder) {
LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ TjReportTemplate reportTemplate =null;
if (tjOrder.getTjCategory()!=null){
//鏌ヨ瀛楀吀
LambdaQueryWrapper<SysDictData> wqq = new LambdaQueryWrapper<>();
@@ -290,12 +292,13 @@
}else {
tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
}
+ tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
+ reportTemplate = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper);
+ }else {
+ tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
+ reportTemplate = reportTemplateService.list(tjReportTemplateLambdaQueryWrapper).get(2);
}
-
-
- tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
- TjReportTemplate one1 = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper);
- String template = one1.getTemplate();
+ String template = reportTemplate.getTemplate();
String userId = SecurityUtils.getLoginUser().getUsername();
PDFBinaryUtil.base64StringToPDF(template, FileUtil.mkdir(value).getPath() + "\\" + userId + "浣撴鎶ュ憡灏侀潰妯℃澘.pdf");
@@ -444,7 +447,11 @@
LambdaQueryWrapper<TjProject> wqqq = new LambdaQueryWrapper<>();
wqqq.eq(TjProject::getProId, entry.getKey().getProId());
TjProject one11 = projectService.getOne(wqqq);
- if ("1".equals(one11.getProCheckMethod())) {
+ //鍒ゆ柇璇ラ」鐩槸鍚﹂渶瑕佹墦鍗版姤鍛�
+ if ("N".equals(one11.getNeedReport())){
+ continue;
+ }
+ if ("1".equals(one11.getResultType())) {
String titleName = one11.getProName();
// 璁剧疆鏍囬瀛椾綋鏍峰紡
Font titleFonts = PdfUtils.setFont(9);
@@ -645,6 +652,8 @@
} catch (Exception e) {
e.printStackTrace();
return AjaxResult.success("PDF瀵煎嚭澶辫触");
+ }finally {
+ transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(),tjOrder.getCardId());
}
}
}
--
Gitblit v1.8.0