From 5e4d1aa4b27cfbcf1c4c8beb2ac05f3c7a0cf1bb Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期二, 18 二月 2025 16:55:45 +0800 Subject: [PATCH] zjh20250218 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 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 d1aa066..4d502e0 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 @@ -1748,13 +1748,17 @@ if(null !=tjOrderDetail.getProId()&& null !=tjOrderDetail.getYcbz()){ if(!tjOrderDetail.getDeptId().equals("2")){ List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString() - ,"",tjOrderDetail.getYcbz().replaceAll(" ", ""),tjNumber ,tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "") - .replaceAll("[ 娴嬪畾妫�娴媇","") + .replaceAll("[ 娴嬪畾妫�娴媇","").replaceAll("\\[.*?\\]", ""),tjOrderDetail.getYcbz().replaceAll(" ", ""),tjNumber + ,tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "") + .replaceAll("[ 娴嬪畾妫�娴媇","").replaceAll("\\[.*?\\]", "") ,tjOrderDetail.getProResult()); + + if(null !=maps && !maps.isEmpty()){ tjOrderDetail.setAdvices(maps); } + }else { String[] split = tjOrderDetail.getProResult().split("銆倈,|锛�"); List<Map<String,Object>> mapList=new ArrayList<>(); -- Gitblit v1.8.0