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/ComMngVaccinesEnrollRecordDAO.java

@@ -57,6 +57,7 @@
            " AND cmver.create_at <![CDATA[<=]]> #{vaccinesByAdminDTO.endTime}  " +
            " </if> \n" +
            " </where>" +
            " order by cmver.create_at desc"+
            " </script>")
    IPage<VaccinesEnrollByAdminVO> getVaccinesEnrollListByAdmin(Page page, @Param("vaccinesByAdminDTO") VaccinesEnrollByAdminDTO vaccinesByAdminDTO);

@@ -66,6 +67,12 @@
            " <where>" +
            "<if test='vaccinesByAdminDTO.communityId != null'>" +
            " and cmver.community_id = #{vaccinesByAdminDTO.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='vaccinesByAdminDTO.vaccines != null and vaccinesByAdminDTO.vaccines != &quot;&quot;'>" +
            " and cmv.name = #{vaccinesByAdminDTO.vaccines} "+
@@ -86,6 +93,7 @@
            " AND cmver.create_at <![CDATA[<=]]> #{vaccinesByAdminDTO.endTime}  " +
            " </if> \n" +
            " </where>" +
            " order by cmver.create_at desc"+
            " </script>")
    List<ComMngVaccinesEnrollExcelVo> exportVaccinesEnrollListByAdmin(@Param("vaccinesByAdminDTO") VaccinesEnrollByAdminDTO vaccinesByAdminDTO);
}