From bc87b51e20a0adf0badf2033ede93cafeb5fc147 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 27 十一月 2024 17:29:59 +0800
Subject: [PATCH] 开发更新
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolLineServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 80565ec..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)
);
@@ -178,7 +179,7 @@
Utils.MP.blankToNull(pageWrap.getModel());
YwPatrolLine model = pageWrap.getModel();
queryWrapper.selectAll(YwPatrolLine.class)
- .select(" ( select count(1) from yw_line_point y where y.LINE_ID = yw_patrol_line.id ) as lineAmount ")
+ .select(" ( select count(1) from yw_line_point y where y.LINE_ID = t.id ) as lineAmount ")
.like(Objects.nonNull(model)&&StringUtils.isNotBlank(model.getName()),YwPatrolLine::getName,model.getName())
.eq(YwPatrolLine::getIsdeleted,Constants.ZERO)
.orderByDesc(YwPatrolLine::getCreateDate)
--
Gitblit v1.9.3