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

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

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.ComExServicemanDTO;
import com.panzhihua.common.model.dtos.community.ComMngRealCompanyBelongsDTO;
import com.panzhihua.common.model.dtos.community.ExportRealCompanyExcelDTO;
import com.panzhihua.common.model.dtos.community.PageComMngRealCompanyDTO;
import com.panzhihua.common.model.vos.community.ComExServicemanVO;
import com.panzhihua.common.model.vos.community.ComMngRealCompanyBelongsVO;
import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO;
import com.panzhihua.common.model.vos.community.ComMngRealCompanyVO;
import com.panzhihua.service_community.model.dos.ComExServicemanDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.util.List;
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.ComExServicemanDTO;
import com.panzhihua.common.model.vos.community.ComExServicemanVO;
import com.panzhihua.service_community.model.dos.ComExServicemanDO;

/**
 * @description: 退役军人
@@ -26,32 +19,18 @@
@Mapper
public interface ComExServicemanDAO extends BaseMapper<ComExServicemanDO> {

    @Select("<script> " +
            " SELECT  " +
            "  id,  " +
            "  com_name AS comName,  " +
            "  legal_person AS legalPerson,  " +
            "  leader,  " +
            "  contacts_phone AS contactsPhone,  " +
            "  scope,  " +
            "  credit_code AS creditCode,  " +
            "  province_adcode AS provinceAdcode,  " +
            "  city_adcode AS cityAdcode,  " +
            "  district_adcode AS districtAdcode,  " +
            "  address,  " +
            "  create_at AS createAt  " +
            "FROM  " +
            "  com_ex_serviceman   where 1=1" +
            "<if test='pageComMngRealCompanyDTO.legalPerson != null and pageComMngRealCompanyDTO.legalPerson.trim() != &quot;&quot;'>" +
            " and t.legal_person LIKE concat( #{pageComMngRealCompanyDTO.legalPerson}, '%' )  " +
            " </if> " +
            "<if test='pageComMngRealCompanyDTO.comName != null and pageComMngRealCompanyDTO.comName.trim() != &quot;&quot;'>" +
            " and t.com_name LIKE concat( '%',#{pageComMngRealCompanyDTO.comName}, '%' )  " +
            " </if> " +
            "<if test='pageComMngRealCompanyDTO.communityId != null and pageComMngRealCompanyDTO.communityId != 0'>" +
            " and t.community_id = #{pageComMngRealCompanyDTO.communityId} " +
            " </if> " +
            " order by t.create_at desc" +
            "</script>")
    IPage<ComExServicemanVO> pageQueryComExServiceman(Page page, @Param(value = "comExServicemanDTO") ComExServicemanDTO comExServicemanDTO);
    @Select("<script> " + " SELECT  " + "  id,  " + "  com_name AS comName,  " + "  legal_person AS legalPerson,  "
        + "  leader,  " + "  contacts_phone AS contactsPhone,  " + "  scope,  " + "  credit_code AS creditCode,  "
        + "  province_adcode AS provinceAdcode,  " + "  city_adcode AS cityAdcode,  "
        + "  district_adcode AS districtAdcode,  " + "  address,  " + "  create_at AS createAt  " + "FROM  "
        + "  com_ex_serviceman   where 1=1"
        + "<if test='pageComMngRealCompanyDTO.legalPerson != null and pageComMngRealCompanyDTO.legalPerson.trim() != &quot;&quot;'>"
        + " and t.legal_person LIKE concat( #{pageComMngRealCompanyDTO.legalPerson}, '%' )  " + " </if> "
        + "<if test='pageComMngRealCompanyDTO.comName != null and pageComMngRealCompanyDTO.comName.trim() != &quot;&quot;'>"
        + " and t.com_name LIKE concat( '%',#{pageComMngRealCompanyDTO.comName}, '%' )  " + " </if> "
        + "<if test='pageComMngRealCompanyDTO.communityId != null and pageComMngRealCompanyDTO.communityId != 0'>"
        + " and t.community_id = #{pageComMngRealCompanyDTO.communityId} " + " </if> " + " order by t.create_at desc"
        + "</script>")
    IPage<ComExServicemanVO> pageQueryComExServiceman(Page page,
        @Param(value = "comExServicemanDTO") ComExServicemanDTO comExServicemanDTO);
}