From ce988f65d5b0c74ad5c104d05f1155ed05b1db72 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 14 一月 2025 14:08:39 +0800
Subject: [PATCH] orderList
---
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java | 12 +++++-------
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java | 5 +++--
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java
index 732820c..805dfca 100644
--- a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java
+++ b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java
@@ -6,6 +6,7 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pmsGlobal.aop.Log;
+import com.dy.pmsGlobal.pojoPr.PrOrder;
import com.dy.pmsGlobal.pojoPr.PrProductionProcess;
import com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog;
import jakarta.validation.Valid;
@@ -88,8 +89,8 @@
@GetMapping(path="queryOrderList")
@Log("鏌ヨ璁㈠崟鐪嬫澘")
- public BaseResponse<List<JSONObject>> queryOrderList(){
- List<JSONObject> list = sv.queryOrderList();
+ public BaseResponse<List<PrOrder>> queryOrderList(){
+ List<PrOrder> list = sv.queryOrderList();
return BaseResponseUtils.buildSuccess(list);
}
diff --git a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java
index 34cfb76..eb86ddc 100644
--- a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java
+++ b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java
@@ -177,15 +177,13 @@
return list;
}
- //娌″啓瀹�
- public List<JSONObject> queryOrderList() {
- List<JSONObject> list = assemblyPlanDao.queryPlanList();
- /* Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize();
- List<PrOrder> orderList = orderDao.selectAll(params);
+ public List<PrOrder> queryOrderList() {
+ Map<String, Object> params = new HashMap<>();
+ List<PrOrder> orderList = orderDao.selectSome(params);
for (PrOrder prOrder : orderList) {
changeRate(prOrder);
- }*/
- return null;
+ }
+ return orderList;
}
private void changeRate(PrOrder prOrder) {
if (prOrder != null && prOrder.items != null) {
--
Gitblit v1.8.0