From 9155df2aeab5b0d95c89dd928dbaefbfbaeae9d1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 九月 2024 17:10:35 +0800
Subject: [PATCH] zjh 2024-09-05
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 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 326fb68..2b3d4ca 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
@@ -606,7 +606,7 @@
List<String> baoGaoDans = ltkjHybgdService.getJianYanBaoGaoDan(order.getCardId());
List<String> jianChaBaoGaoDan = ltkjHybgdService.getJianChaBaoGaoDan(order.getCardId());
//鍚屾妫�楠�
- if (null != baoGaoDans && baoGaoDans.size() > 0) {
+ if (null != baoGaoDans && !baoGaoDans.isEmpty()) {
Date dates = new Date();
Map<String, Object> map = new HashMap<>();
map.put("his_registration_id", order.getCardId());
@@ -671,7 +671,7 @@
log.info("妫�鏌ラ」鐩煡璇㈣繑鍥炲��: " + results.toString());
if (Integer.parseInt(results.get("code").toString()) == 200) {
List<Map<String, Object>> datas = (List<Map<String, Object>>) results.get("data");
- if (null != datas && datas.size() > 0) {
+ if (null != datas && !datas.isEmpty()) {
jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId());
jcbgdService.deletedLtkjJcbgdByTjhAndTmh(order.getCardId());
for (Map<String, Object> objectMap : datas) {
@@ -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);
@@ -1247,19 +1247,24 @@
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 {
+ tjOrderDetail.setYcbz("");
+ }
+ if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")) {
+ tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
+ }
+ }else {
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