From 8ab195e6260c61e69bb3f5a14d841fd3bd058f51 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期一, 16 十二月 2024 14:45:56 +0800 Subject: [PATCH] zjh202412016 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 80 ++++++++++++++++++++++++---------------- 1 files changed, 48 insertions(+), 32 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java index 718e290..3e6a5a5 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java @@ -3349,39 +3349,55 @@ @GetMapping("/zongjanyemianshjianzhou") @ApiOperation(value = "鎬绘鑾峰彇鏃堕棿杞存帴鍙�") @Transactional - public AjaxResult zongjanyemianshjianzhou(@RequestParam String tjNUm) { - TjOrder order = tjOrderService.getOrderByTjNum(tjNUm); - if (null != order) { - int czwj = remarkService.panduaniscunzaiweijian(tjNUm); - int sfwc = remarkService.panduaniswancheng(tjNUm); - Date checkTime = order.getCheckTime(); - Date reportTime = order.getReportTime(); - Integer heshouStatus = order.getHeshouStatus(); - Date lastTime = order.getPrintLastTime(); - int a=0; - if (czwj == 0) { - //鏈 - a=0; - } else if (czwj > 0) { - //鍦ㄦ - a=1; - } else if (sfwc == 0) { - //宸插畬鎴� - a=2; - } else if (null != checkTime) { - //宸插鏍� - a=3; - } else if (null != reportTime) { - //鐢熸垚鎶ュ憡 - a=4; - } else if (null != heshouStatus) { - //鎶ュ憡鏍告敹 - a=5; - } else if (null != lastTime) { - //宸插嚭鎶ュ憡 - a=6; + public AjaxResult zongjanyemianshjianzhou(@RequestParam List<String> tjNUms) { + + if(null !=tjNUms && !tjNUms.isEmpty()){ + List<Map<String,Object>> list=new ArrayList<>(); + for (String tjNUm : tjNUms) { + Map<String,Object> map=new HashMap<>(); + TjOrder order = tjOrderService.getOrderByTjNum(tjNUm); + if (null != order) { + int czwj = remarkService.panduaniscunzaiweijian(tjNUm); + int sfwc = remarkService.panduaniswancheng(tjNUm); + Date checkTime = order.getCheckTime(); + Date reportTime = order.getReportTime(); + Integer heshouStatus = order.getHeshouStatus(); + Date lastTime = order.getPrintLastTime(); + int a=0; + if (czwj == 0) { + //鏈 + a=0; + } + if (czwj > 0) { + //鍦ㄦ + a=1; + } + if (sfwc == 0) { + //宸插畬鎴� + a=2; + } + if (null != checkTime) { + //宸插鏍� + a=3; + } + if (null != reportTime) { + //鐢熸垚鎶ュ憡 + a=4; + } + if (null != heshouStatus) { + //鎶ュ憡鏍告敹 + a=5; + } + if (null != lastTime) { + //宸插嚭鎶ュ憡 + a=6; + } + map.put("tjNUm",tjNUm); + map.put("sjz",a); + list.add(map); } - return AjaxResult.success(a); + } + return AjaxResult.success(list); } return AjaxResult.error(); } -- Gitblit v1.8.0