From f245335811cf7b3c78a55f957b78a59bb923a259 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 26 三月 2025 17:45:23 +0800
Subject: [PATCH] 修改采样查询
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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 c3e82e4..defdf2c 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
@@ -208,7 +208,7 @@
* 鑾峰彇閲囨牱瀹㈡埛鍒楄〃
*
* @param isSignFor
- * @param tjNum
+ * @param tjNumber
* @param name
* @param pageNum
* @param pageSize
@@ -219,8 +219,9 @@
@GetMapping("/getCusList")
@ApiOperation(value = "鑾峰彇閲囨牱瀹㈡埛鍒楄〃")
public AjaxResult getCusList(@RequestParam(defaultValue = "1") @ApiParam(value = "0鏄�1鍚�") Integer isSignFor,
- @RequestParam(required = false) @ApiParam(value = "浣撴鍙�") String tjNum,
+ @RequestParam(required = false) @ApiParam(value = "浣撴鍙�") String tjNumber,
@RequestParam(required = false) @ApiParam(value = "瀹㈡埛濮撳悕") String name,
+ @RequestParam(required = false) @ApiParam(value = "鍗曚綅") String dw,
@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
@ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime,
@@ -228,13 +229,24 @@
Page<TjSampling> samplingPage = new Page<>(pageNum, pageSize);
LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjSampling::getIsSignFor, isSignFor);
- if (null != tjNum && StrUtil.isNotBlank(tjNum))
- wrapper.like(TjSampling::getTjNum, tjNum);
+ if (null != tjNumber && StrUtil.isNotBlank(tjNumber))
+ wrapper.like(TjSampling::getTjNum, tjNumber);
if (null != name && StrUtil.isNotBlank(name))
wrapper.like(TjSampling::getCusName, name);
if (null != beginTime && null != endTime && StrUtil.isNotBlank(beginTime) && StrUtil.isNotBlank(endTime))
wrapper.between(TjSampling::getApplicationTime, beginTime, endTime);
- wrapper.groupBy(TjSampling::getCusId);
+ if (StrUtil.isNotBlank(dw)){
+ LambdaQueryWrapper<TjOrder> wqq=new LambdaQueryWrapper<>();
+ wqq.like(TjOrder::getFirmId,dw);
+ wqq.select(TjOrder::getTjNumber);
+ List<TjOrder> orderList = orderService.list(wqq);
+ if(null !=orderList && !orderList.isEmpty()){
+ List<String> list = orderList.stream().map(TjOrder::getTjNumber).collect(Collectors.toList());
+ wrapper.in(TjSampling::getTjNum, list);
+ }
+ }
+
+ wrapper.groupBy(TjSampling::getTjNum);
wrapper.orderByDesc(TjSampling::getCreateTime);
// wrapper.last("LIMIT " + (pageNum - 1) * pageSize + "," + pageSize);
Page<TjSampling> page = tjSamplingService.page(samplingPage, wrapper);
@@ -243,6 +255,8 @@
for (TjSampling tjSampling : list) {
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()));
@@ -364,7 +378,7 @@
if (list.size() >= 2) {
// 杩涜鍚堝苟
List<String> stringList = list.stream().map(TjSampling::getId).collect(Collectors.toList());
- log.info("鎻愬彇id ->{}",stringList);
+// log.info("鎻愬彇id ->{}",stringList);
for (String s : stringList) {
if (tjSamplingService.isMergeItem(s) != 0) {
list.removeIf(item -> Objects.equals(item.getId(), s));
--
Gitblit v1.8.0