From 5aeb45a66952c5f68d8bb2055ed66e33c30a77c9 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 6 Apr 2022 16:24:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=20?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/IcVaccineController.java | 4 ++-- .../main/java/com/epmet/dao/IcVaccineDao.java | 12 +++++++----- .../com/epmet/service/IcVaccineService.java | 7 ++++--- .../service/impl/IcVaccineServiceImpl.java | 19 ++++++++++--------- .../main/resources/mapper/IcVaccineDao.xml | 4 ++-- 5 files changed, 25 insertions(+), 21 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java index c40d97980b..271ecb80fc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java @@ -103,7 +103,7 @@ public class IcVaccineController implements ResultDataResolver { public Result> natList(@LoginUser TokenDto tokenDto, @RequestBody VaccineListFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); - return new Result>().ok(icVaccineService.natList(formDTO)); + return new Result>().ok(icVaccineService.icVaccineList(formDTO)); } /** @@ -279,7 +279,7 @@ public class IcVaccineController implements ResultDataResolver { WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").build(); PageData data = null; do { - data = icVaccineService.natList(formDTO); + data = icVaccineService.icVaccineList(formDTO); data.getList().forEach(o-> { o.setNatResult(NumConstant.ONE_STR.equals(o.getNatResult()) ? "阳性" : "阴性"); o.setIsResiUser(NumConstant.ONE_STR.equals(o.getIsResiUser()) ? "是" : "否"); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java index 84f0be0178..b99c5d1000 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcVaccineDao.java @@ -3,10 +3,10 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IcNatDTO; import com.epmet.dto.form.MyNatListFormDTO; +import com.epmet.dto.form.VaccineListFormDTO; import com.epmet.dto.result.MyNatListResultDTO; import com.epmet.dto.result.NatListResultDTO; import com.epmet.entity.IcVaccineEntity; -import com.epmet.entity.IcVaccineEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -29,14 +29,16 @@ public interface IcVaccineDao extends BaseDao { /** * @Author sun * @Description 【核酸】本辖区核酸检测信息列表 - **/ - List getNatList(MyNatListFormDTO formDTO); + * + * @param formDTO*/ + List getIcVaccineList(VaccineListFormDTO formDTO); /** * @Author sun * @Description 【核酸】客户下核酸检测信息列表 - **/ - List getCustomerNatList(MyNatListFormDTO formDTO); + * + * @param formDTO*/ + List getCustomerIcVaccineList(VaccineListFormDTO formDTO); /** * @Author sun diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccineService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccineService.java index ab351b9c80..7cef54b951 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccineService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcVaccineService.java @@ -40,13 +40,14 @@ public interface IcVaccineService extends BaseService { * * @param formDTO * @return*/ - PageData natList(VaccineListFormDTO formDTO); + PageData icVaccineList(VaccineListFormDTO formDTO); /** * @Author sun * @Description 【核酸】核酸检测信息详情 - **/ - IcNatDTO detail(MyNatListFormDTO formDTO); + * + * @param formDTO*/ + IcNatDTO detail(VaccineListFormDTO formDTO); /** * @Author sun diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java index 106413e185..66361093a5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java @@ -157,9 +157,9 @@ public class IcVaccineServiceImpl extends BaseServiceImpl natList(VaccineListFormDTO formDTO) { + public PageData icVaccineList(VaccineListFormDTO formDTO) { //1.根据是查询客户数据还是本辖区数据走不同逻辑 - if ("current".equals(formDTO.getOrgType())) { + if ("current".equals(formDTO.getSearchType())) { //本辖区数据 //2.获取工作人员缓存信息 CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); @@ -168,13 +168,13 @@ public class IcVaccineServiceImpl extends BaseServiceImpl data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) - .doSelectPageInfo(() -> baseDao.getNatList(formDTO)); + PageInfo data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) + .doSelectPageInfo(() -> baseDao.getIcVaccineList(formDTO)); return new PageData(data.getList(), data.getTotal()); - } else if ("all".equals(formDTO.getOrgType())) { + } else if ("all".equals(formDTO.getSearchType())) { //客户下数据 - PageInfo data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) - .doSelectPageInfo(() -> baseDao.getCustomerNatList(formDTO)); + PageInfo data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) + .doSelectPageInfo(() -> baseDao.getCustomerIcVaccineList(formDTO)); return new PageData(data.getList(), data.getTotal()); } @@ -184,9 +184,10 @@ public class IcVaccineServiceImpl extends BaseServiceImpl - SELECT a.ic_nat_id icNatId, a.agency_id agencyId, @@ -72,7 +72,7 @@ ORDER BY b.nat_time DESC, b.id ASC - SELECT id icNatId, user_id userId,