From 201396fccb358d38e4e19109f30d740fcf98ae63 Mon Sep 17 00:00:00 2001 From: zhaowenxuan <chacca165@163.com> Date: 星期四, 17 四月 2025 14:10:24 +0800 Subject: [PATCH] 修复错误申请单号条码号问题 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 10 +++++++--- 1 files changed, 7 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 fd03825..f958a35 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 @@ -877,14 +877,16 @@ } } } - LambdaQueryWrapper<TjXdtgmdjg> wq = new LambdaQueryWrapper<>(); + + /* LambdaQueryWrapper<TjXdtgmdjg> wq = new LambdaQueryWrapper<>(); wq.eq(TjXdtgmdjg::getTjh, tjNumber); List<TjXdtgmdjg> list = xdtgmdjgService.list(wq); if (null != list && !list.isEmpty()) { for (TjXdtgmdjg xdtgmdjg : list) { pictureController.saveTjXdtgmdjgByJcbgd(xdtgmdjg); } - } + }*/ + if (StrUtil.isBlank(resultMsg)) return AjaxResult.success("鍚屾鎴愬姛"); else return AjaxResult.error(resultMsg); @@ -1820,6 +1822,8 @@ private List<Map<String, Object>> zongjianyishengchakanyichangxiangmu(String tjNumber) { // asyncService.updateCheckType(tjNumber); + String xb= customerService.getSexByTjh(tjNumber); + List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber); List<TjOrderDetail> tjOrderDetails = detailService.getzongjianyishengchakanyichangxiangmu(tjNumber); List<Map<String, Object>> list = new ArrayList<>(); @@ -1851,7 +1855,7 @@ for (String s : split) { s = s.replaceAll("\n", ""); // Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s); - Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s, "0"); + Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s, "0",xb); if (null != maps && !maps.isEmpty()) { Object bt = maps.get("bt"); Object nr = maps.get("nr"); -- Gitblit v1.8.0