From 263a5553f157945018e1c60290880fedfd1799b0 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 17 Jun 2016 14:09:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/common/enums/ServiceTypeEnums.java | 2 +- .../operate/web/facade/BabyBookbuildingFacade.java | 4 ++++ .../operate/web/facade/BookbuildingFacade.java | 18 +++++++++--------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java index 98beb40..263a7db 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java @@ -34,7 +34,7 @@ public enum ServiceTypeEnums { for(ServiceTypeEnums s : ServiceTypeEnums.values()) { Map map = new HashMap<>(); map.put("id", s.getId()+""); - map.put("title", s.getTitle()); + map.put("name", s.getTitle()); list.add(map); } return list; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 7225f80..454ebb1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -278,6 +278,10 @@ public class BabyBookbuildingFacade { List professionTypeResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID); map.put("professionType",professionTypeResults); + //服务类型 + List servictType = ServiceTypeEnums.getServiceTypeList(); + map.put("servictType",servictType); + BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setData(map); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 63e588d..8095a42 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -109,37 +109,37 @@ public class BookbuildingFacade { } - Map mapProvince = new HashMap<>(); + Map typeMap = new HashMap<>(); //证件类型 List pcerteTypeResult = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.CERTE_TYPE_ID); - mapProvince.put("certeType",pcerteTypeResult); + typeMap.put("certeType", pcerteTypeResult); //国籍 List countiryResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.COUNTRY_TYPE_ID); - mapProvince.put("country",countiryResults); + typeMap.put("country", countiryResults); // 民族 List nationResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.NATION_TYPE_ID); - mapProvince.put("nation",nationResults); + typeMap.put("nation", nationResults); // 职业类别 List professionTypeResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID); - mapProvince.put("professionType",professionTypeResults); + typeMap.put("professionType", professionTypeResults); // 户籍类别 List censusType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.CENSUS_TYPE_ID); - mapProvince.put("censusType",censusType); + typeMap.put("censusType", censusType); // 户籍类别 List liveType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LIVE_TYPE_ID); - mapProvince.put("liveType",liveType); + typeMap.put("liveType", liveType); //服务类型 List servictType = ServiceTypeEnums.getServiceTypeList(); - mapProvince.put("servictType",servictType); + typeMap.put("servictType", servictType); - list.add(mapProvince); + list.add(typeMap); Map mapData = new HashMap<>(); -- 1.8.3.1