From 57552bf3ffb83ba2e1096d374f11be6133db1615 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 27 十一月 2024 10:52:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolLineServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolLineServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolLineServiceImpl.java
index f5b6603..54dea5a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolLineServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolLineServiceImpl.java
@@ -68,7 +68,7 @@
ywLinePoint.setCreateDate(new Date());
ywLinePoint.setCreator(loginUserInfo.getId());
ywLinePoint.setIsdeleted(Constants.ZERO);
- ywLinePoint.setLineId(ywLinePoint.getId());
+ ywLinePoint.setLineId(ywPatrolLine.getId());
}
ywLinePointMapper.insert(ywLinePointList);
return ywPatrolLine.getId();
@@ -117,7 +117,7 @@
){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"宸℃鐐归厤缃敊璇�");
}
- ywLinePoint.setLineId(ywLinePoint.getId());
+ ywLinePoint.setLineId(ywPatrolLine.getId());
ywLinePoint.setCreateDate(new Date());
ywLinePoint.setCreator(loginUserInfo.getId());
ywLinePoint.setIsdeleted(Constants.ZERO);
@@ -148,7 +148,8 @@
List<YwLinePoint> ywLinePointList = ywLinePointMapper.selectJoinList(YwLinePoint.class,new MPJLambdaWrapper<YwLinePoint>()
.selectAll(YwLinePoint.class)
.selectAs(YwPatrolPoint::getName,YwLinePoint::getPointName)
- .leftJoin(YwPatrolLine.class,YwPatrolLine::getId,YwLinePoint::getPointId)
+ .selectAs(YwPatrolPoint::getCode,YwLinePoint::getCode)
+ .leftJoin(YwPatrolPoint.class,YwPatrolPoint::getId,YwLinePoint::getPointId)
.eq(YwLinePoint::getLineId,id)
.orderByAsc(YwLinePoint::getSortnum)
);
--
Gitblit v1.9.3