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

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java |   30 ++++++++++++++++++++----------
 1 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java
index 9ac3f78..b0d9f23 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java
@@ -94,7 +94,6 @@
                 ywContractRoom.setIsdeleted(Constants.ZERO);
                 ywContractRoom.setContractId(ywContractBill.getId());
                 ywContractRoom.setType(Constants.ONE);
-
             }
             ywContractRoomMapper.insert(ywContractBill.getYwContractRoomList());
         }
@@ -259,20 +258,30 @@
             );
             //妤煎畤鍚嶇О
             List<YwContractRoom> ywContractRoomList = ywContractBill.getYwContractRoomList();
-//            String roomPathName = new StringBuffer();
-//            for (:
-//                 ) {
-//
-//            }
-
-
+            StringBuilder roomPathName = new StringBuilder();
+            for (YwContractRoom ywContractRoom:ywContractRoomList) {
+                if(StringUtils.isNotBlank(ywContractRoom.getProjectName())){
+                    roomPathName.append(ywContractRoom.getProjectName());
+                }
+                if(StringUtils.isNotBlank(ywContractRoom.getBuildingName())){
+                    roomPathName.append(ywContractRoom.getBuildingName());
+                }
+                if(StringUtils.isNotBlank(ywContractRoom.getFloorName())){
+                    roomPathName.append(ywContractRoom.getFloorName());
+                }
+                if(StringUtils.isNotBlank(ywContractRoom.getRoomName())){
+                    roomPathName.append(ywContractRoom.getRoomName());
+                }
+                if(StringUtils.isNotBlank(roomPathName)){
+                    roomPathName.append(";");
+                }
+            }
+            ywContractBill.setRoomPathName(roomPathName.toString());
 
         }
 
         return PageData.from(iPage);
     }
-
-
 
     public void dealRoomDetail(List<YwContractBill> ywContractBillList){
         //鏌ヨ璐﹀崟涓嬬殑妤煎畤鏁版嵁
@@ -285,6 +294,7 @@
                         .selectAs(YwProject::getName,YwRoom::getProjectName)
                         .selectAs(YwFloor::getName,YwRoom::getFloorName)
                         .selectAs(YwBuilding::getName,YwRoom::getBuildingName)
+                        .selectAs(YwRoom::getName,YwContractRoom::getRoomName)
                         .leftJoin(YwRoom.class,YwRoom::getId,YwContractRoom::getRoomId)
                         .leftJoin(YwFloor.class,YwFloor::getId,YwRoom::getFloor)
                         .leftJoin(YwProject.class,YwProject::getId,YwRoom::getProjectId)

--
Gitblit v1.9.3