From 2c785c3d4513daea9deb5c7edbb17a9f17111d25 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 21 二月 2025 17:49:03 +0800
Subject: [PATCH] zjh20250221
---
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 ad4524b..efa6950 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());
@@ -1711,15 +1712,22 @@
return AjaxResult.success(maps);
}else {
List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
- if(mapList.isEmpty()){
- return AjaxResult.error("鏆傛棤鏁版嵁");
- }
+// if(mapList.isEmpty()){
+// return AjaxResult.success("鏆傛棤鏁版嵁");
+// }
return AjaxResult.success(mapList);
}
// return zongjianyishengchakanyichangxiangmu(tjNum);
}
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) {
@@ -1810,7 +1818,7 @@
return AjaxResult.success();
}
}
- return AjaxResult.error();
+ return AjaxResult.success();
}
--
Gitblit v1.8.0