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

@@ -1,43 +1,29 @@
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.community.PageComCvtServeDTO;
import com.panzhihua.common.model.vos.community.ComCvtServeVO;
import com.panzhihua.service_community.model.dos.ComCvtServeDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

@Mapper
public interface ComCvtServeDAO extends BaseMapper<ComCvtServeDO> {

    @Select("<script> " +
            "SELECT " +
            " t.id , " +
            " t.service_name AS serviceName, " +
            " t.service_price AS servicePrice, " +
            " t.category_id AS categoryId, " +
            " t.service_desc AS serviceDesc, " +
            " t.business_id AS businessId, " +
            " t.remark, " +
            " t.create_by AS createBy, " +
            " t.create_at AS createAt, " +
            " t1.`name` AS businessName, " +
            " t2.`name` AS categoryName " +
            "FROM " +
            " com_cvt_serve t " +
            " LEFT JOIN com_cvt_business t1 ON t.business_id = t1.id " +
            " LEFT JOIN com_cvt_category t2 ON t.category_id= t2.id" +
            " <where>" +
            " <if test='pageComCvtServeDTO.serviceName != null and pageComCvtServeDTO.serviceName.trim() != &quot;&quot;'>" +
            " and t.service_name LIKE concat( #{pageComCvtServeDTO.serviceName}, '%' )  " +
            " </if> " +
            " </where>" +
            " ORDER BY t.create_at desc" +
            "</script>")
    IPage<ComCvtServeVO> pageComCvtServe(Page page, @Param(value = "pageComCvtServeDTO") PageComCvtServeDTO pageComCvtServeDTO);

    @Select("<script> " + "SELECT " + " t.id , " + " t.service_name AS serviceName, "
        + " t.service_price AS servicePrice, " + " t.category_id AS categoryId, " + " t.service_desc AS serviceDesc, "
        + " t.business_id AS businessId, " + " t.remark, " + " t.create_by AS createBy, " + " t.create_at AS createAt, "
        + " t1.`name` AS businessName, " + " t2.`name` AS categoryName " + "FROM " + " com_cvt_serve t "
        + " LEFT JOIN com_cvt_business t1 ON t.business_id = t1.id "
        + " LEFT JOIN com_cvt_category t2 ON t.category_id= t2.id" + " <where>"
        + " <if test='pageComCvtServeDTO.serviceName != null and pageComCvtServeDTO.serviceName.trim() != &quot;&quot;'>"
        + " and t.service_name LIKE concat( #{pageComCvtServeDTO.serviceName}, '%' )  " + " </if> " + " </where>"
        + " ORDER BY t.create_at desc" + "</script>")
    IPage<ComCvtServeVO> pageComCvtServe(Page page,
        @Param(value = "pageComCvtServeDTO") PageComCvtServeDTO pageComCvtServeDTO);

}