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/ComMngVaccinesEnrollRecordDAO.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/ComMngVaccinesEnrollRecordDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVaccinesEnrollRecordDAO.java
index adee323..80911f2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVaccinesEnrollRecordDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVaccinesEnrollRecordDAO.java
@@ -36,7 +36,7 @@
+ "select cmver.id,cmver.name,cmver.sex,cmver.age,cmver.phone,cmver.id_card,cmver.create_at,cmv.name as vaccines from com_mng_vaccines_enroll_record as cmver "
+ " left join com_mng_vaccines as cmv on cmv.id = cmver.type " + " <where>"
+ "<if test='vaccinesByAdminDTO.communityId != null'>"
- + " and cmver.community_id = #{vaccinesByAdminDTO.communityId} " + " </if> "
+ + " and cmver.community_id = ${vaccinesByAdminDTO.communityId} " + " </if> "
+ "<if test='vaccinesByAdminDTO.vaccines != null and vaccinesByAdminDTO.vaccines != ""'>"
+ " and cmv.name = #{vaccinesByAdminDTO.vaccines} " + " </if> "
+ "<if test='vaccinesByAdminDTO.name != null and vaccinesByAdminDTO.name != ""'>"
@@ -57,7 +57,7 @@
+ "select cmver.name,cmver.sex,cmver.age,cmver.phone,cmver.id_card,cmver.create_at,cmv.name as vaccines from com_mng_vaccines_enroll_record as cmver "
+ " left join com_mng_vaccines as cmv on cmv.id = cmver.type " + " <where>"
+ "<if test='vaccinesByAdminDTO.communityId != null'>"
- + " and cmver.community_id = #{vaccinesByAdminDTO.communityId} " + " </if> "
+ + " and cmver.community_id = ${vaccinesByAdminDTO.communityId} " + " </if> "
+ "<if test='vaccinesByAdminDTO.ids != null and vaccinesByAdminDTO.ids.size > 0'>" + " and cmver.id in "
+ "<foreach item=\"item\" collection=\"vaccinesByAdminDTO.ids\" separator=\",\" open=\"(\" close=\")\" index=\"\"> \n"
+ "#{item}" + "</foreach>" + " </if> "
--
Gitblit v1.7.1