From 73a816fd2b1e29c25d615c85ce34b12b55c16ccf Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期一, 20 一月 2025 13:41:45 +0800 Subject: [PATCH] zjh20250120 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 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 f185fb7..839c23c 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 @@ -122,6 +122,8 @@ private RedissonClient redissonClient; @Autowired private ITjRulesService rulesService; + @Autowired + private ITjProAdvicerulesService tjProAdvicerulesService; @GetMapping ("/ceshicc") @@ -1658,19 +1660,25 @@ if (remark.getProsId().equals(tjOrderDetail.getProsId())) { if(null !=tjOrderDetail.getProId()&& null !=tjOrderDetail.getYcbz()){ if(!tjOrderDetail.getDeptId().equals("2")){ - List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString(),"",tjOrderDetail.getYcbz(),tjNumber); + List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString() + ,"",tjOrderDetail.getYcbz().replaceAll(" ", ""),tjNumber + ,tjOrderDetail.getProName().replaceAll("\\锛圼^\\锛塢*\\锛�", "") + .replaceAll("[ 娴嬪畾]","") + ,tjOrderDetail.getProResult()); if(null !=maps && !maps.isEmpty()){ tjOrderDetail.setAdvices(maps); } }else { - String[] split = tjOrderDetail.getProResult().split("銆�"); + String[] split = tjOrderDetail.getProResult().split("銆倈,|锛�"); List<Map<String,Object>> mapList=new ArrayList<>(); for (String s : split) { - Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s); + s = s.replaceAll("\n", ""); +// Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s); + Map<String,Object> maps= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(),s,"0"); if(null !=maps && !maps.isEmpty()){ Object bt = maps.get("bt"); Object nr = maps.get("nr"); - if(null !=bt && null !=nr) mapList.add(maps); + if(null !=bt || null !=nr) mapList.add(maps); } } tjOrderDetail.setAdvices(mapList); -- Gitblit v1.8.0