From cf5426f9bc46ab1f5737942883c4358dedfd4235 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 25 六月 2025 15:06:29 +0800
Subject: [PATCH] zjh20250625
---
ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java | 1 +
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java | 6 ++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 16 +++++++++-------
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
index 8568add..1062b9c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/callback/CallBackController.java
@@ -87,6 +87,7 @@
TjFlowingWater water = tjFlowingWaterService.getOne(wrapper);
if(null !=water){
water.setPayStasus(1L);
+ water.setSfjs("1");
if (tjFlowingWaterService.updateById(water)) {
String jxbz = water.getJxbz();
if(StringUtil.isNotBlank(jxbz)){
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
index a68e59b..0de6c6c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
@@ -245,13 +245,15 @@
TjCustomer customer = customerService.getById(tjSampling.getCusId());
if(null !=customer){
TjOrder order = orderService.getOrderByTjNum(tjSampling.getTjNum());
- customer.setCompName(order.getFirmName());
- customer.setCusName(customer.getCusName());
- customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
- customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
- customer.setTjNumber(tjSampling.getTjNum());
- customer.setApplicationTime(tjSampling.getApplicationTime());
- tjCustomers.add(customer);
+ if(null !=order){
+ customer.setCompName(order.getFirmName());
+ customer.setCusName(customer.getCusName());
+ customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
+ customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
+ customer.setTjNumber(tjSampling.getTjNum());
+ customer.setApplicationTime(tjSampling.getApplicationTime());
+ tjCustomers.add(customer);
+ }
}
}
HashMap<String, Object> hashMap = new HashMap<>();
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java
index dc93f04..6940a29 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjFlowingWater.java
@@ -180,6 +180,12 @@
@ApiModelProperty(value = "鍔犻」鏍囧織")
private String jxbz;
+ @ApiModelProperty(value = "鑷垂宸ヨ垂")
+ private String zfgf;
+
+ @ApiModelProperty(value = "鏄惁缁撶畻 0鏈� 1宸� ")
+ private String sfjs;
+
/**
* 鏀惰垂id
*/
--
Gitblit v1.8.0