From e5bab3dc2ef0cca716a3f376899575a8179533d2 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 28 十一月 2024 19:00:16 +0800
Subject: [PATCH] 客户资料 巡检任务业务

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwPatrolLineServiceImpl.java |    9 ++++++---
 1 files changed, 6 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..51e298f 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
@@ -65,10 +65,11 @@
             ){
                 throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"宸℃鐐归厤缃敊璇�");
             }
+            ywLinePoint.setId(null);
             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 +118,8 @@
             ){
                 throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"宸℃鐐归厤缃敊璇�");
             }
-            ywLinePoint.setLineId(ywLinePoint.getId());
+            ywLinePoint.setId(null);
+            ywLinePoint.setLineId(ywPatrolLine.getId());
             ywLinePoint.setCreateDate(new Date());
             ywLinePoint.setCreator(loginUserInfo.getId());
             ywLinePoint.setIsdeleted(Constants.ZERO);
@@ -148,7 +150,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