修改设备订单关联关系功能

imcs-bt-be/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/order/OrderController.java

@@ -15,6 +15,7 @@ import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
 import com.github.zuihou.security.annotation.PreAuth;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -49,8 +50,7 @@ public class OrderController extends SuperController<OrderService, Long, Order,
         OrderPageDTO data = params.getModel();
         Order model = BeanUtil.toBean(data, Order.class);
         QueryWrap<Order> wrapper = this.handlerWrapper(null, params);
-        wrapper.notIn("order_status", "INIT");
-        wrapper.orderByDesc("create_time");
+        wrapper.eq(model.getOrderEquId()!=null,"order_equ_id", model.getOrderEquId()).eq(StringUtils.isNotEmpty(model.getOrderStatus()),"order_status", model.getOrderStatus()).orderByDesc("create_time");
         baseService.pageList(page, wrapper);
     }
 

imcs-bt-be/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionresource/ProductionResourceController.java

@@ -72,8 +72,6 @@ public class ProductionResourceController extends SuperController<ProductionTena
     @Override
     public void query(PageParams<ProductionResourcePageDTO> params, IPage<ProductionResource> page, Long defSize) {
         ProductionResourcePageDTO data = params.getModel();
-        //定制每页显示数量
-        page.setSize(15L);
         ProductionResource model = BeanUtil.toBean(data, ProductionResource.class);
         QueryWrap<ProductionResource> wrap = this.handlerWrapper(null, params);
         LbqWrapper<ProductionResource> wrapper = wrap.lambda();

imcs-bt-be/imcs-business-entity/src/main/java/com/github/zuihou/business/order/dto/OrderPageDTO.java

@@ -46,6 +46,13 @@ public class OrderPageDTO implements Serializable {
      */
     @ApiModelProperty(value = "商家id")
     private Long orderCompanyId;
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty(value = "设备id")
+    private Long orderEquId;
+
     /**
      * 订单规格id
      */