1018653686@qq.com 1 year ago
parent
commit
f428f8abfa

+ 3 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/product/impl/ProductInfoServiceImpl.java

@@ -7,12 +7,14 @@ import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
 import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
 import com.fjhx.tenant.service.dict.DictTenantDataService;
 import com.fjhx.tenant.utils.DictUtils;
+import com.fjhx.xmhjc.entity.product.po.ProductCategory;
 import com.fjhx.xmhjc.entity.product.po.ProductInfo;
 import com.fjhx.xmhjc.mapper.product.ProductInfoMapper;
 import com.fjhx.xmhjc.service.product.ProductInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -56,6 +58,7 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
     public Page<ProductInfoVo> getPage(ProductInfoSelectDto dto) {
         IWrapper<ProductInfo> wrapper = getWrapper();
         wrapper.orderByAsc("pi", ProductInfo::getSort);
+        wrapper.keyword(dto, new SqlField("pi", ProductInfo::getTitle));
         Page<ProductInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<ProductInfoVo> records = page.getRecords();
 //        DictTenantDataSelectDto dictTenantDataSelectDto = new DictTenantDataSelectDto();

+ 2 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/product/impl/ProductSubCategoryServiceImpl.java

@@ -7,6 +7,7 @@ import com.fjhx.xmhjc.entity.product.vo.ProductCategoryVo;
 import com.fjhx.xmhjc.mapper.product.ProductSubCategoryMapper;
 import com.fjhx.xmhjc.service.product.ProductSubCategoryService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.xmhjc.entity.product.vo.ProductSubCategoryVo;
@@ -34,6 +35,7 @@ public class ProductSubCategoryServiceImpl extends ServiceImpl<ProductSubCategor
         IWrapper<ProductSubCategory> wrapper = getWrapper();
         wrapper.eq(ObjectUtil.isNotNull(dto.getCategoryId()), "parent_id", dto.getCategoryId());
         wrapper.eq(ObjectUtil.isNotNull(dto.getStatus()), "status", dto.getStatus());
+        wrapper.keyword(dto, new SqlField("pc", ProductCategory::getName));
         wrapper.orderByDesc("psc", ProductSubCategory::getId);
         Page<ProductSubCategoryVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;