|
|
@@ -34,6 +34,7 @@ import com.sckw.system.api.model.dto.res.UserCacheResDto;
|
|
|
import com.sckw.transport.dao.*;
|
|
|
import com.sckw.transport.model.*;
|
|
|
import com.sckw.transport.model.dto.*;
|
|
|
+import com.sckw.transport.model.vo.UserInfoVo;
|
|
|
import com.sckw.transport.model.vo.WaybillCountVo;
|
|
|
import com.sckw.transport.model.vo.WaybillOrderDriverVo;
|
|
|
import jakarta.annotation.Resource;
|
|
|
@@ -82,6 +83,8 @@ public class KwtWaybillOrderService {
|
|
|
KwtLogisticsOrderGoodsMapper logisticsOrderGoodsDao;
|
|
|
@Autowired
|
|
|
KwtLogisticsOrderCirculateMapper logisticsOrderCirculateDao;
|
|
|
+ @Autowired
|
|
|
+ CommonService commonService;
|
|
|
@Resource
|
|
|
private StreamBridge streamBridge;
|
|
|
@DubboReference(version = "1.0.0", group = "design", check = false)
|
|
|
@@ -2014,10 +2017,9 @@ public class KwtWaybillOrderService {
|
|
|
add(track != null ? track.getCreateBy() : null);
|
|
|
}};
|
|
|
createBys = createBys.stream().distinct().collect(Collectors.toList());
|
|
|
- Map<Long, UserCacheResDto> users = remoteSystemService.queryUserCacheMapByIds(createBys);
|
|
|
- UserCacheResDto loadUser = users == null ? null : users.get(loadTicket != null ? loadTicket.getUpdateBy() : null);
|
|
|
- UserCacheResDto unloadUser = users == null ? null : users.get(unloadTicket != null ? unloadTicket.getUpdateBy() : null);
|
|
|
- UserCacheResDto approver = users == null ? null : users.get(track != null ? track.getCreateBy() : null);
|
|
|
+ List<UserInfoVo> users = commonService.findUserList(createBys);
|
|
|
+ Map<Long, String> usersMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
|
|
|
+ users.forEach(e -> usersMap.put(e.getId(), e.getName()));
|
|
|
|
|
|
Map result = new HashMap();
|
|
|
result.put("wOrderId", wOrderId);
|
|
|
@@ -2033,7 +2035,7 @@ public class KwtWaybillOrderService {
|
|
|
result.put("loadUrls", loadTicket != null ? loadTicket.getUrls() : null);
|
|
|
result.put("loadOperateTime", loadTicket != null ? loadTicket.getOperateTime() : null);
|
|
|
result.put("loadCreateTime", loadTicket != null ? loadTicket.getCreateTime() : null);
|
|
|
- result.put("loadCreateByName", loadUser != null ? loadUser.getName() : null);
|
|
|
+ result.put("loadCreateByName", usersMap.get(loadTicket.getUpdateBy()));
|
|
|
result.put("loadCityName", loadAddress != null ? loadAddress.getCityName() : null);
|
|
|
result.put("loadDetailAddress", loadAddress != null ? loadAddress.getDetailAddress() : null);
|
|
|
result.put("unloadStatus", loadTicket != null ? 0 : 1);
|
|
|
@@ -2041,13 +2043,12 @@ public class KwtWaybillOrderService {
|
|
|
result.put("unloadUrls", unloadTicket != null ? unloadTicket.getUrls() : null);
|
|
|
result.put("unloadOperateTime", unloadTicket != null ? unloadTicket.getOperateTime() : null);
|
|
|
result.put("unloadCreateTime", unloadTicket != null ? unloadTicket.getCreateTime() : null);
|
|
|
- result.put("unloadCreateByName", unloadUser != null ? unloadUser.getName() : null);
|
|
|
+ result.put("unloadCreateByName", usersMap.get(unloadTicket.getUpdateBy()));
|
|
|
result.put("unloadCityName", unloadAddress != null ? unloadAddress.getCityName() : null);
|
|
|
result.put("unloadDetailAddress", unloadAddress != null ? unloadAddress.getDetailAddress() : null);
|
|
|
result.put("approvalTime", track != null ? track.getCreateTime() : null);
|
|
|
result.put("approvalOpinions", track != null ? track.getRemark() : null);
|
|
|
- result.put("approver", approver != null ? approver.getName() : null);
|
|
|
-
|
|
|
+ result.put("approver", usersMap.get(track.getUpdateBy()));
|
|
|
return HttpResult.ok(result);
|
|
|
}
|
|
|
|