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 | 30 ++++++++++++++++++++++++++----
1 files changed, 26 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 5d0e9c0..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
@@ -1667,6 +1667,7 @@
List<TjOrderDetail> dels = new ArrayList<>();
for (TjOrderYcxm ycxm : entry.getValue()) {
TjOrderDetail detail=new TjOrderDetail();
+ detail.setOrderDetailId(Long.valueOf(ycxm.getId()));
detail.setProName(ycxm.getJcxm());
detail.setProResult(ycxm.getJcjg());
detail.setStanId(ycxm.getCkfw());
@@ -1699,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);
}
@@ -1722,6 +1726,15 @@
return AjaxResult.error();
}
+
+
+ @GetMapping ("/delzongjianyishengchakanyichangxiangmu")
+ @ApiOperation (value = "鎬绘鍒犻櫎寮傚父椤圭洰鎺ュ彛")
+ public AjaxResult delzongjianyishengchakanyichangxiangmu(@RequestParam String id) {
+ ycxmService.removeById(id);
+ return AjaxResult.success();
+ }
+
private List<Map<String, Object>> zongjianyishengchakanyichangxiangmu(String tjNumber) {
// asyncService.updateCheckType(tjNumber);
@@ -1738,13 +1751,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<>();
@@ -1801,11 +1818,16 @@
String tjh = ycxms.get(0).getTjh();
if(StringUtils.isNotBlank(tjh)){
ycxmService.delOrderYcXmJyByTjh(tjh);
-
+// 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();
+// }
}
-// List<TjOrderYcxm> collect = ycxms.stream().distinct().collect(Collectors.toList());
ycxmService.saveBatch(ycxms);
return AjaxResult.success();
}
--
Gitblit v1.8.0