From c24698dacd5d43d99bbae35b430a189675a6532b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 17:08:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java
index 6f9ac20..36f07d5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelDetailController.java
@@ -3,6 +3,8 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.TravelDetail;
+import com.ruoyi.service.TravelCountSharService;
+import com.ruoyi.service.TravelDetailDownlService;
import com.ruoyi.service.TravelDetailService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -26,13 +28,21 @@
@Autowired
TravelDetailService travelDetailService;
- @GetMapping()
- public AjaxResult getDataByCid(@PathParam("cid") Long cid,TravelDetail travelDetail){
+ @Autowired
+ TravelDetailDownlService travelDetailDownlService;
+
+ @Autowired
+ TravelCountSharService travelCountSharService;
+
+ @GetMapping("/{cid}")
+ public AjaxResult getDataByCid(@PathVariable("cid") Long cid,TravelDetail travelDetail){
+ System.out.println(cid);
+ System.out.println("-----------------------------------");
List<TravelDetail> travelDetailList = travelDetailService.getDataByCid(cid,travelDetail);
return AjaxResult.success(travelDetailList);
}
- @GetMapping("/{id}")
+ @GetMapping("/byId/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(travelDetailService.getById(id));
@@ -53,6 +63,9 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
+ if (! (travelDetailDownlService.deleteData(ids) && travelCountSharService.deleteByContentId(ids) ) ){
+ return AjaxResult.error();
+ }
travelDetailService.removeByIds(Arrays.asList(ids));
return AjaxResult.success();
}
--
Gitblit v1.9.1