From fb5b5c8180c8078274b99f7ecadb51b28ebbc4c7 Mon Sep 17 00:00:00 2001 From: landong2015 Date: Mon, 2 May 2016 11:22:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=96=AB=E8=8B=97=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/data/model/MedInoculaterecordQuery.java | 100 --------------------- .../yimiao/main/data/model/MedVaccinename.java | 9 ++ .../main/data/model/MedVaccinenameQuery.java | 9 ++ .../src/main/resources/mainOrm/MedVaccinename.xml | 6 +- .../web/controller/v1/VaccineNamesController.java | 8 +- 5 files changed, 27 insertions(+), 105 deletions(-) delete mode 100644 mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculaterecordQuery.java diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculaterecordQuery.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculaterecordQuery.java deleted file mode 100644 index 8adbcd0..0000000 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculaterecordQuery.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.lymsh.yimiao.main.data.model; - - -import java.util.Date; - -import com.lymsh.mommybaby.basecommon.base.BaseQuery; - - -public class MedInoculaterecordQuery extends BaseQuery { - private String icId; - private String icKidId; - private String icVaccineId; - private String icInoculateTime; - private String icDoctor; - private String icPosition; - private String icBatchNumber; - private String icOrganizationId; - private String icIsInoculate; - private String icJiCi; - - public String getIcId() { - return icId; - } - - public void setIcId(String icId) { - this.icId = icId; - } - - public String getIcKidId() { - return icKidId; - } - - public void setIcKidId(String icKidId) { - this.icKidId = icKidId; - } - - public String getIcVaccineId() { - return icVaccineId; - } - - public void setIcVaccineId(String icVaccineId) { - this.icVaccineId = icVaccineId; - } - - public String getIcInoculateTime() { - return icInoculateTime; - } - - public void setIcInoculateTime(String icInoculateTime) { - this.icInoculateTime = icInoculateTime; - } - - public String getIcDoctor() { - return icDoctor; - } - - public void setIcDoctor(String icDoctor) { - this.icDoctor = icDoctor; - } - - public String getIcPosition() { - return icPosition; - } - - public void setIcPosition(String icPosition) { - this.icPosition = icPosition; - } - - public String getIcBatchNumber() { - return icBatchNumber; - } - - public void setIcBatchNumber(String icBatchNumber) { - this.icBatchNumber = icBatchNumber; - } - - public String getIcOrganizationId() { - return icOrganizationId; - } - - public void setIcOrganizationId(String icOrganizationId) { - this.icOrganizationId = icOrganizationId; - } - - public String getIcIsInoculate() { - return icIsInoculate; - } - - public void setIcIsInoculate(String icIsInoculate) { - this.icIsInoculate = icIsInoculate; - } - - public String getIcJiCi() { - return icJiCi; - } - - public void setIcJiCi(String icJiCi) { - this.icJiCi = icJiCi; - } -} \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccinename.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccinename.java index 6cc1967..7707239 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccinename.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccinename.java @@ -11,6 +11,15 @@ public class MedVaccinename { private String vnTaboo; private String vnDescription; private String vnIsValid; + private Integer vnVaccineType; + + public Integer getVnVaccineType() { + return vnVaccineType; + } + + public void setVnVaccineType(Integer vnVaccineType) { + this.vnVaccineType = vnVaccineType; + } public String getVnId() { return vnId; diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccinenameQuery.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccinenameQuery.java index 9cf4c4a..2977851 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccinenameQuery.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedVaccinenameQuery.java @@ -15,6 +15,15 @@ public class MedVaccinenameQuery extends BaseQuery { private String vnTaboo; private String vnDescription; private String vnIsValid; + private Integer vnVaccineType; + + public Integer getVnVaccineType() { + return vnVaccineType; + } + + public void setVnVaccineType(Integer vnVaccineType) { + this.vnVaccineType = vnVaccineType; + } public String getVnId() { return vnId; diff --git a/mainData/src/main/resources/mainOrm/MedVaccinename.xml b/mainData/src/main/resources/mainOrm/MedVaccinename.xml index b72729c..bd8806e 100644 --- a/mainData/src/main/resources/mainOrm/MedVaccinename.xml +++ b/mainData/src/main/resources/mainOrm/MedVaccinename.xml @@ -11,10 +11,11 @@ + @@ -58,6 +59,9 @@ and vn_description = #{vnDescription,jdbcType=VARCHAR} and vn_isValid = #{vnIsValid,jdbcType=VARCHAR} + + and vn_vaccineType = #{vnVaccineType,jdbcType=INTEGER} + diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/VaccineNamesController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/VaccineNamesController.java index 546f938..a32e27c 100644 --- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/VaccineNamesController.java +++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/VaccineNamesController.java @@ -2,8 +2,8 @@ package com.lyms.yimiao.web.controller.v1; import com.lymsh.mommybaby.basecommon.base.BaseController; import com.lymsh.mommybaby.basecommon.util.ResultUtils; -import com.lymsh.yimiao.main.data.model.MedVaccineName; -import com.lymsh.yimiao.main.data.service.MedVaccineNameService; +import com.lymsh.yimiao.main.data.model.MedVaccinename; +import com.lymsh.yimiao.main.data.service.MedVaccinenameService; import com.lymsh.yimiao.main.data.util.JsonUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -23,7 +23,7 @@ import java.util.Map; public class VaccineNamesController extends BaseController{ @Autowired - private MedVaccineNameService medVaccineNameService; + private MedVaccinenameService medVaccineNameService; /** * @@ -33,7 +33,7 @@ public class VaccineNamesController extends BaseController{ @RequestMapping(value = "/vaccineNames", method = RequestMethod.GET) public void getVaccineNames(HttpServletResponse response, @RequestParam("id") String id){ - MedVaccineName medVaccineName = medVaccineNameService.getMedVaccineName(id); + MedVaccinename medVaccineName = medVaccineNameService.getMedVaccinename(id); if (medVaccineName==null){ ResultUtils.buildParameterErrorResultAndWrite(response,"疫苗名称信息不存在"); return; -- 1.8.3.1