diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index 60b469f..9596cd2 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit 60b469fb3d9fccb7220f65c3ddbaa412033ecc01 +Subproject commit 9596cd2ada0a9e7de4bfdc86d85791d71040965b diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicReportUserInfoServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicReportUserInfoServiceImpl.java index 257160b..1a9c92c 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicReportUserInfoServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicReportUserInfoServiceImpl.java @@ -56,7 +56,7 @@ public class EpidemicReportUserInfoServiceImpl extends CrudServiceImpl getWrapper(Map params) { @@ -150,7 +150,7 @@ public class EpidemicReportUserInfoServiceImpl extends CrudServiceImpl implements EpidemicUserErrorService { @Override - public QueryWrapper getWrapper(Map params){ - String id = (String)params.get("id"); + public QueryWrapper getWrapper(Map params) { + String id = (String) params.get("id"); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), "id", id); @@ -34,13 +33,11 @@ public class EpidemicUserErrorServiceImpl extends CrudServiceImpl getErrorInfoByMax() { - List list = baseDao.getErrorInfoByMax(); - return list; + return baseDao.getErrorInfoByMax(); } - @Autowired - public Integer getMaxInsertNo(){ - Integer insertNo = baseDao.getMaxInsertNo(); - return insertNo; + @Override + public Integer getMaxInsertNo() { + return baseDao.getMaxInsertNo(); } } diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/impl/VaccineCompanyServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/impl/VaccineCompanyServiceImpl.java index 05d953f..2e35af7 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/impl/VaccineCompanyServiceImpl.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/vim/service/impl/VaccineCompanyServiceImpl.java @@ -1,15 +1,10 @@ package com.elink.esua.epdc.vaccine.vim.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.commons.mybatis.service.impl.CrudServiceImpl; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.vaccine.common.base.BaseVimCurdServiceImpl; import com.elink.esua.epdc.vaccine.vim.dao.VaccineCompanyDao; -import com.elink.esua.epdc.vaccine.vim.dto.VaccinationSiteDTO; import com.elink.esua.epdc.vaccine.vim.dto.VaccineCompanyDTO; import com.elink.esua.epdc.vaccine.vim.dto.result.VaccineDto; -import com.elink.esua.epdc.vaccine.vim.entity.VaccinationSiteEntity; import com.elink.esua.epdc.vaccine.vim.entity.VaccineCompanyEntity; import com.elink.esua.epdc.vaccine.vim.service.VaccineCompanyService; import org.apache.commons.lang3.StringUtils; @@ -25,12 +20,10 @@ import java.util.Map; * @since 1.0.0 2021-04-16 */ @Service -public class VaccineCompanyServiceImpl extends CrudServiceImpl implements VaccineCompanyService { +public class VaccineCompanyServiceImpl extends BaseVimCurdServiceImpl implements VaccineCompanyService { @Override public QueryWrapper getWrapper(Map params){ - String id = (String)params.get("id"); - QueryWrapper wrapper = new QueryWrapper<>(); wrapper.orderByDesc("CREATED_TIME"); String companyName= (String) params.get("companyName"); @@ -38,15 +31,6 @@ public class VaccineCompanyServiceImpl extends CrudServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, VaccineCompanyDTO.class); - } - @Override public List compantyList() { return baseDao.selectCompantyList();