From d183f6f3f4dd871721e9bd3f30a4e8c71b4a9f1b Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 26 四月 2024 18:01:18 +0800
Subject: [PATCH] zjh 2024/04/26-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 914a6e3..bb3e3be 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
@@ -742,7 +742,7 @@
//闈炲寲楠岄」鐩姤鍛�
public Map<TjOrderRemark, List<TjPdfVO>> addTable(String tjNumber) {
//鍒涘缓map 閿负鐖堕」鐩� 鍊间负瀛愰」鐩泦鍚�
- Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
+ Map<TjOrderRemark, List<TjPdfVO>> printReport = new LinkedHashMap<>();
//鏌ュ埌璇ュ鎴风殑浣撴璁板綍
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
@@ -793,7 +793,7 @@
//鍖栭獙椤圭洰鎶ュ憡
public Map<TjOrderRemark, List<TjPdfVO>> addHuaYanTable(String tjNumber) {
//鍒涘缓map 閿负鐖堕」鐩� 鍊间负瀛愰」鐩泦鍚�
- Map<TjOrderRemark, List<TjPdfVO>> printReport = new HashMap<>();
+ Map<TjOrderRemark, List<TjPdfVO>> printReport = new LinkedHashMap<>();
//鏌ュ埌璇ュ鎴风殑浣撴璁板綍
// LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
// wq1.eq(TjOrder::getTjNumber, tjNumber);
@@ -835,7 +835,11 @@
if(entry.getKey().getProId().equals(tjOrderDetail.getProId())){
TjPdfVO tjPdfVO = new TjPdfVO();
tjPdfVO.setProName(tjOrderDetail.getProName());
- tjPdfVO.setProResult(tjOrderDetail.getProResult());
+ if(null !=tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")){
+ tjPdfVO.setProResult(tjOrderDetail.getProResult()+" ["+tjOrderDetail.getYcbz()+"]");
+ }else {
+ tjPdfVO.setProResult(tjOrderDetail.getProResult());
+ }
tjPdfVO.setExc(tjOrderDetail.getExceptionDesc());
tjPdfVO.setStandardValue(tjOrderDetail.getStanId());
tjPdfVO.setCompany(tjOrderDetail.getProAdvice());
--
Gitblit v1.8.0