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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

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

@@ -57,13 +57,14 @@
            "<if test='inoculationByAdminDTO.phone != null and inoculationByAdminDTO.phone != &quot;&quot;'>" +
            " and cmvir.phone = #{inoculationByAdminDTO.phone} "+
            " </if> " +
            "<if test='inoculationByAdminDTO.startTime != null '>\n" +
            "<if test='inoculationByAdminDTO.startTime != null and inoculationByAdminDTO.startTime != &quot;&quot;'>\n" +
            " AND cmvir.inoculation_at <![CDATA[>=]]> #{inoculationByAdminDTO.startTime}  \n" +
            "</if>" +
            "<if test='inoculationByAdminDTO.endTime != null '>\n" +
            "<if test='inoculationByAdminDTO.endTime != null and inoculationByAdminDTO.endTime != &quot;&quot;'>\n" +
            " 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},'%') "+
@@ -86,13 +93,14 @@
            "<if test='inoculationByAdminDTO.phone != null and inoculationByAdminDTO.phone != &quot;&quot;'>" +
            " and cmvir.phone = #{inoculationByAdminDTO.phone} "+
            " </if> " +
            "<if test='inoculationByAdminDTO.startTime != null '>\n" +
            "<if test='inoculationByAdminDTO.startTime != null and inoculationByAdminDTO.startTime != &quot;&quot;'>\n" +
            " AND cmvir.inoculation_at <![CDATA[>=]]> #{inoculationByAdminDTO.startTime}  \n" +
            "</if>" +
            "<if test='inoculationByAdminDTO.endTime != null '>\n" +
            "<if test='inoculationByAdminDTO.endTime != null and inoculationByAdminDTO.endTime != &quot;&quot; '>\n" +
            " AND cmvir.inoculation_at <![CDATA[<=]]> #{inoculationByAdminDTO.endTime}  " +
            " </if> \n" +
            " </where>" +
            " order by inoculation_at desc " +
            " </script>")
    List<ComMngVaccinesInoculationExcelVo> exportVaccinesInoculationListByAdmin(@Param("inoculationByAdminDTO") VaccinesInoculationByAdminDTO inoculationByAdminDTO);
}