From 491ae068865699d7bb50bc1809b75cfadfe2830a Mon Sep 17 00:00:00 2001 From: yangfei Date: Sat, 22 Jul 2017 21:43:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A6=87=E7=A7=91=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/ViewFacade.java | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 0c0e694..d25c6e2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -1404,14 +1404,24 @@ public class ViewFacade { mapData.put("gestaMonth", GestaMonthEnums.getTitle(antExcAddOther.getGestaMonth())); } mapData.put("gestaDate", antExcAddOther.getGestaDate()); - if(antExcAddOther.getFmType()!=null){ - mapData.put("fmType", CZFmTypeEnums.getTitle(antExcAddOther.getFmType())+"，"+antExcAddOther.getFmTypeRemark()==null?"":antExcAddOther.getFmTypeRemark()); + + if (antExcAddOther.getFmType()!=null) { + String fmType = CZFmTypeEnums.getTitle(antExcAddOther.getFmType()); + if(antExcAddOther.getFmTypeRemark()!=null){ + mapData.put("fmType", fmType+"，"+antExcAddOther.getFmTypeRemark()); + }else{ + mapData.put("fmType", fmType); + } }else{ - mapData.put("fmTypeRemark", antExcAddOther.getFmTypeRemark()); + mapData.put("fmType", antExcAddOther.getFmTypeRemark()); } - - if(antExcAddOther.getFitness()!=null){ - mapData.put("fitness", FitnessEnums.getTitle(antExcAddOther.getFitness())+"，"+antExcAddOther.getFitnessRemark()==null?"":antExcAddOther.getFitnessRemark()); + if (antExcAddOther.getFitness()!=null) { + String fitness = FitnessEnums.getTitle(Integer.parseInt(antExcAddOther.getFitness().toString())); + if(antExcAddOther.getFitnessRemark()!=null){ + mapData.put("fitness", fitness+"，"+antExcAddOther.getFitnessRemark()); + }else { + mapData.put("fitness", fitness); + } }else{ mapData.put("fitness", antExcAddOther.getFitnessRemark()); } -- 1.8.3.1