From b1941a86deae55e72823961b0efcec61349fa720 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 04 十一月 2025 10:58:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
index d580516..cbcb8bd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
@@ -1323,7 +1323,7 @@
.leftJoin(Category.class,Category::getId,JkLine::getCategoryId )
.leftJoin(Cars.class,Cars::getId,JkLine::getCarId)
.and(StringUtils.isNotBlank(telecomLineInfoDTO.getSearchInfo()),i->i.like(Cars::getCode,telecomLineInfoDTO.getSearchInfo()).or().like(JkLine::getName,telecomLineInfoDTO.getSearchInfo()))
- .eq(StringUtils.isNotBlank(telecomLineInfoDTO.getDateInfo()),JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo())
+ .like(StringUtils.isNotBlank(telecomLineInfoDTO.getDateInfo()),JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo())
.eq(Objects.nonNull(telecomLineInfoDTO.getCategoryId()),JkLine::getCategoryId, telecomLineInfoDTO.getCategoryId())
.eq(Objects.nonNull(telecomLineInfoDTO.getLineId()),JkLine::getId, telecomLineInfoDTO.getLineId());
@@ -1370,7 +1370,7 @@
.select(" ifnull((select count(1) from jk_sketch_customer jc where jc.ISDELETED= 0 and jc.SKETCH_ID = t.id),0)" ,JkSketch::getCustomerNum)
.select(" ifnull((select count(1) from jk_sketch_line jc where jc.TYPE = 0 and jc.SKETCH_ID = t.id),0)" ,JkSketch::getBeforeLineNum)
.leftJoin(Category.class,Category::getId,JkSketch::getCategoryId )
- .eq(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
+ .like(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
List<JkSketch> sketchList = jkSketchMapper.selectJoinList(JkSketch.class,sketchMPJLambdaWrapper);
if(CollectionUtils.isEmpty(sketchList)){
return telecomLineCountVO;
@@ -1439,7 +1439,7 @@
MPJLambdaWrapper<JkSketch> sketchMPJLambdaWrapper = new MPJLambdaWrapper<JkSketch>().selectAll(JkSketch.class )
.selectAs(Category::getName,JkSketch::getCategoryName)
.leftJoin(Category.class,Category::getId,JkSketch::getCategoryId )
- .eq(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
+ .like(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
List<JkSketch> sketchList = jkSketchMapper.selectJoinList(JkSketch.class,sketchMPJLambdaWrapper);
if(CollectionUtils.isEmpty(sketchList)){
return new ArrayList<TelecomCategoryDataVO>();
@@ -1503,7 +1503,7 @@
.eq(Objects.nonNull(telecomLineInfoDTO.getCategoryId()),JkSketchLine::getCategoryId,telecomLineInfoDTO.getCategoryId())
.eq(Objects.nonNull(telecomLineInfoDTO.getLineId()),JkSketchLine::getLineId,telecomLineInfoDTO.getLineId())
.apply(" ( t.TYPE = t1.OPT_STATUS ) ")
- .eq(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
+ .like(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
List<JkSketchLine> returnLineList = jkSketchLineMapper.selectJoinList(JkSketchLine.class,queryWrapper);
// //浼樺寲鍓嶆暟鎹�
--
Gitblit v1.9.3