From 3b14049fda65a2c160332afb1437262f8182d35f Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 23 Sep 2021 13:49:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PersonTestingServiceImpl.java | 2 ++ .../mapper/epidemic/PersonTestingDao.xml | 14 ++++++++++---- .../excel/居民信息录入模板.xls | Bin 42496 -> 35840 bytes .../mapper/epidemic/EpidemicUserInfoDao.xml | 4 ++-- .../mapper/house/HousingInformationDao.xml | 2 +- .../mapper/vim/VaccinationInfoDao.xml | 2 +- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java index fa68853..4e376b4 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java +++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java @@ -83,7 +83,9 @@ public class PersonTestingServiceImpl extends BaseServiceImpl list = baseDao.getTestingPage(params); return new PageData<>(list, page.getTotal()); } diff --git a/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml b/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml index a05f0c9..07f00e4 100644 --- a/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml +++ b/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml @@ -54,10 +54,16 @@ WHERE t.DEL_FLAG = 0 - and t2.grid_id in - - #{id} - + AND ( + + t2.grid_id in + + #{id} + + OR + + CREATED_BY = #{creatorId} + ) AND t.name like '%${name}%' diff --git a/epdc-cloud-vim-yushan/src/main/resources/excel/居民信息录入模板.xls b/epdc-cloud-vim-yushan/src/main/resources/excel/居民信息录入模板.xls index c0fa79f89d77dfcd0332340f0f41e099391a0e24..49653890ee310cc033dde7c1d66bbc87f958899a 100644 GIT binary patch literal 35840 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 diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml index 7c7ed70..1f94b84 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml @@ -115,7 +115,7 @@ and (hi.grid_id = #{gridId} OR find_in_set(#{gridId},hi.ALL_DEPT_IDS)) - + and hi.grid_id in #{id} @@ -164,7 +164,7 @@ and (hi.grid_id = #{gridId} OR find_in_set(#{gridId},hi.ALL_DEPT_IDS)) - + and hi.grid_id in #{id} diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/house/HousingInformationDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/house/HousingInformationDao.xml index 9129320..d7c85fa 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/house/HousingInformationDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/house/HousingInformationDao.xml @@ -64,7 +64,7 @@ and (t.grid_id = #{gridId} OR find_in_set(#{gridId},t.ALL_DEPT_IDS)) - + and t.grid_id in #{id} diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml index aa3c407..9d54196 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/vim/VaccinationInfoDao.xml @@ -72,7 +72,7 @@ and (v.grid_id = #{gridId} OR find_in_set(#{gridId},v.ALL_DEPT_IDS)) - + and v.grid_id in #{id}