From 9a35e2e3bded439bec2625055860c6f48e52efa7 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期一, 19 一月 2026 10:22:51 +0800
Subject: [PATCH] 旅游修改为家族模块
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelCountController.java | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 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 ae5e169..fe80227 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
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.zhang;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -8,15 +9,21 @@
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.TravelCountService;
+import com.ruoyi.domain.ZInfoUser;
+import com.ruoyi.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
@@ -37,19 +44,31 @@
@Autowired
private TravelCountService travelCountService;
+ @Autowired
+ private TravelCountDownlService travelCountDownlService;
+
+ @Autowired
+ private TravelCountSharService travelCountSharService;
+
@GetMapping("/all")
- public AjaxResult listAll(){
+ 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);
- return travelCountService.selectDataList(userId,pageNum,pageSize);
+
+
+
+
+ AjaxResult res = travelCountService.selectDataList(userId,pageNum,pageSize,travelCount,happenStartTime,happenEndTime);
+ System.out.println(res);
+ return res;
}
@GetMapping("/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
- return AjaxResult.success(travelCountService.getById(id));
+ return AjaxResult.success(travelCountService.getDataById(id));
}
@@ -99,7 +118,7 @@
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
travelCount.setUid(userId);
- travelCountService.save(travelCount);
+ travelCountService.addData(travelCount);
return AjaxResult.success();
}
@@ -111,7 +130,7 @@
@PutMapping
public AjaxResult edit(@RequestBody TravelCount travelCount)
{
- travelCountService.updateById(travelCount);
+ travelCountService.updateData(travelCount);
return AjaxResult.success();
}
//
@@ -123,8 +142,17 @@
@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();
}
+ @Resource
+ ZInfoUserService zInfoUserService;
+
+
+
+
}
--
Gitblit v1.9.1