From c63daceb66fbb7faa56849e695c07e28447818b9 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 29 四月 2025 14:18:46 +0800
Subject: [PATCH] pdf生成增加是否根据orderdetail结果字段判断 修复字体重叠问题 固定项目结论增加字符串去除null
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 111 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 67 insertions(+), 44 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 8d63e5b..0faa62b 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
@@ -450,8 +450,8 @@
tjReport.setTjNumber(String.valueOf(tjNumber));
tjReport.setPath(urlValue + outputFileName1);
String outputPath1 = value + File.separator;
- String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
- tjReport.setReport(pdfBinary);
+// String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
+// tjReport.setReport(pdfBinary);
tjReport.setType("浣撴鎶ュ憡");
tjReport.setPrint("pdf");
tjReportService.save(tjReport);
@@ -1736,21 +1736,17 @@
public void preview(HttpServletResponse response, @PathVariable("flag") boolean flag, @PathVariable("TjNumber") String tjNumber) {
TjOrder tjOrder = tjOrderService.getOrderByTjNum(tjNumber);
TjCustomer tjCustomer = tjCustomerService.getById( tjOrder.getUserId());
- LambdaQueryWrapper<TjReport> we = new LambdaQueryWrapper<>();
- we.eq(TjReport::getTjNumber, tjNumber);
- we.eq(TjReport::getType, "浣撴鎶ュ憡");
- TjReport one = tjReportService.getOne(we);
- if (one == null) {
- return;
- }
- String userId = SecurityUtils.getLoginUser().getUsername();
- PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
- String filePath = value + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
+// LambdaQueryWrapper<TjReport> we = new LambdaQueryWrapper<>();
+// we.eq(TjReport::getTjNumber, tjNumber);
+// we.eq(TjReport::getType, "浣撴鎶ュ憡");
+// TjReport one = tjReportService.getOne(we);
+// if (one == null) {
+// return;
+// }
+// String userId = SecurityUtils.getLoginUser().getUsername();
+// PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
+ String filePath = value + File.separator + tjCustomer.getCusId() + tjNumber + tjCustomer.getCusName() + "_鎶ュ憡.pdf";
File f = new File(filePath);
- if (filePath.isEmpty()) {
- System.out.println("鏂囦欢涓嶅瓨鍦紒");
- return;
- }
BufferedInputStream br = null;
OutputStream out = null;
FileInputStream fileInputStream = null;
@@ -1767,13 +1763,13 @@
String contentType = u.openConnection().getContentType();
response.setContentType(contentType);
response.setHeader("Content-Disposition", "inline;filename="
- + userId + tjNumber + ".pdf");
+ + tjCustomer.getCusId() + tjNumber + ".pdf");
} else {
// 绾笅杞芥柟寮�
response.setContentType("application/x-msdownload");
response.setContentType("application/pdf;charset=utf-8");
response.setHeader("Content-Disposition", "attachment;filename="
- + userId + tjNumber + ".pdf");
+ + tjCustomer.getCusId() + tjNumber + ".pdf");
}
out = response.getOutputStream();
while ((len = br.read(bs)) > 0) {
@@ -1820,17 +1816,18 @@
TjCustomer tjCustomer = tjCustomerService.getById( tjOrder.getUserId());
- LambdaQueryWrapper<TjReport> we = new LambdaQueryWrapper<>();
- we.eq(TjReport::getTjNumber, tjNumber);
- we.eq(TjReport::getType, "浣撴鎶ュ憡");
- TjReport one = tjReportService.getOne(we);
- if (one == null) {
- return;
- }
-
- String userId = SecurityUtils.getLoginUser().getUsername();
- PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
- String filePath = value + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
+// LambdaQueryWrapper<TjReport> we = new LambdaQueryWrapper<>();
+// we.eq(TjReport::getTjNumber, tjNumber);
+// we.eq(TjReport::getType, "浣撴鎶ュ憡");
+// TjReport one = tjReportService.getOne(we);
+// if (one == null) {
+// return;
+// }
+//
+// String userId = SecurityUtils.getLoginUser().getUsername();
+// PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
+// String filePath = value + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
+ String filePath = value + File.separator + tjCustomer.getCusId() + tjNumber + tjCustomer.getCusName() + "_鎶ュ憡.pdf";
File f = new File(filePath);
if (filePath.isEmpty()) {
System.out.println("鏂囦欢涓嶅瓨鍦紒");
@@ -1852,13 +1849,13 @@
String contentType = u.openConnection().getContentType();
response.setContentType(contentType);
response.setHeader("Content-Disposition", "inline;filename="
- + userId + tjNumber + ".pdf");
+ + tjCustomer.getCusId() + tjNumber + ".pdf");
} else {
// 绾笅杞芥柟寮�
response.setContentType("application/x-msdownload");
response.setContentType("application/pdf;charset=utf-8");
response.setHeader("Content-Disposition", "attachment;filename="
- + userId + tjNumber + ".pdf");
+ + tjCustomer.getCusId() + tjNumber + ".pdf");
}
out = response.getOutputStream();
while ((len = br.read(bs)) > 0) {
@@ -1908,6 +1905,29 @@
} else {
return makeReport(tjNumbers);
}
+ }
+
+
+ @GetMapping("/xiugaidayinzhuangtai")
+ @ApiOperation(value = "淇敼鎵撳嵃鐘舵�佹帴鍙�")
+ @Transactional
+ public AjaxResult xiugaidayinzhuangtai(@RequestParam String tjNumber) {
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNumber);
+ if(null !=order){
+ Date date=new Date();
+ TjReportPrint print=new TjReportPrint();
+ print.setTjNumber(tjNumber);
+ print.setPrintBy(SecurityUtils.getLoginUser().getUser().getNickName());
+ print.setPrintTime(date);
+ print.setPrintStatus("宸叉墦鍗�");
+ if (printService.save(print)) {
+ order.setPrintLastTime(date);
+ order.setStatus(TjConstants.TJ_END);
+ tjOrderService.updateById(order);
+ }
+ return AjaxResult.success();
+ }
+ return AjaxResult.error();
}
/**
@@ -2139,20 +2159,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 +2181,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