|
@@ -83,7 +83,7 @@ public class TOrderController {
|
|
|
@Autowired
|
|
|
SzwlFeign szwlFeign;
|
|
|
@GetMapping("/pageOrder")
|
|
|
- public ResponseModel<IPage<?>> pageOrder(String adminId,String adminType,String type,String sn,String status,String userName,String payType,String productNo,String clientId,String trxNo,String dateType, String startDate, String endDate, long current, long size ) {
|
|
|
+ public ResponseModel<IPage<?>> pageOrder(String equipmentId, String adminId,String adminType,String type,String sn,String status,String userName,String payType,String productNo,String clientId,String trxNo,String dateType, String startDate, String endDate, long current, long size ) {
|
|
|
//判断当前账号状态
|
|
|
TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(adminId));
|
|
|
if(StringUtils.isEmpty(type)){
|
|
@@ -178,6 +178,9 @@ public class TOrderController {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ if(StringUtils.isNotEmpty(equipmentId)){
|
|
|
+ query.eq(TOrder::getEquipmentId,equipmentId);
|
|
|
+ }
|
|
|
if(StringUtils.isNotEmpty(payType)){
|
|
|
query.eq(TOrder::getFrpCode,payType);
|
|
|
}
|