From 1ec2072ad56154e2756b7512324ec6babf169872 Mon Sep 17 00:00:00 2001 From: linbenlei <572833793@qq.com> Date: Tue, 2 Feb 2021 09:52:24 +0800 Subject: [PATCH] fix: bug修复 --- platform/src/main/java/com/jflyfox/modules/front/template/TemplateService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/src/main/java/com/jflyfox/modules/front/template/TemplateService.java b/platform/src/main/java/com/jflyfox/modules/front/template/TemplateService.java index a971be3..2a8185a 100644 --- a/platform/src/main/java/com/jflyfox/modules/front/template/TemplateService.java +++ b/platform/src/main/java/com/jflyfox/modules/front/template/TemplateService.java @@ -294,16 +294,17 @@ public class TemplateService extends BaseService { Map map =new HashMap<>(); map.put("TRUCK","车运"); map.put("SHIP","船运"); + map.put("TRUCK_AND_SHIP","车船联运"); Map stMap =new HashMap<>(); stMap.put("PUBLISH","已发布"); stMap.put("RECEIVE","已接受"); - stMap.put("REJECT","拒绝"); + stMap.put("REJECT","已拒绝"); stMap.put("GOING","进行中"); - stMap.put("FINISH","结束"); + stMap.put("FINISH","已结束"); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); for (BDemand demand : list){ - String type = (String) demand.getAttrs().get("vehicle_type"); + String type = (String) demand.getAttrs().get("type"); demand.setTYPE(map.get(type)); String status = (String)demand.getAttrs().get("status"); demand.setSTATUS(stMap.get(status)); -- libgit2 0.21.2