Fancy
2025-01-14 ce988f65d5b0c74ad5c104d05f1155ed05b1db72
orderList
2个文件已修改
17 ■■■■ 已修改文件
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportSv.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
    }
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) {