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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

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

@@ -1,14 +1,15 @@
package com.panzhihua.service_community.dao;

import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.vaccines.VaccinesByAdminDTO;
import com.panzhihua.common.model.vos.vaccines.VaccinesByAppVO;
import com.panzhihua.service_community.model.dos.ComMngVaccinesDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

/**
 * @auther lyq
@@ -18,15 +19,11 @@
@Mapper
public interface ComMngVaccinesDAO extends BaseMapper<ComMngVaccinesDO> {

    @Select("<script> " +
            "select * from com_mng_vaccines" +
            " <where>" +
            "<if test='vaccinesByAdminDTO.name != null and vaccinesByAdminDTO.name != &quot;&quot;'>" +
            "`name` like concat('%',#{vaccinesByAdminDTO.name},'%') "+
            " </if> " +
            " </where>" +
            " order by create_at desc" +
            " </script>")
    IPage<VaccinesByAppVO> getVaccinesByName(Page page,@Param("vaccinesByAdminDTO") VaccinesByAdminDTO vaccinesByAdminDTO);
    @Select("<script> " + "select * from com_mng_vaccines" + " <where>"
        + "<if test='vaccinesByAdminDTO.name != null and vaccinesByAdminDTO.name != &quot;&quot;'>"
        + "`name` like concat('%',#{vaccinesByAdminDTO.name},'%') " + " </if> " + " </where>"
        + " order by create_at desc" + " </script>")
    IPage<VaccinesByAppVO> getVaccinesByName(Page page,
        @Param("vaccinesByAdminDTO") VaccinesByAdminDTO vaccinesByAdminDTO);

}