From 86d65e6f837ff14b090ffc3312c013987b6f67d8 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 14 十月 2025 21:59:13 +0800
Subject: [PATCH] 荣誉 新增两个字段的查询
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelCountController.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelCountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelCountController.java
index f252498..617b656 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelCountController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelCountController.java
@@ -9,9 +9,13 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.TravelCount;
+import com.ruoyi.service.TravelCountDownlService;
import com.ruoyi.service.TravelCountService;
+import com.ruoyi.service.TravelCountSharService;
+import com.ruoyi.service.TravelDetailSharService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -41,17 +45,25 @@
@Autowired
private TravelCountService travelCountService;
+ @Autowired
+ private TravelCountDownlService travelCountDownlService;
+
+ @Autowired
+ private TravelCountSharService travelCountSharService;
+
@GetMapping("/all")
public AjaxResult listAll(TravelCount travelCount, String happenStartTime, String happenEndTime) throws ParseException {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
- Date start = simpleDateFormat.parse(happenStartTime);
- Date end = simpleDateFormat.parse(happenEndTime);
- return travelCountService.selectDataList(userId,pageNum,pageSize,travelCount,start,end);
+
+
+
+ AjaxResult res = travelCountService.selectDataList(userId,pageNum,pageSize,travelCount,happenStartTime,happenEndTime);
+ System.out.println(res);
+ return res;
}
@GetMapping("/{id}")
@@ -131,6 +143,9 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
+ if (! (travelCountDownlService.deleteData(ids) && travelCountSharService.deleteByContentId(ids) ) ){
+ return AjaxResult.error();
+ }
travelCountService.removeData(Arrays.asList(ids));
return AjaxResult.success();
}
--
Gitblit v1.9.1