Merge remote-tracking branch 'origin/master'

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClient.java

@@ -2,6 +2,7 @@ package org.springblade.erpdata.feign;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -24,7 +25,7 @@ public interface IErpMesRbPkpqryClient {
 	/**
 	 * 查询配置结果
 	 *
-	 * @param page           分页参数
+	 * @param query           分页参数
 	 * @param pkno           配套单号
 	 * @param prtmdept       主制部门
 	 * @param subpkdateStart 配套开始时间
@@ -32,5 +33,5 @@ public interface IErpMesRbPkpqryClient {
 	 * @return
 	 */
 	@GetMapping(SELECT_PAGE)
-	R<IPage<MesRbPkpqryDTO>> selectPage(IPage<MesRbPkpqryDTO> page, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd);
+	R<IPage<MesRbPkpqryDTO>> selectPage(Query query, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd);
 }

blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbPkpqryClientFallback.java

@@ -2,6 +2,7 @@ package org.springblade.erpdata.feign;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO;
 
@@ -13,7 +14,7 @@ import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO;
 public class IErpMesRbPkpqryClientFallback implements IErpMesRbPkpqryClient {
 
 	@Override
-	public R<IPage<MesRbPkpqryDTO>> selectPage(IPage<MesRbPkpqryDTO> page, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd) {
+	public R<IPage<MesRbPkpqryDTO>> selectPage(Query query, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd) {
 		return R.fail("获取数据失败");
 	}
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldPlanController.java

@@ -192,7 +192,7 @@ public class YieldPlanController extends BladeController {
 												   @Parameter(description = "配套开始时间", required = false) @RequestParam String subpkdateStart,
 												   @Parameter(description = "配套结束时间", required = false) @RequestParam String subpkdateEnd,
 												   Query query) {
-		R<IPage<MesRbPkpqryDTO>> result = mesRbPkpqryClient.selectPage(Condition.getPage(query), pkno, prtmdept, subpkdateStart, subpkdateEnd);
+		R<IPage<MesRbPkpqryDTO>> result = mesRbPkpqryClient.selectPage(query, pkno, prtmdept, subpkdateStart, subpkdateEnd);
 		return result;
 	}
 }

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/feign/ErpMesRbPkpqryClient.java

@@ -4,6 +4,8 @@ package org.springblade.erpdata.feign;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.v3.oas.annotations.Hidden;
 import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.erpdata.pojo.dto.MesRbPkpqryDTO;
@@ -27,7 +29,7 @@ public class ErpMesRbPkpqryClient implements IErpMesRbPkpqryClient {
 
 	@GetMapping(SELECT_PAGE)
 	@Override
-	public R<IPage<MesRbPkpqryDTO>> selectPage(IPage<MesRbPkpqryDTO> page, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd) {
-		return R.data(mesRbPkpqryService.page(page, pkno, prtmdept, subpkdateStart, subpkdateEnd));
+	public R<IPage<MesRbPkpqryDTO>> selectPage(Query query, String pkno, String prtmdept, String subpkdateStart, String subpkdateEnd) {
+		return R.data(mesRbPkpqryService.page(Condition.getPage(query), pkno, prtmdept, subpkdateStart, subpkdateEnd));
 	}
 }