From 4b0807753a4be68d1bb657794e5e3898399742ae Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 14 七月 2025 17:30:15 +0800
Subject: [PATCH] zjh20250714
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 28 ++++++++++++++++++++++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 30 ++++++++++++++++--------------
2 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index d4f3bc1..2b95727 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -2345,17 +2345,17 @@
if (StrUtil.isNotBlank(value.get(0).getSj())) {
pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
document1.add(pp);
- ppp = new Paragraph(value.get(0).getSj(), remarkFonts);
+ ppp = new Paragraph(value.get(0).getSj().replaceAll("\n",""), remarkFonts);
paragraph.setAlignment(Element.ALIGN_LEFT);
paragraph.setLeading(5f);
document1.add(ppp);
}
- pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ彁绀猴細"+value.get(0).getTs());
- document1.add(pp);
-// ppp = new Paragraph(value.get(0).getTs(), remarkFonts);
-// paragraph.setAlignment(Element.ALIGN_LEFT);
-// paragraph.setLeading(5f);
-// document1.add(ppp);
+// pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ彁绀猴細"+value.get(0).getTs().replaceAll("\n",""));
+// document1.add(pp);
+ ppp = new Paragraph("妫�鏌ユ彁绀猴細"+value.get(0).getTs().replaceAll("\n",""), remarkFonts);
+ paragraph.setAlignment(Element.ALIGN_LEFT);
+ paragraph.setLeading(5f);
+ document1.add(ppp);
} else {
if (value.get(0).getPid().equals("1862852701533012001")) {
remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
@@ -2536,7 +2536,7 @@
if (StrUtil.isNotBlank(value.get(0).getSj())) {
pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
document1.add(pp);
- ppp = new Paragraph(value.get(0).getSj(), remarkFonts);
+ ppp = new Paragraph(value.get(0).getSj().replaceAll("\n",""), remarkFonts);
paragraph.setAlignment(Element.ALIGN_LEFT);
paragraph.setLeading(5f);
document1.add(ppp);
@@ -2545,7 +2545,8 @@
if (StrUtil.isNotBlank(value.get(0).getSj()) || StrUtil.isNotBlank(value.get(0).getProResult())) {
pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ墍瑙侊細");
document1.add(pp);
- ppp = new Paragraph(value.get(0).getSj() != null ? value.get(0).getSj() : value.get(0).getProResult(), remarkFonts);
+ ppp = new Paragraph(value.get(0).getSj() != null ? value.get(0).getSj().replaceAll("\n","")
+ : value.get(0).getProResult().replaceAll("\n",""), remarkFonts);
paragraph.setAlignment(Element.ALIGN_LEFT);
paragraph.setLeading(5f);
document1.add(ppp);
@@ -2555,7 +2556,8 @@
// document1.add(pp);
pp = PdfUtils.setParagraph(remarkFonts, "妫�鏌ユ彁绀猴細");
document1.add(pp);
- ppp = new Paragraph((value.get(0).getTs() != null ? value.get(0).getTs() : value.get(0).getProResult()), remarkFonts);
+ ppp = new Paragraph((value.get(0).getTs() != null ? value.get(0).getTs().replaceAll("\n","")
+ : value.get(0).getProResult().replaceAll("\n","")), remarkFonts);
paragraph.setAlignment(Element.ALIGN_LEFT);
paragraph.setLeading(5f);
document1.add(ppp);
@@ -2596,7 +2598,7 @@
paragraph.setLeading(5f);
document1.add(ppp);
if (StrUtil.isNotBlank(entry.getKey().getRemark())) {
- ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark().replaceAll("null",""), remarkFonts);
+ ppp = new Paragraph("缁撹锛�" + entry.getKey().getRemark().replaceAll("null","").replaceAll("\n",""), remarkFonts);
paragraph.setAlignment(Element.ALIGN_LEFT);
paragraph.setLeading(5f);
document1.add(ppp);
@@ -3229,7 +3231,7 @@
TjProject tjProjectq = projectService.getById(tjOrderDetail.getProject().getProParentId());
TjPdfVO tjPdfVO = new TjPdfVO();
tjPdfVO.setProName(tjOrderDetail.getProject().getProName());
- tjPdfVO.setProResult(tjOrderDetail.getProResult());
+ tjPdfVO.setProResult(tjOrderDetail.getProResult()==null ? null : tjOrderDetail.getProResult().replaceAll("\n","").replaceAll(" ",""));
tjPdfVO.setExc(tjOrderDetail.getExceptionDesc());
if (null != tjProject.getProMetering()) {
tjPdfVO.setCompany(tjProject.getProMetering());
@@ -3254,8 +3256,8 @@
if(StringUtil.isNotBlank(yxbx)) yxbx = yxbx.replaceAll(regex, "\n$0");
if(StringUtil.isBlank(bgNr)) bgNr = "";
if(StringUtil.isBlank(yxbx)) yxbx = "";
- tjPdfVO.setTs(yxbx);
- tjPdfVO.setSj(bgNr);
+ tjPdfVO.setTs(yxbx.replaceAll("\n","").replaceAll(" ",""));
+ tjPdfVO.setSj(bgNr.replaceAll("\n","").replaceAll(" ",""));
tjPdfVO.setShys(jcbgd.getShysxm());
tjPdfVO.setProName(jcbgd.getXmmc());
ids += "|" + jcbgd.getXmdm();
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 372f240..288687b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -3877,6 +3877,34 @@
}
+ @GetMapping("/chushenyemianyijianjiekou")
+ @ApiOperation(value = "鍒濆椤甸潰宸叉鎺ュ彛")
+ @Transactional
+ public AjaxResult chushenyemianyijianjiekou(@RequestParam String tjNUm, @RequestParam String proId) {
+ LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderRemark::getTjNumber, tjNUm);
+ wq.eq(TjOrderRemark::getProId, proId);
+ TjOrderRemark remark = remarkService.getOne(wq);
+ remark.setType(1);
+ remarkService.updateById(remark);
+ return AjaxResult.success("鎿嶄綔鎴愬姛!");
+ }
+
+
+ @GetMapping("/chushenyemianchexiaojiekou")
+ @ApiOperation(value = "鍒濆椤甸潰鎾ら攢鎺ュ彛")
+ @Transactional
+ public AjaxResult chushenyemianchexiaojiekou(@RequestParam String tjNUm, @RequestParam String proId) {
+ LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderRemark::getTjNumber, tjNUm);
+ wq.eq(TjOrderRemark::getProId, proId);
+ TjOrderRemark remark = remarkService.getOne(wq);
+ remark.setType(0);
+ remarkService.updateById(remark);
+ return AjaxResult.success("鎿嶄綔鎴愬姛!");
+ }
+
+
@PostMapping("/zongjanyemianshjianzhou")
@ApiOperation(value = "鎬绘鑾峰彇鏃堕棿杞存帴鍙�")
@Transactional
--
Gitblit v1.8.0