From 5489d624e6642b459ecf8d143c548ac8a980a8c8 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期三, 15 一月 2025 11:36:14 +0800 Subject: [PATCH] zjh20250115 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java index f6edc34..c92e1f5 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java @@ -1657,10 +1657,23 @@ for (TjOrderDetail tjOrderDetail : tjOrderDetails) { if (remark.getProsId().equals(tjOrderDetail.getProsId())) { if(null !=tjOrderDetail.getProId()&& null !=tjOrderDetail.getYcbz()){ - List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString(),"",tjOrderDetail.getYcbz(),tjNumber); - if(null !=maps && !maps.isEmpty()){ - tjOrderDetail.setAdvices(maps); + if(!tjOrderDetail.getDeptId().equals("2")){ + List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString(),"",tjOrderDetail.getYcbz(),tjNumber); + if(null !=maps && !maps.isEmpty()){ + tjOrderDetail.setAdvices(maps); + } + }else { + String[] split = tjOrderDetail.getProResult().split("銆�"); + List<Map<String,Object>> mapList=new ArrayList<>(); + for (String s : split) { + Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s); + if(null !=maps && !maps.isEmpty()){ + mapList.add(maps); + } + } + tjOrderDetail.setAdvices(mapList); } + } dels.add(tjOrderDetail); -- Gitblit v1.8.0