Merge branch 'renhequ' into dev

101captain

2022-01-14 6fc1e7f179acaeec4df755f72895b3b4fb50d4bb

 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 != &quot;&quot;'>"
        + " and cmvir.name like concat('%',#{inoculationByAdminDTO.name},'%') " + " </if> "
        + "<if test='inoculationByAdminDTO.dosage != null and inoculationByAdminDTO.dosage != &quot;&quot;'>"
@@ -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> "