From a7002e25ec105e5f73c27f91944f1c0b4991c355 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 30 十二月 2021 14:23:41 +0800
Subject: [PATCH] Merge branch 'master' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVaccinesInoculationRecordDAO.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVaccinesInoculationRecordDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVaccinesInoculationRecordDAO.java
index 9679f28..de6a1c2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVaccinesInoculationRecordDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVaccinesInoculationRecordDAO.java
@@ -37,7 +37,7 @@
+ "select cmvir.id,cmvir.name,cmvir.sex,cmvir.age,cmvir.phone,cmvir.id_card,cmvir.inoculation_at,cmvir.dosage "
+ ",cmvir.medical_institution,cmvir.vaccines_code,cmvir.vaccines,cmvir.remark from com_mng_vaccines_inoculation_record as cmvir"
+ " <where>" + "<if test='inoculationByAdminDTO.communityId != null'>"
- + " and cmvir.community_id = #{inoculationByAdminDTO.communityId} " + " </if> "
+ + " and cmvir.community_id = ${inoculationByAdminDTO.communityId} " + " </if> "
+ "<if test='inoculationByAdminDTO.name != null and inoculationByAdminDTO.name != ""'>"
+ " and cmvir.name like concat('%',#{inoculationByAdminDTO.name},'%') " + " </if> "
+ "<if test='inoculationByAdminDTO.dosage != null and inoculationByAdminDTO.dosage != ""'>"
@@ -58,7 +58,7 @@
+ "select cmvir.name,cmvir.sex,cmvir.age,cmvir.phone,cmvir.id_card,cmvir.inoculation_at,cmvir.dosage "
+ ",cmvir.medical_institution,cmvir.vaccines_code,cmvir.vaccines,cmvir.remark from com_mng_vaccines_inoculation_record as cmvir"
+ " <where>" + "<if test='inoculationByAdminDTO.communityId != null'>"
- + " and cmvir.community_id = #{inoculationByAdminDTO.communityId} " + " </if> "
+ + " and cmvir.community_id = ${inoculationByAdminDTO.communityId} " + " </if> "
+ "<if test='inoculationByAdminDTO.ids != null and inoculationByAdminDTO.ids.size > 0'>" + " and cmvir.id in "
+ "<foreach item=\"item\" collection=\"inoculationByAdminDTO.ids\" separator=\",\" open=\"(\" close=\")\" index=\"\"> \n"
+ "#{item}" + "</foreach>" + " </if> "
--
Gitblit v1.7.1