From 2e8d663b45d852d1b6f607b10cccd02e72e533a4 Mon Sep 17 00:00:00 2001 From: landong2015 Date: Fri, 6 May 2016 17:10:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yimiao/main/data/enumdata/MouthAgeEnum.java | 60 ++++++++ .../lymsh/yimiao/main/data/model/MedFactory.java | 9 ++ .../yimiao/main/data/model/MedFactoryQuery.java | 9 ++ .../yimiao/main/data/model/MedOrganization.java | 9 ++ .../main/data/model/MedOrganizationQuery.java | 9 ++ .../yimiao/main/data/model/MedVaccineInfo.java | 9 ++ .../main/data/model/MedVaccineInfoQuery.java | 9 ++ mainData/src/main/resources/mainOrm/MedFactory.xml | 20 +-- .../src/main/resources/mainOrm/MedOrganization.xml | 8 +- .../src/main/resources/mainOrm/MedVaccineinfo.xml | 8 +- .../yimiao/web/controller/v1/KidsController.java | 151 ++++++++++++++++----- 11 files changed, 254 insertions(+), 47 deletions(-) create mode 100644 mainData/src/main/java/com/lymsh/yimiao/main/data/enumdata/MouthAgeEnum.java diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/enumdata/MouthAgeEnum.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/enumdata/MouthAgeEnum.java new file mode 100644 index 0000000..48dc891 --- /dev/null +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/enumdata/MouthAgeEnum.java @@ -0,0 +1,60 @@ +package com.lymsh.yimiao.main.data.enumdata; + +/** + * Created by riecard on 15/9/28. + */ +public enum MouthAgeEnum { + + + zero(0,"0月龄"), + one(1,"1月龄"), + two(2,"2月龄"), + three(3,"3月龄"), + four(4,"4月龄"), + five(5,"5月龄"), + six(6,"6月龄"), + seven(7,"7月龄"), + eight(8,"8月龄"), + nine(9,"9月龄"), + ten(10,"10月龄"), + eleven(11,"11月龄"), + oneYear(12,"一周岁"), + oneYearHalf(18,"一岁半"), + twoYear(24,"2周岁"), + threeYear(36,"3周岁"), + fourYear(48,"4周岁"), + sixYear(72,"6周岁"); + + private MouthAgeEnum(Integer id, String title) { + this.id = id; + this.title = title; + } + + public static String getTitle(Integer id) { + for (MouthAgeEnum e: MouthAgeEnum.values()) { + if (e.getId() == id) { + return e.getTitle(); + } + } + return ""; + } + + private Integer id; + private String title; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } +} diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedFactory.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedFactory.java index 8c016d2..54d9e2f 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedFactory.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedFactory.java @@ -6,6 +6,15 @@ public class MedFactory { private String fId; private String fName; private String fIsValid; + private String isDelete; + + public String getIsDelete() { + return isDelete; + } + + public void setIsDelete(String isDelete) { + this.isDelete = isDelete; + } public String getFId() { return fId; diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedFactoryQuery.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedFactoryQuery.java index e7e6a61..534e060 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedFactoryQuery.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedFactoryQuery.java @@ -10,6 +10,15 @@ public class MedFactoryQuery extends BaseQuery { private String fId; private String fName; private String fIsValid; + private String isDelete; + + public String getIsDelete() { + return isDelete; + } + + public void setIsDelete(String isDelete) { + this.isDelete = isDelete; + } public String getFId() { return fId; diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedOrganization.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedOrganization.java index fceb93d..d5d7034 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedOrganization.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedOrganization.java @@ -14,6 +14,15 @@ public class MedOrganization { private String oVillageNo; private String oAddress; private String oIsValid; + private String isDelete; + + public String getIsDelete() { + return isDelete; + } + + public void setIsDelete(String isDelete) { + this.isDelete = isDelete; + } public String getoId() { return oId; diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedOrganizationQuery.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedOrganizationQuery.java index 1567e27..dfe598a 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedOrganizationQuery.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedOrganizationQuery.java @@ -18,6 +18,15 @@ public class MedOrganizationQuery extends BaseQuery { private String oVillageNo; private String oAddress; private String oIsValid; + private String isDelete; + + public String getIsDelete() { + return isDelete; + } + + public void setIsDelete(String isDelete) { + this.isDelete = isDelete; + } public String getoId() { return oId; diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineInfo.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineInfo.java index acbd078..e6831ab 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineInfo.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineInfo.java @@ -8,6 +8,15 @@ public class MedVaccineInfo { private String viFactoryId; private String viVaccineNameId; private String viIsValid; + private String isDelete; + + public String getIsDelete() { + return isDelete; + } + + public void setIsDelete(String isDelete) { + this.isDelete = isDelete; + } public String getViId() { return viId; diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineInfoQuery.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineInfoQuery.java index 5b6dd0b..e693bd2 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineInfoQuery.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccineInfoQuery.java @@ -12,6 +12,15 @@ public class MedVaccineInfoQuery extends BaseQuery { private String viFactoryId; private String viVaccineNameId; private String viIsValid; + private String isDelete; + + public String getIsDelete() { + return isDelete; + } + + public void setIsDelete(String isDelete) { + this.isDelete = isDelete; + } public String getViId() { return viId; diff --git a/mainData/src/main/resources/mainOrm/MedFactory.xml b/mainData/src/main/resources/mainOrm/MedFactory.xml index 3746bb3..fb689ed 100644 --- a/mainData/src/main/resources/mainOrm/MedFactory.xml +++ b/mainData/src/main/resources/mainOrm/MedFactory.xml @@ -3,15 +3,16 @@ - - - + + + + @@ -30,13 +31,16 @@ limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} 1 = 1 -and f_id = #{fId,jdbcType=VARCHAR} +and fa_id = #{fId,jdbcType=VARCHAR} and f_name = #{fName,jdbcType=VARCHAR} -and f_isValid = #{fIsValid,jdbcType=VARCHAR} +and fa_isValid = #{fIsValid,jdbcType=VARCHAR} + + +and fa_isDelete = #{isDelete,jdbcType=VARCHAR} @@ -44,7 +48,7 @@ and f_isValid = #{fIsValid,jdbcType=VARCHAR} -select o_id,o_name,o_contactWay,o_linkMan,o_provinceNo,o_cityNo,o_countyNo,o_townShipNo,o_villageNo,o_address,o_isValid +select o_id,o_name,o_contactWay,o_linkMan,o_provinceNo,o_cityNo,o_countyNo,o_townShipNo,o_villageNo,o_address,o_isValid,isDelete FROM med_organization WHERE o_id = #{oId,jdbcType=VARCHAR} @@ -70,13 +71,16 @@ and o_address = #{oAddress,jdbcType=VARCHAR} and o_isValid = #{oIsValid,jdbcType=VARCHAR} + +and isDelete = #{isDelete,jdbcType=VARCHAR} + -select vi_id,vi_name,vi_factoryId,vi_vaccineNameId,vi_isValid +select vi_id,vi_name,vi_factoryId,vi_vaccineNameId,vi_isValid,isDelete FROM med_vaccineinfo WHERE vi_id = #{viId,jdbcType=INTEGER} @@ -46,13 +47,16 @@ and vi_vaccineNameId = #{viVaccineNameId,jdbcType=VARCHAR} and vi_isValid = #{viIsValid,jdbcType=VARCHAR} + +and isDelete = #{isDelete,jdbcType=VARCHAR} +