Merge branch 'renhequ' into dev

101captain

2022-01-14 6fc1e7f179acaeec4df755f72895b3b4fb50d4bb

 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 != &quot;&quot;'>"
        + " and cmv.name = #{vaccinesByAdminDTO.vaccines} " + " </if> "
        + "<if test='vaccinesByAdminDTO.name != null and vaccinesByAdminDTO.name != &quot;&quot;'>"
@@ -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> "