广电订单列表新增搜索字段

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/admin/SysGdController.java

@@ -50,7 +50,7 @@ public class SysGdController {
     public R page(Page<KxsGdReport> page, KxsGdReport param) {
         return R.ok(kxsGdReportService.page(page,
                 Wrappers.<KxsGdReport>lambdaQuery().eq(StrUtil.isNotBlank(param.getGdSn()),KxsGdReport::getGdSn, param.getGdSn())
-                        .eq(KxsGdReport::getStatus, GdReportEnum.REPORT.getType())
+                        .eq(param.getStatus() != null, KxsGdReport::getStatus, param.getStatus())
                         .eq(param.getPutType() != null, KxsGdReport::getPutType, param.getPutType())
                         .eq(StrUtil.isNotBlank(param.getGdMobile()), KxsGdReport::getGdMobile, param.getGdMobile())
                         .eq(StrUtil.isNotBlank(param.getUserCode()), KxsGdReport::getUserCode, param.getUserCode())

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsGdOrderServiceImpl.java

@@ -49,11 +49,7 @@ public class KxsGdOrderServiceImpl extends ServiceImpl<KxsGdOrderMapper, KxsGdOr
     @Override
     public IPage<KxsGdOrder> getByPage(Page<KxsGdOrder> page, KxsGdOrder param) {
 
-        LambdaQueryWrapper<KxsGdOrder> wrapper = Wrappers.lambdaQuery();
-        wrapper.eq(StrUtil.isNotBlank(param.getGdMobile()), KxsGdOrder::getGdMobile, param.getGdMobile());
-        wrapper.eq(StrUtil.isNotBlank(param.getOrderNo()), KxsGdOrder::getOrderNo, param.getOrderNo());
-
-        return baseMapper.selectPage(page, wrapper);
+        return baseMapper.selectPage(page, Wrappers.query(param));
     }
 
     @Override