From 0c0324f7ee99febe9c4aee0e149dc3fe73a9a1e1 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 28 十月 2024 15:35:59 +0800
Subject: [PATCH] zjh20241028
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
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 c2f9f49..0665064 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
@@ -231,7 +231,7 @@
ArrayList<TjCustomer> tjCustomers = new ArrayList<>();
for (TjSampling tjSampling : list) {
TjCustomer customer = customerService.getById(tjSampling.getCusId());
- customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
+ customer.setCusName(customer.getCusName());
customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
customer.setTjNumber(tjSampling.getTjNum());
@@ -260,7 +260,6 @@
wrapper.eq(TjSampling::getCusId, cusId);
wrapper.eq(TjSampling::getIsSignFor,isSignFor);
wrapper.and(i -> i.isNull(TjSampling::getParentId).or().eq(TjSampling::getIsMerge,1));
-// wrapper.isNull(TjSampling::getParentId).or().eq(TjSampling::getIsMerge,1);
wrapper.orderByDesc(TjSampling::getIsMerge);
List<TjSampling> list = tjSamplingService.list(wrapper);
if (list.isEmpty()){
@@ -268,8 +267,10 @@
return AjaxResult.error("鍙傛暟閿欒,鏈煡璇㈠埌鏁版嵁");
}
for (TjSampling sampling : list) {
-// sampling.setCusName(MatchUtils.hideCusName(sampling.getCusName()));
- sampling.setCusName(sampling.getCusName());
+ TjCustomer customer = customerService.getById(sampling.getCusId());
+ TjOrder order = orderService.getOrderByTjNum(sampling.getTjNum());
+ if(null !=order)sampling.setCardId(order.getCardId());
+ sampling.setCustomer(customer);
}
return AjaxResult.success(list);
}
@@ -287,6 +288,7 @@
int pdsfczhbxm = tjSamplingService.pdsfczhbxm(ids);
if (pdsfczhbxm == ids.size()) return AjaxResult.error("澶氫釜鍚堝苟椤圭洰涓嶅彲鍐嶇户缁悎骞�!");
if (pdsfczhbxm > 1) return AjaxResult.error("鏈�澶氬厑璁搁�夋嫨涓�涓悎骞惰繃鐨勯」鐩�!");
+// 鏌ヨ鍑洪噷闈笉鍙悎骞剁殑鍖栭獙椤圭洰
String string = tjSamplingService.getBuKeHebingProName(ids);
if(null !=string){
return AjaxResult.error(string+"杩欏嚑涓」鐩笉鍙悎骞�!");
@@ -416,7 +418,10 @@
List<TjSampling> tjSamplings = tjSamplingService.listByIds(ids);
if (tjSamplings.isEmpty())
return AjaxResult.error("璇烽�夋嫨瑕佺‘璁ら」");
+ String errorMsg = "";
for (TjSampling sampling : tjSamplings) {
+ if (sampling.getJyxmdm() == null)
+ errorMsg+=sampling.getProName()+"鍦╨is绯荤粺鏈壘鍒板搴旂紪鐮佹棤娉曞彂鍑虹敵璇�";
sampling.setIsSignFor("0");
// LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
// wq.eq(TjProject::getProParentId, sampling.getProId());
@@ -468,6 +473,7 @@
return AjaxResult.error("鎿嶄綔澶辫触璇烽噸璇�");
}
}
+ if (StrUtil.isNotBlank(errorMsg)) return AjaxResult.error(errorMsg);
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.8.0