From 5c7ea7346d77ab1c8be660c65e721ce3e46328f5 Mon Sep 17 00:00:00 2001 From: zhaowenxuan <chacca165@163.com> Date: 星期五, 21 二月 2025 17:56:26 +0800 Subject: [PATCH] 小程序报告接口以及his项目查询接口分页修复 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 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 297284d..4b00216 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 @@ -1700,6 +1700,9 @@ .filter(b -> maps.stream() .noneMatch(a -> a.get("proName").equals(b.get("proName")))) // 杩囨护鎺夊湪 maps 涓瓨鍦ㄧ殑鐩稿悓鍏冪礌 .collect(Collectors.toList()); + + + if(!collect.isEmpty()){ maps.addAll(collect); } @@ -1815,14 +1818,15 @@ String tjh = ycxms.get(0).getTjh(); if(StringUtils.isNotBlank(tjh)){ ycxmService.delOrderYcXmJyByTjh(tjh); - String szyssy=""; - StringBuilder builders = new StringBuilder(); +// String szyssy=""; +// StringBuilder builders = new StringBuilder(); +// List<TjOrderYcxm> ycxmList=new ArrayList<>(); for (TjOrderYcxm ycxm : ycxms) { ycxm.setJynr(JSONUtil.toJsonStr(ycxm.getMap())); - if(ycxm.getJcxm().contains("鑸掑紶鍘�")||ycxm.getJcxm().contains("鏀剁缉鍘�")){ - builders.append(ycxm.getJcxm()).append(ycxm.getJcjg()).append(" "); - szyssy+=builders.toString(); - } +// if(ycxm.getJcxm().contains("鑸掑紶鍘�")||ycxm.getJcxm().contains("鏀剁缉鍘�")){ +// builders.append(ycxm.getJcxm()).append(ycxm.getJcjg()).append(" "); +// szyssy+=builders.toString(); +// } } ycxmService.saveBatch(ycxms); return AjaxResult.success(); -- Gitblit v1.8.0