Commit b302416b by 陶光胜

门店查询支持多个门店控件id聚合

parent 09d292bb
......@@ -174,5 +174,5 @@ public interface StoreGroupApiService {
* @return
*/
ServiceResponse<Page<StoreGroupDTO>> pageStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId,
Integer parentId, Integer pageSize, Integer pageNum);
Integer parentId, String search, Integer pageSize, Integer pageNum);
}
......@@ -134,5 +134,6 @@ public interface TabStoreGroupMapper {
Page<TabStoreGroup> pageStoreGroupByIds(@Param("storeGroupIdList") List<Integer> storeGroupIdList,
@Param("enterpriseId") Integer enterpriseId,
@Param("parentId") Integer parentId);
@Param("parentId") Integer parentId,
@Param("search") String search);
}
\ No newline at end of file
......@@ -196,5 +196,5 @@ public interface StoreGroupService {
List<TabStoreGroup> listStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId, Integer level);
Page<TabStoreGroup> pageStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId, Integer parentId);
Page<TabStoreGroup> pageStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId, Integer parentId, String search);
}
......@@ -165,8 +165,8 @@ public class StoreGroupServiceImpl implements StoreGroupService{
}
@Override
public Page<TabStoreGroup> pageStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId, Integer parentId){
return this.tabStoreGroupMapper.pageStoreGroupByIds(storeGroupIdList, enterpriseId, parentId);
public Page<TabStoreGroup> pageStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId, Integer parentId, String search){
return this.tabStoreGroupMapper.pageStoreGroupByIds(storeGroupIdList, enterpriseId, parentId, search);
}
}
......@@ -366,9 +366,9 @@ public class StoreGroupApiServiceImpl implements StoreGroupApiService {
@Override
public ServiceResponse<Page<StoreGroupDTO>> pageStoreGroupByIds(List<Integer> storeGroupIdList, Integer enterpriseId,
Integer parentId, Integer pageSize, Integer pageNum) {
Integer parentId, String search, Integer pageSize, Integer pageNum) {
PageHelper.startPage(pageNum, pageSize);
com.github.pagehelper.Page<TabStoreGroup> tabStoreGroups = this.storeGroupService.pageStoreGroupByIds(storeGroupIdList, enterpriseId, parentId);
com.github.pagehelper.Page<TabStoreGroup> tabStoreGroups = this.storeGroupService.pageStoreGroupByIds(storeGroupIdList, enterpriseId, parentId, search);
Page<StoreGroupDTO> storeGroupDTOPage = PageHelperUtils.changePageHelperToCurrentPage(tabStoreGroups, StoreGroupDTO.class);
return ServiceResponse.success(storeGroupDTOPage);
}
......
......@@ -290,5 +290,8 @@
<if test="parentId != null">
and parent_store_group_id = #{parentId}
</if>
<if test="search != null and search != ''">
and store_group_name like concat('%', #{search}, '%')
</if>
</select>
</mapper>
\ No newline at end of file
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