diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedInoculateRecordMapper.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedInoculateRecordMapper.java new file mode 100644 index 0000000..e733da6 --- /dev/null +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedInoculateRecordMapper.java @@ -0,0 +1,21 @@ +package com.lymsh.yimiao.main.data.dao; + +import com.lymsh.yimiao.main.data.model.MedInoculateRecordQuery; +import com.lymsh.yimiao.main.data.model.MedInoculateRecord; + +import java.util.List; + +public interface MedInoculateRecordMapper { + public void addMedInoculateRecord(MedInoculateRecord obj); + + public void updateMedInoculateRecord(MedInoculateRecord obj); + + public void deleteMedInoculateRecord(Integer id); + + public MedInoculateRecord getMedInoculateRecord(String id); + + public int queryMedInoculateRecordCount(MedInoculateRecordQuery query); + + public List queryMedInoculateRecord(MedInoculateRecordQuery query); + +} \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedInoculaterecordMapper.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedInoculaterecordMapper.java index 6095e44..e733da6 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedInoculaterecordMapper.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/dao/MedInoculaterecordMapper.java @@ -1,21 +1,21 @@ package com.lymsh.yimiao.main.data.dao; import com.lymsh.yimiao.main.data.model.MedInoculateRecordQuery; -import com.lymsh.yimiao.main.data.model.MedInoculaterecord; +import com.lymsh.yimiao.main.data.model.MedInoculateRecord; import java.util.List; -public interface MedInoculaterecordMapper { - public void addMedInoculaterecord(MedInoculaterecord obj); +public interface MedInoculateRecordMapper { + public void addMedInoculateRecord(MedInoculateRecord obj); - public void updateMedInoculaterecord(MedInoculaterecord obj); + public void updateMedInoculateRecord(MedInoculateRecord obj); - public void deleteMedInoculaterecord(Integer id); + public void deleteMedInoculateRecord(Integer id); - public MedInoculaterecord getMedInoculaterecord(String id); + public MedInoculateRecord getMedInoculateRecord(String id); - public int queryMedInoculaterecordCount(MedInoculateRecordQuery query); + public int queryMedInoculateRecordCount(MedInoculateRecordQuery query); - public List queryMedInoculaterecord(MedInoculateRecordQuery query); + public List queryMedInoculateRecord(MedInoculateRecordQuery query); } \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateRecord.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateRecord.java new file mode 100644 index 0000000..019b95f --- /dev/null +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculateRecord.java @@ -0,0 +1,96 @@ +package com.lymsh.yimiao.main.data.model; + +import java.util.Date; + +public class MedInoculateRecord { + 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/MedInoculaterecord.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculaterecord.java index 1db13c6..019b95f 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculaterecord.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/model/MedInoculaterecord.java @@ -2,7 +2,7 @@ package com.lymsh.yimiao.main.data.model; import java.util.Date; -public class MedInoculaterecord { +public class MedInoculateRecord { private String icId; private String icKidId; private String icVaccineId; diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedInoculateRecordService.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedInoculateRecordService.java new file mode 100644 index 0000000..00d388f --- /dev/null +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedInoculateRecordService.java @@ -0,0 +1,21 @@ +package com.lymsh.yimiao.main.data.service; + +import com.lymsh.yimiao.main.data.model.MedInoculateRecord; +import com.lymsh.yimiao.main.data.model.MedInoculateRecordQuery; + +import java.util.List; + +public interface MedInoculateRecordService { + public void addMedInoculateRecord(MedInoculateRecord obj); + + public void updateMedInoculateRecord(MedInoculateRecord obj); + + public void deleteMedInoculateRecord(Integer id); + + public MedInoculateRecord getMedInoculateRecord(String id); + + public int queryMedInoculateRecordCount(MedInoculateRecordQuery query); + + public List queryMedInoculateRecord(MedInoculateRecordQuery query); + +} \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedInoculaterecordService.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedInoculaterecordService.java index e360eba..00d388f 100644 --- a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedInoculaterecordService.java +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/MedInoculaterecordService.java @@ -1,21 +1,21 @@ package com.lymsh.yimiao.main.data.service; -import com.lymsh.yimiao.main.data.model.MedInoculaterecord; -import com.lymsh.yimiao.main.data.model.MedInoculaterecordQuery; +import com.lymsh.yimiao.main.data.model.MedInoculateRecord; +import com.lymsh.yimiao.main.data.model.MedInoculateRecordQuery; import java.util.List; -public interface MedInoculaterecordService { - public void addMedInoculaterecord(MedInoculaterecord obj); +public interface MedInoculateRecordService { + public void addMedInoculateRecord(MedInoculateRecord obj); - public void updateMedInoculaterecord(MedInoculaterecord obj); + public void updateMedInoculateRecord(MedInoculateRecord obj); - public void deleteMedInoculaterecord(Integer id); + public void deleteMedInoculateRecord(Integer id); - public MedInoculaterecord getMedInoculaterecord(String id); + public MedInoculateRecord getMedInoculateRecord(String id); - public int queryMedInoculaterecordCount(MedInoculaterecordQuery query); + public int queryMedInoculateRecordCount(MedInoculateRecordQuery query); - public List queryMedInoculaterecord(MedInoculaterecordQuery query); + public List queryMedInoculateRecord(MedInoculateRecordQuery query); } \ No newline at end of file diff --git a/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedInoculaterRecordServiceImpl.java b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedInoculaterRecordServiceImpl.java new file mode 100644 index 0000000..8a0b04e --- /dev/null +++ b/mainData/src/main/java/com/lymsh/yimiao/main/data/service/impl/MedInoculaterRecordServiceImpl.java @@ -0,0 +1,31 @@ +package com.lymsh.yimiao.main.data.service.impl; + +import com.lymsh.yimiao.main.data.dao.MedInoculateRecordMapper; +import com.lymsh.yimiao.main.data.model.MedInoculateRecord; +import com.lymsh.yimiao.main.data.model.MedInoculateRecordQuery; +import com.lymsh.yimiao.main.data.service.MedInoculateRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class MedInoculaterRecordServiceImpl implements MedInoculateRecordService { + +@Autowired +private MedInoculateRecordMapper medInoculaterecordMapper; + +@Override +public void addMedInoculateRecord(MedInoculateRecord obj){medInoculaterecordMapper.addMedInoculateRecord(obj);} +@Override +public void updateMedInoculateRecord(MedInoculateRecord obj){medInoculaterecordMapper.updateMedInoculateRecord(obj);} +@Override +public void deleteMedInoculateRecord (Integer id){medInoculaterecordMapper.deleteMedInoculateRecord(id);} +@Override +public MedInoculateRecord getMedInoculateRecord (String id){return medInoculaterecordMapper.getMedInoculateRecord(id);} +@Override +public int queryMedInoculateRecordCount (MedInoculateRecordQuery query){return medInoculaterecordMapper.queryMedInoculateRecordCount(query);} +@Override +public List queryMedInoculateRecord (MedInoculateRecordQuery query){if (query.getNeed() != null) {query.mysqlBuild(medInoculaterecordMapper.queryMedInoculateRecordCount(query));}return medInoculaterecordMapper.queryMedInoculateRecord(query);} + +} \ No newline at end of file diff --git a/mainData/src/main/resources/mainOrm/MedInoculaterecord.xml b/mainData/src/main/resources/mainOrm/MedInoculaterecord.xml index cd899e2..5122c99 100644 --- a/mainData/src/main/resources/mainOrm/MedInoculaterecord.xml +++ b/mainData/src/main/resources/mainOrm/MedInoculaterecord.xml @@ -1,8 +1,8 @@ - + - + @@ -15,7 +15,7 @@ - select ic_id,ic_kidId,ic_vaccineId,ic_inoculateTime,ic_doctor,ic_position,ic_batchNumber,ic_organizationId,ic_isInoculate,ic_jici FROM med_inoculaterecord WHERE ic_id = #{icId,jdbcType=VARCHAR} @@ -33,7 +33,7 @@ limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} - + 1 = 1 @@ -71,18 +71,18 @@ and ic_jici = #{icJiCi,jdbcType=VARCHAR} - select ic_id,ic_kidId,ic_vaccineId,ic_inoculateTime,ic_doctor,ic_position,ic_batchNumber,ic_organizationId,ic_isInoculate,ic_jici from med_inoculaterecord - + - select count(1) from med_inoculaterecord - + diff --git a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java index 1965cd7..b8e9c47 100644 --- a/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java +++ b/webApi/src/main/java/com/lyms/yimiao/web/controller/v1/KidsController.java @@ -44,7 +44,7 @@ public class KidsController extends BaseController{ @Autowired private YmUserKidMapsService ymUserKidMapsService; @Autowired - private MedInoculateorderService medInoculateorderService; + private MedInoculateOrderService medInoculateorderService; @Autowired private MedVaccineinfoService medVaccineinfoService; @Autowired @@ -209,7 +209,7 @@ public class KidsController extends BaseController{ inoculateorderQuery.setIoKidId(id); //时间倒序 inoculateorderQuery.setIoInoculateTime("ioInoculateTime desc"); - List inoculateorderList = medInoculateorderService.queryMedInoculateorder(inoculateorderQuery); + List inoculateorderList = medInoculateorderService.queryMedInoculateOrder(inoculateorderQuery); if (CollectionUtils.isNotEmpty(inoculateorderList)) { //取出离现在日期最近的一个预约接种 MedInoculateOrder medInoculateorder = inoculateorderList.get(0);