Merge remote-tracking branch 'origin/test' into test

CeDo

2021-05-20 9000db73310ad0f445e649b256e1ddde68c8df10

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngVaccinesInoculationRecordDAO.java

@@ -64,6 +64,7 @@
            " AND cmvir.inoculation_at <![CDATA[<=]]> #{inoculationByAdminDTO.endTime}  " +
            " </if> \n" +
            " </where>" +
            " order by inoculation_at desc " +
            " </script>")
    IPage<VaccinesInoculationByAdminVO> getVaccinesInoculationListByAdmin(Page page, @Param("inoculationByAdminDTO") VaccinesInoculationByAdminDTO inoculationByAdminDTO);

@@ -73,6 +74,12 @@
            " <where>" +
            "<if test='inoculationByAdminDTO.communityId != null'>" +
            " 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> " +
            "<if test='inoculationByAdminDTO.name != null and inoculationByAdminDTO.name != &quot;&quot;'>" +
            " and cmvir.name like concat('%',#{inoculationByAdminDTO.name},'%') "+
@@ -93,6 +100,7 @@
            " AND cmvir.inoculation_at <![CDATA[<=]]> #{inoculationByAdminDTO.endTime}  " +
            " </if> \n" +
            " </where>" +
            " order by inoculation_at desc " +
            " </script>")
    List<ComMngVaccinesInoculationExcelVo> exportVaccinesInoculationListByAdmin(@Param("inoculationByAdminDTO") VaccinesInoculationByAdminDTO inoculationByAdminDTO);
}