From c976a54131a31143c174c475c8050427946eb4a8 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 01 七月 2024 16:16:10 +0800
Subject: [PATCH] 修复箭头问题增加单位返回
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 9cc2433..79aed1f 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -707,6 +707,9 @@
detailService.removeById(tjOrderDetail.getOrderDetailId());
} else {
tjOrderDetail.setProject(byId);
+ String metering = byId.getProMetering();
+ if (StrUtil.isNotBlank(metering))
+ tjOrderDetail.setUnit(metering);
}
List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
if (list2.size() == 0) {
@@ -784,6 +787,9 @@
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
if(remark.getProId().equals(tjOrderDetail.getProId())){
String ckfw = tjOrderDetail.getStanId();
+ if (StrUtil.isNotBlank(tjOrderDetail.getProAdvice())){
+ ckfw = ckfw.replace(tjOrderDetail.getProAdvice().trim(),"");
+ }
if (StrUtil.isNotBlank(ckfw)) {
try {
Integer.parseInt(tjOrderDetail.getYcbz());
@@ -799,7 +805,9 @@
}else {
tjOrderDetail.setYcbz("");
}
- } catch (NumberFormatException ignored) { }
+ } catch (NumberFormatException ignored) {
+ ignored.printStackTrace();
+ }
}
if(null !=tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")){
tjOrderDetail.setProResult(tjOrderDetail.getProResult()+" ["+tjOrderDetail.getYcbz()+"]");
--
Gitblit v1.8.0