From 67aad90d4269515c3a067c30bce3c372d9981a08 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期五, 26 七月 2024 18:15:13 +0800 Subject: [PATCH] zjh 2024/07/26-1 --- ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java | 87 +++++++++++++++---------------------------- 1 files changed, 31 insertions(+), 56 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java index be9a9cc..d4fda5e 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java @@ -335,7 +335,6 @@ @ApiOperation(value = "灏忕▼搴�-浣撴鎶ュ憡鏌ヨ璇︽儏") public AjaxResult getShenGaoTiZhong(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNumber) { Map<String, Object> objectMap = new HashMap<>(); - List<Map<String, Object>> list = new ArrayList<>(); LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>(); wq1.eq(TjOrder::getTjNumber, tjNumber); wq1.eq(TjOrder::getCheckStatus, 1); @@ -344,62 +343,38 @@ return AjaxResult.success("浣撴鏆傛湭瀹屾垚锛侊紒"); } - LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>(); - wq.eq(TjOrderDetail::getOrderId, one.getOrderId()); - wq.in(TjOrderDetail::getProId, "1633660948860522524"); - final TjOrderDetail one1 = detailService.getOne(wq); - if (one1 == null) { - objectMap.put("shenggao", "鏃�"); - } else { - objectMap.put("shenggao", one1.getProResult()); - } + List<Map<String, Object>> maps = detailService.getShenGaoTiZhongList(one.getTjNumber()); +// if(null !=maps && maps.size()>0){ +// for (Map<String, Object> map : maps) { +// if (map.get("") == null) { +// objectMap.put("shenggao", "鏃�"); +// } else { +// objectMap.put("shenggao", one1.getProResult()); +// } +// if (one2 == null) { +// objectMap.put("tizhong", "鏃�"); +// } else { +// objectMap.put("tizhong", one2.getProResult()); +// } +// if (one3 == null) { +// objectMap.put("tizhongzhishu", "鏃�"); +// } else { +// objectMap.put("tizhongzhishu", one3.getProResult()); +// } +// if (one4 == null) { +// objectMap.put("shousuoya", "鏃�"); +// } else { +// objectMap.put("shousuoya", one4.getProResult()); +// } +// if (one5 == null) { +// objectMap.put("shuzhangya", "鏃�"); +// } else { +// objectMap.put("shuzhangya", one5.getProResult()); +// } +// } +// } - - LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>(); - wq2.eq(TjOrderDetail::getOrderId, one.getOrderId()); - wq2.in(TjOrderDetail::getProId, "1633660948860522525"); - final TjOrderDetail one2 = detailService.getOne(wq2); - if (one2 == null) { - objectMap.put("tizhong", "鏃�"); - } else { - objectMap.put("tizhong", one2.getProResult()); - } - - - LambdaQueryWrapper<TjOrderDetail> wq3 = new LambdaQueryWrapper<>(); - wq3.eq(TjOrderDetail::getOrderId, one.getOrderId()); - wq3.in(TjOrderDetail::getProId, "1633660948860522526"); - final TjOrderDetail one3 = detailService.getOne(wq3); - if (one3 == null) { - objectMap.put("tizhongzhishu", "鏃�"); - } else { - objectMap.put("tizhongzhishu", one3.getProResult()); - } - - - LambdaQueryWrapper<TjOrderDetail> wq4 = new LambdaQueryWrapper<>(); - wq4.eq(TjOrderDetail::getOrderId, one.getOrderId()); - wq4.in(TjOrderDetail::getProId, "1633660948860522527"); - final TjOrderDetail one4 = detailService.getOne(wq4); - if (one4 == null) { - objectMap.put("shousuoya", "鏃�"); - } else { - objectMap.put("shousuoya", one4.getProResult()); - } - - - LambdaQueryWrapper<TjOrderDetail> wq5 = new LambdaQueryWrapper<>(); - wq5.eq(TjOrderDetail::getOrderId, one.getOrderId()); - wq5.in(TjOrderDetail::getProId, "1633660948860522528"); - final TjOrderDetail one5 = detailService.getOne(wq5); - if (one5 == null) { - objectMap.put("shuzhangya", "鏃�"); - } else { - objectMap.put("shuzhangya", one5.getProResult()); - } - - - return AjaxResult.success(objectMap); + return AjaxResult.success(maps); } -- Gitblit v1.8.0