by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增保洁订单功能

Browse Source
This commit is contained in:
yuyongle
2025-09-09 18:15:40 +08:00
parent b5de50fb67
commit 1cc77bdedc
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/cleanOrderImpl/CleanOrderServiceImpl.java
View File

@@ -95,24 +95,24 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
CleanOrderVo cleanOrderVo = MapstructUtils.convert(cleanOrder, CleanOrderVo.class); CleanOrderVo cleanOrderVo = MapstructUtils.convert(cleanOrder, CleanOrderVo.class);
cleanOrderVo.setCleanList(cleanList); cleanOrderVo.setCleanList(cleanList);
cleanOrderVo.setRelationList(cleanRelationList); cleanOrderVo.setRelationList(cleanRelationList);
//查询订单记录 // //查询订单记录
List<CleanOrderRecordVo> cleanOrderRecordVos = cleanOrderRecordMapper.selectVoList(Wrappers.<CleanOrderRecord>lambdaQuery().eq(CleanOrderRecord::getCleanOrderId, id)); // List<CleanOrderRecordVo> cleanOrderRecordVos = cleanOrderRecordMapper.selectVoList(Wrappers.<CleanOrderRecord>lambdaQuery().eq(CleanOrderRecord::getCleanOrderId, id));
if(CollUtil.isNotEmpty(cleanOrderRecordVos)){ // if(CollUtil.isNotEmpty(cleanOrderRecordVos)){
cleanOrderRecordVos.stream().forEach(item -> { // cleanOrderRecordVos.stream().forEach(item -> {
//查询指派人名称 // //查询指派人名称
if(ObjectUtil.isNotEmpty(item.getHandler())){ // if(ObjectUtil.isNotEmpty(item.getHandler())){
RemoteUserVo userInfo = remoteUserService.getUserInfoById(item.getHandler()); // RemoteUserVo userInfo = remoteUserService.getUserInfoById(item.getHandler());
item.setHandlerText(userInfo.getNickName()); // item.setHandlerText(userInfo.getNickName());
} // }
//查询发起人名称 // //查询发起人名称
if(ObjectUtil.isNotEmpty(item.getInitiatorPeople())){ // if(ObjectUtil.isNotEmpty(item.getInitiatorPeople())){
RemoteUserVo userInfo = remoteUserService.getUserInfoById(item.getInitiatorPeople()); // RemoteUserVo userInfo = remoteUserService.getUserInfoById(item.getInitiatorPeople());
item.setInitiatorPeopleText(userInfo.getNickName()); // item.setInitiatorPeopleText(userInfo.getNickName());
} // }
//
}); // });
cleanOrderVo.setRecordVoList(cleanOrderRecordVos); // cleanOrderVo.setRecordVoList(cleanOrderRecordVos);
} // }
return cleanOrderVo; return cleanOrderVo;
@@ -198,7 +198,7 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
boolean flag = baseMapper.insert(add) > 0; boolean flag = baseMapper.insert(add) > 0;
if (flag){ if (flag){
bo.setId(add.getId()); bo.setId(add.getId());
validEntityBeforeSave(bo); // validEntityBeforeSave(bo);
} }
//取出clean_order表中的所有clean数据 //取出clean_order表中的所有clean数据