From de318fc8516fd61ac05735636536728ce12d02c5 Mon Sep 17 00:00:00 2001 From: landong2015 Date: Thu, 8 Dec 2016 16:23:17 +0800 Subject: [PATCH] update --- .../main/java/com/lyms/platform/common/enums/SexEnum.java | 15 +++++++-------- .../lyms/platform/operate/web/facade/FolicAcidFacade.java | 5 ++--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SexEnum.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SexEnum.java index e5183ae..32a64f6 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/SexEnum.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SexEnum.java @@ -5,32 +5,31 @@ package com.lyms.platform.common.enums; * Created by Zhang.Rui on 2016/4/7. */ public enum SexEnum { - MAN("ac334aa6-b0f2-4b25-a231-cf968c14ef8b", "男"), - WOMAN("c23779f1-cb6e-44d0-9fc8-0a990bf6184c", "女"); + MAN(1, "男"), WOMAN(0, "女"); - private String id; + private Integer id; private String text; - SexEnum(String id, String text) { + SexEnum(int id, String text) { this.id = id; this.text = text; } - public static String getTextById(String id) { + public static String getTextById(int id) { for (SexEnum sexEnum : values()) { - if (sexEnum.getId().equals(id)) { + if (sexEnum.getId() == id) { return sexEnum.getText(); } } return "未知"; } - public String getId() { + public Integer getId() { return id; } - public void setId(String id) { + public void setId(Integer id) { this.id = id; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java index 2fc07f5..3211f7b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java @@ -4,7 +4,6 @@ import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.FolicAcidService; import com.lyms.platform.biz.service.ResidentsArchiveService; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.enums.SexEnum; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; @@ -181,9 +180,9 @@ public class FolicAcidFacade { archiveMap.put("phone", archiveModel.getPhone()); archiveMap.put("id", archiveModel.getId()); if (archiveModel.getSex()== SystemConfig.WOMAN_ID){ - archiveMap.put("sex", SexEnum.getTextById(SystemConfig.WOMAN_ID)); + archiveMap.put("sex", "女"); }else { - archiveMap.put("sex", SexEnum.getTextById(SystemConfig.MAN_ID)); + archiveMap.put("sex", "男"); } archiveMap.put("residenceRegister",CommonsHelper.getResidence(archiveModel.getProvinceRegisterId(), archiveModel.getCityRegisterId(), archiveModel.getAreaRegisterId(), archiveModel.getStreetRegisterId(), -- 1.8.3.1