From bcd62be27acf68adb54415f75b37f5e26d65c11b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 10:34:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java
index f12f323..a80b1c6 100644
--- a/server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java
@@ -288,12 +288,12 @@
public TmsEmployeeListResponse getEmployeeList(TmsEmployeeListRequest param){
String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+TMSContants.InterfacePath.getEmployeeList[0];
- TmsBaseResponse<TmsEmployeeListResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.getEmployeeList[1],JSONObject.toJSONString(param)
- ,new TypeReference< TmsBaseResponse<TmsEmployeeListResponse>>(){});
- if(response ==null || response.getData() == null){
+ TmsBaseResponse<List<TmsEmployeeListResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getEmployeeList[1],JSONObject.toJSONString(param)
+ ,new TypeReference< TmsBaseResponse<List<TmsEmployeeListResponse>>>(){});
+ if(response ==null || response.getData() == null || response.getData().size() ==0){
return new TmsEmployeeListResponse();
}
- return response.getData();
+ return response.getData().get(0);
}
/**
* 鍑哄簱鑳藉姏缁熻
@@ -357,8 +357,28 @@
TmsCircleStatusListRequest p1 = new TmsCircleStatusListRequest();
p1.setContractNumber(param.getContractNumber());
result.setCicleStatusList(getCicleStatusList(p1));
+ result.setStartTransportDate(getStartTransportDateByList(result.getCicleStatusList()));
return result;
}
+
+ private String getStartTransportDateByList(List<TmsCircleStatusResultListResponse> cicleStatusList) {
+ if(cicleStatusList!=null){
+ for(TmsCircleStatusResultListResponse m :cicleStatusList){
+ if(Constants.equalsInteger(m.getKey(),TMSContants.TopStatusLevel.clysz.getKey())){
+ if(m.getSecondList()!=null){
+ for(TmsCircleStatusListResponse c :m.getSecondList()){
+ if(Constants.equalsInteger(c.getOrderStatus(),TMSContants.ChildStatusLevel.clqdapp.getOrderStatus())){
+ return c.getRecordDate();
+ }
+ }
+ }
+ }
+ }
+ }
+
+ return null;
+ }
+
/**
* 鍏ㄥ浗鍒拌揣鍦板垎甯冩煡璇㈡煡璇�
* @param param 鍙傛暟
--
Gitblit v1.9.3