From 27f6edfba4c47caaa62750abe79f366be5076d95 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 25 十一月 2024 14:19:09 +0800
Subject: [PATCH] 开发更新

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java
index 8ec7dc7..dfa5cd2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java
@@ -293,19 +293,23 @@
 
     @Override
     public YwWorkorder findById(Integer id) {
-        MPJLambdaWrapper<YwWorkorder> wrapper = new MPJLambdaWrapper<>();
-        wrapper.selectAll(YwWorkorder.class )
-                .selectAs(SystemUser::getRealname,YwWorkorder::getDispatchUserName)
-                .select("t2.realname",YwWorkorder::getDealUserName)
+        MPJLambdaWrapper<YwWorkorder> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper.selectAll(YwWorkorder.class )
+                .selectAs(SystemUser::getRealname,YwWorkorder::getDealUserName)
                 .select("t3.realname",YwWorkorder::getCreatorName)
-                .selectAs(SystemUser::getMobile,YwWorkorder::getCreatorPhone)
-                .selectAs(Company::getCompanyNamePath,YwWorkorder::getCreatorCompany)
-                .leftJoin(SystemUser.class,SystemUser::getId,YwWorkorder::getDispatchUserId)
+                .selectAs(Category::getName,YwWorkorder::getCategoryName)
+                .selectAs(YwRoom::getName,YwWorkorder::getRoomName)
+                .selectAs(YwRoom::getRoomNum,YwWorkorder::getRoomNum)
+                .selectAs(YwFloor::getName,YwWorkorder::getFloorName)
+                .selectAs(YwBuilding::getName,YwWorkorder::getBuildingName)
                 .leftJoin(SystemUser.class,SystemUser::getId,YwWorkorder::getDealUserId)
+                .leftJoin(Category.class,Category::getId,YwWorkorder::getCateId)
                 .leftJoin(SystemUser.class,SystemUser::getId,YwWorkorder::getCreator)
-                .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
+                .leftJoin(YwRoom.class,YwRoom::getId,YwWorkorder::getRoomId)
+                .leftJoin(YwFloor.class,YwFloor::getId,YwWorkorder::getFloorId)
+                .leftJoin(YwBuilding.class,YwBuilding::getId,YwWorkorder::getBuildingId)
                 .eq(YwWorkorder::getId,id);
-        YwWorkorder model = ywWorkorderMapper.selectJoinOne(YwWorkorder.class,wrapper);
+        YwWorkorder model = ywWorkorderMapper.selectJoinOne(YwWorkorder.class,queryWrapper);
         initFiles(model);//璇诲彇闄勪欢淇℃伅
         YwWorkorderLog log = new YwWorkorderLog();
         log.setJobId(model.getId());

--
Gitblit v1.9.3