林本磊 / nanyangnet

Download as
Browse Code »

Commit 1ec2072ad56154e2756b7512324ec6babf169872

Authored by 林本磊
1 parent 0da3a103
Exists in dev

fix: bug修复

Showing 1 changed file with 4 additions and 3 deletions   Show diff stats
platform/src/main/java/com/jflyfox/modules/front/template/TemplateService.java
  Diff comments   View file @1ec2072
@@ -294,16 +294,17 @@ public class TemplateService extends BaseService { @@ -294,16 +294,17 @@ public class TemplateService extends BaseService {
294 Map<String,String> map =new HashMap<>(); 294 Map<String,String> map =new HashMap<>();
295 map.put("TRUCK","车运"); 295 map.put("TRUCK","车运");
296 map.put("SHIP","船运"); 296 map.put("SHIP","船运");
  297 + map.put("TRUCK_AND_SHIP","车船联运");
297 298
298 Map<String,String> stMap =new HashMap<>(); 299 Map<String,String> stMap =new HashMap<>();
299 stMap.put("PUBLISH","已发布"); 300 stMap.put("PUBLISH","已发布");
300 stMap.put("RECEIVE","已接受"); 301 stMap.put("RECEIVE","已接受");
301 - stMap.put("REJECT","拒绝"); 302 + stMap.put("REJECT","已拒绝");
302 stMap.put("GOING","进行中"); 303 stMap.put("GOING","进行中");
303 - stMap.put("FINISH","结束"); 304 + stMap.put("FINISH","已结束");
304 SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 305 SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
305 for (BDemand demand : list){ 306 for (BDemand demand : list){
306 - String type = (String) demand.getAttrs().get("vehicle_type"); 307 + String type = (String) demand.getAttrs().get("type");
307 demand.setTYPE(map.get(type)); 308 demand.setTYPE(map.get(type));
308 String status = (String)demand.getAttrs().get("status"); 309 String status = (String)demand.getAttrs().get("status");
309 demand.setSTATUS(stMap.get(status)); 310 demand.setSTATUS(stMap.get(status));