From 9f4f6772a5ab5ae05b44be38f65dce3620108d01 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 13 十二月 2024 19:50:10 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
index 3c3cec7..7772152 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
@@ -134,22 +134,24 @@
TmsCircleStatusResultListResponse t = new TmsCircleStatusResultListResponse();
TMSContants.TopStatusLevel tem = TMSContants.TopStatusLevel.ddsc;
if(i == 0){
- tem=TMSContants.TopStatusLevel.ddsc;
+ tem=TMSContants.TopStatusLevel.yrk;
} if(i == 1){
- tem=TMSContants.TopStatusLevel.ydpzz;
+ tem=TMSContants.TopStatusLevel.ydh;
} if(i == 2){
- tem=TMSContants.TopStatusLevel.ckckz;
- } if(i == 3){
tem=TMSContants.TopStatusLevel.clysz;
} if(i == 4){
- tem=TMSContants.TopStatusLevel.ydh;
+ tem=TMSContants.TopStatusLevel.ckckz;
+ } if(i == 3){
+ tem=TMSContants.TopStatusLevel.ydpzz;
} if(i == 5){
- tem=TMSContants.TopStatusLevel.yrk;
+ tem=TMSContants.TopStatusLevel.ddsc;
}
t.setName(tem.getName());
t.setKey(tem.getKey());
t.setSecondList(getSecondCircleStatusList(tem,response.getData()));
- list.add(t);
+ if(t.getSecondList()!=null & t.getSecondList().size()>0){
+ list.add(t);
+ }
}
}
@@ -165,7 +167,16 @@
if(statusList!=null){
for(Integer t :statusList){
for(TmsCircleStatusListResponse status :data){
- if(StringUtils.equals(status.getOrderStatus(),t.toString())){
+ if(Constants.equalsInteger(status.getOrderStatus(),Constants.FOUR)
+ && Constants.equalsInteger(status.getType(),TMSContants.StatusCode.app)) {
+ status.setOrderStatus(TMSContants.ChildStatusLevel.clqdapp.getKey());
+ }
+ if(Constants.equalsInteger(status.getOrderStatus(),Constants.FIVE)
+ && Constants.equalsInteger(status.getType(),TMSContants.StatusCode.app)) {
+ status.setOrderStatus(TMSContants.ChildStatusLevel.ddzhd.getKey());
+ }
+ if(Constants.equalsInteger(status.getOrderStatus(),t )){
+ status.setOrderStatusDes(TMSContants.ChildStatusLevel.getInfo(status.getOrderStatus(),null));
list.add(status);
}
}
--
Gitblit v1.9.3