From 59363c48a5977f4df327d87085d4c565c06bc96c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 27 九月 2024 08:39:04 +0800
Subject: [PATCH] zjh20240927 修改驾驶员体检登记失败的问题
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 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 ab2051c..b00ef3f 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
@@ -1219,7 +1219,7 @@
// final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
// if(null !=getInfoFromSqlData && getInfoFromSqlData.equals("Y"))
// tbhyxm(one);
- TjCustomer customer = customerService.getById(one.getUserId());
+// TjCustomer customer = customerService.getById(one.getUserId());
List<TjOrderRemark> remarkList = orderRemarkService.addHuaYanAndCgTable(tjNumber);
List<TjOrderDetail> tjOrderDetails = detailService.addHuaYanAndCgTable(tjNumber);
@@ -1242,24 +1242,36 @@
}
if (StrUtil.isNotBlank(ckfw)) {
try {
+ if (ckfw != null && ckfw.contains("-")) {
Integer.parseInt(tjOrderDetail.getYcbz());
String[] split = ckfw.split("-");
BigDecimal min = new BigDecimal(split[0]);
BigDecimal max = new BigDecimal(split[1]);
String proResult = tjOrderDetail.getProResult();
- BigDecimal jyjgval = new BigDecimal(proResult);
- if (jyjgval.compareTo(min) < 0) {
- tjOrderDetail.setYcbz("鈫�");
- } else if (jyjgval.compareTo(max) > 0) {
- tjOrderDetail.setYcbz("鈫�");
- } else {
+ if(null !=proResult){
+ BigDecimal jyjgval = new BigDecimal(proResult);
+ if (jyjgval.compareTo(min) < 0) {
+ tjOrderDetail.setYcbz("鈫�");
+ } else if (jyjgval.compareTo(max) > 0) {
+ tjOrderDetail.setYcbz("鈫�");
+ } else if(proResult.contains("闃�")) {
+ tjOrderDetail.setYcbz("");
+ }else {
+ tjOrderDetail.setYcbz("");
+ }
+ if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")) {
+ tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
+ }
+ }else {
tjOrderDetail.setYcbz("");
+ }
+ }else {
+ if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�")) tjOrderDetail.setYcbz("");
+
+ if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�")) tjOrderDetail.setYcbz("鈫�");
}
} catch (NumberFormatException ignored) {
ignored.printStackTrace();
- }
- if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")) {
- tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
}
}else {
tjOrderDetail.setYcbz("");
--
Gitblit v1.8.0