From a51a70b780ef0ed24abb81b096c80649a0255ece Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 02 七月 2024 19:29:23 +0800
Subject: [PATCH] zjh 2024/07/2-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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..c11a702 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
@@ -703,19 +703,29 @@
if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
final TjProject byId = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
+ String metering = null;
if (null == byId) {
detailService.removeById(tjOrderDetail.getOrderDetailId());
} else {
+ metering = byId.getProMetering();
tjOrderDetail.setProject(byId);
}
List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
if (list2.size() == 0) {
- tjOrderDetail.setStandard(new TjStandard());
+ TjStandard standard = new TjStandard();
+ if (StrUtil.isNotBlank(metering))
+ standard.setCompany(metering);
+ tjOrderDetail.setStandard(standard);
} else if (list2.size() == 1) {
- tjOrderDetail.setStandard(list2.get(0));
+ TjStandard standard = list2.get(0);
+ if (StrUtil.isNotBlank(metering) && StrUtil.isBlank(standard.getCompany()))
+ standard.setCompany(metering);
+ tjOrderDetail.setStandard(standard);
} else {
final int ageType = StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday()));
TjStandard tjStandard1 = tjStandardService.getListBySexAndType(customer.getCusSex(), ageType, String.valueOf(tjOrderDetail.getProId()));
+ if (StrUtil.isNotBlank(metering) && StrUtil.isBlank(tjStandard1.getCompany()))
+ tjStandard1.setCompany(metering);
tjOrderDetail.setStandard(tjStandard1);
}
}
@@ -784,6 +794,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 +812,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