From 9f2fdafa17032b347696fd5dd8b7f6cf3c6d5150 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 16 十月 2024 16:11:04 +0800
Subject: [PATCH] 修改客户采样查询条件 恢复确认采样代码
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 21 ++-------------------
1 files changed, 2 insertions(+), 19 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 7172769..fec54ca 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
@@ -241,18 +241,14 @@
return AjaxResult.error("鍙傛暟閿欒");
LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjSampling::getCusId,cusId);
+ wrapper.isNull(TjSampling::getParentId);
List<TjSampling> list = tjSamplingService.list(wrapper);
if (list.isEmpty())
return AjaxResult.error("鍙傛暟閿欒");
- List<TjSampling> projectList = new ArrayList<>();
for (TjSampling sampling : list) {
sampling.setCusName(MatchUtils.hideCusName(sampling.getCusName()));
- TjProject project = projectService.getById(sampling.getProId());
- if (null != project && project.getProParentId() == 0) {
- projectList.add(sampling);
- }
}
- return AjaxResult.success(projectList);
+ return AjaxResult.success(list);
}
@PostMapping("/mergeCaiYang")
@@ -327,12 +323,9 @@
if (null == ids || ids.size() == 0) {
return AjaxResult.error("璇烽�夋嫨瑕佺‘璁ら」");
}
- String tjNumber = "";
- ArrayList<TjProject> projects = new ArrayList<>();
for (String id : ids) {
TjSampling sampling = tjSamplingService.getById(id);
if (null != sampling) {
- tjNumber = sampling.getTjNum();
sampling.setIsSignFor("0");
LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
wq.eq(TjProject::getProParentId, sampling.getProId());
@@ -341,7 +334,6 @@
for (TjProject project : projectList) {
Long proId = project.getProId();
collect.add(String.valueOf(proId));
- projects.add(project);
}
LambdaQueryWrapper<TjSampling> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjSampling::getTjNum, sampling.getTjNum());
@@ -357,15 +349,6 @@
if (!tjSamplingService.updateById(sampling)) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error("鎿嶄綔澶辫触,璇烽噸璇�");
- }
- }
- if (StrUtil.isNotBlank(tjNumber)){
- TjOrder order = orderService.getOrderByTjNum(tjNumber);
- TjCustomer customer = customerService.getById(order.getUserId());
- List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(String.valueOf(customer.getCusId()),order.getCardId());
- Boolean save = lisApiMethod.save(order, customer, projects, detailList);
- if (!save){
-
}
}
--
Gitblit v1.8.0