From 6be859f745beaa13a831f3291147612f66b9d776 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 26 十一月 2024 09:42:21 +0800
Subject: [PATCH] ll
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwWorkorderServiceImpl.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 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..f4c95e9 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
@@ -66,6 +66,7 @@
model.setIsdeleted(Constants.ZERO);
model.setCreateDate(new Date());
model.setStatus(Constants.ZERO);
+ model.setDealStatus(Constants.ZERO);
model.setEditDate(model.getCreateDate());
model.setEditor(model.getCreator());
ywWorkorderMapper.insert(model);
@@ -184,8 +185,9 @@
update.setDispatchUserId(update.getEditor());
update.setDispatchDate(update.getEditDate());
update.setDispatchInfo(ywWorkorder.getDispatchInfo());
+ update.setDealUserId(ywWorkorder.getDealUserId());
ywWorkorderMapper.updateById(update);
- dealLogBiz(model,Constants.YwLogType.WORKORDER_DISPATCH,model.getLoginUserInfo().getRealname(),user.getRealname());//璁板綍鏂板缓鏃ュ織
+ dealLogBiz(model,Constants.YwLogType.WORKORDER_DISPATCH,ywWorkorder.getLoginUserInfo().getRealname(),user.getRealname());//璁板綍鏂板缓鏃ュ織
}
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
@@ -211,7 +213,7 @@
update.setDealDate(update.getEditDate());
update.setDealInfo(ywWorkorder.getDispatchInfo());
ywWorkorderMapper.updateById(update);
- dealLogBiz(model,Constants.YwLogType.WORKORDER_DEAL,model.getLoginUserInfo().getRealname(),null);//璁板綍鏂板缓鏃ュ織
+ dealLogBiz(model,Constants.YwLogType.WORKORDER_DEAL,ywWorkorder.getLoginUserInfo().getRealname(),null);//璁板綍鏂板缓鏃ュ織
}
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
@@ -293,19 +295,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