Commit 07e42b4d by guojuxing

精确查询。如果是空,则查询全部

parent 4dfad34f
......@@ -157,6 +157,13 @@ public interface EnterpriseApiService {
ServiceResponse<List<EnterpriseDTO>> listEnterpriseByName(String search);
/**
* 商户名称/公司名称精确查询
* @param search 精确查询。如果是空,则查询全部
* @return
*/
ServiceResponse<List<EnterpriseDTO>> listEnterpriseBySearch(String search);
/**
* 商户初始化标志改成已初始化状态
* @Title: initEnterprise

* @Description:
......
......@@ -115,6 +115,8 @@ public interface TabEnterpriseMapper {

 */
List<TabEnterprise> listEnterpriseByName(@Param("search")String search);
List<TabEnterprise> listEnterpriseBySearch(@Param("search")String search);
/**
* 查询商户列表数据
......
......@@ -117,6 +117,8 @@ public interface EnterpriseService {

 */
List<EnterpriseDTO> listEnterpriseByName(String search);
List<EnterpriseDTO> listEnterpriseBySearch(String search);
/**
* 查询所有的商户
* @Title: listEnterprise

......
......@@ -106,6 +106,15 @@ public class EnterpriseServiceImpl implements EnterpriseService{
}
@Override
public List<EnterpriseDTO> listEnterpriseBySearch(String search) {
List<TabEnterprise> list = tabEnterpriseMapper.listEnterpriseBySearch(search);
if (CollectionUtils.isNotEmpty(list)) {
return EntityUtil.changeEntityListNew(EnterpriseDTO.class, list);
}
return new ArrayList<>();
}
@Override
public List<EnterpriseDTO> listEnterprise() {
List<TabEnterprise> list = tabEnterpriseMapper.listEnterprise();
if (CollectionUtils.isNotEmpty(list)) {
......
......@@ -368,6 +368,11 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
}
@Override
public ServiceResponse<List<EnterpriseDTO>> listEnterpriseBySearch(String search) {
return ServiceResponse.success(enterpriseService.listEnterpriseBySearch(search));
}
@Override
public ServiceResponse initEnterprise(Integer enterpriseId) {
TabEnterprise tabEnterprise = enterpriseService.getEnterpriseById(enterpriseId);
if (tabEnterprise == null) {
......
......@@ -343,6 +343,16 @@
</if>
</select>
<select id="listEnterpriseBySearch" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_enterprise
where status = 1
<if test="search != null and search != '' ">
and ( enterprise_name = #{search} or company_name = #{search} )
</if>
</select>
<select id="listEnterprise" resultMap="BaseResultMap">
select
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment