From bfdb3faf4f27df01718f58ac8c4ec0bcc092e7b6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 30 十一月 2024 18:50:47 +0800
Subject: [PATCH] 生成数据明细导出修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java
index d529933..9c70ed1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java
@@ -7,6 +7,7 @@
import com.ruoyi.system.domain.TFoundationConfig;
import com.ruoyi.system.domain.TFoundationPerson;
import com.ruoyi.system.domain.TShop;
+import com.ruoyi.system.dto.TFoundationPersonBatchDTO;
import com.ruoyi.system.dto.TFoundationPersonDTO;
import com.ruoyi.system.query.TFoundationPersonQuery;
import com.ruoyi.system.service.TFoundationConfigService;
@@ -17,11 +18,14 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import oshi.driver.unix.aix.Ls;
import java.time.LocalDateTime;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -48,10 +52,16 @@
/**
* 查询基础设置列表
*/
+// @ApiOperation( value = "查询基础设置列表")
+// @PostMapping(value = "/list")
+// public AjaxResult<PageInfo<TFoundationPersonVO>> list(@RequestBody TFoundationPersonQuery query) {
+// return AjaxResult.success(foundationPersonService.getList(query));
+// }
+
@ApiOperation( value = "查询基础设置列表")
@PostMapping(value = "/list")
- public AjaxResult<PageInfo<TFoundationPersonVO>> list(@RequestBody TFoundationPersonQuery query) {
- return AjaxResult.success(foundationPersonService.getList(query));
+ public AjaxResult<List<TFoundationPersonVO>> list(@RequestBody TFoundationPersonQuery query) {
+ return AjaxResult.success(foundationPersonService.getSetList());
}
/**
@@ -59,7 +69,7 @@
*/
@ApiOperation( value = "添加基础设置")
@PostMapping(value = "/add")
- public AjaxResult<Boolean> add(@RequestBody List<TFoundationPersonDTO> dto) {
+ public AjaxResult<Boolean> add(@RequestBody TFoundationPersonBatchDTO dto) {
foundationPersonService.add(dto);
return AjaxResult.success();
}
@@ -69,7 +79,7 @@
*/
@ApiOperation( value = "修改基础设置")
@PostMapping(value = "/update")
- public AjaxResult<Boolean> update(@RequestBody List<TFoundationPersonDTO> dto) {
+ public AjaxResult<Boolean> update(@RequestBody TFoundationPersonBatchDTO dto) {
foundationPersonService.edit(dto);
return AjaxResult.success();
}
@@ -79,18 +89,19 @@
*/
@ApiOperation( value = "查看基础设置详情")
@GetMapping(value = "/getDetailById")
- public AjaxResult<TFoundationPersonVO> getDetailById(@RequestParam("id") Long id) {
+ public AjaxResult<List<TFoundationPersonVO>> getDetailByMealType(@RequestParam("mealType") Integer mealType) {
// 查询基础设置
- List<TFoundationConfig> list = foundationConfigService.list(Wrappers.lambdaQuery(TFoundationConfig.class)
- .eq(TFoundationConfig::getPersonId, id));
- TFoundationPerson foundationPerson = foundationPersonService.getById(id);
- TFoundationPersonVO foundationPersonVO = new TFoundationPersonVO();
- BeanUtils.copyProperties(foundationPerson, foundationPersonVO);
- foundationPersonVO.setFoundationConfigs(list);
- // 查询店铺
- TShop shop = shopService.getById(foundationPersonVO.getShopId());
- foundationPersonVO.setShop(shop);
- return AjaxResult.success(foundationPersonVO);
+ List<TFoundationPersonVO> foundationPersonVOS = foundationPersonService.getPersonList();
+ List<TFoundationPersonVO> collect = foundationPersonVOS.stream().filter(e -> Objects.equals(e.getMealType(), mealType)).collect(Collectors.toList());
+ for (TFoundationPersonVO foundationPersonVO : collect) {
+ List<TFoundationConfig> list = foundationConfigService.list(Wrappers.lambdaQuery(TFoundationConfig.class)
+ .eq(TFoundationConfig::getPersonId, foundationPersonVO.getId()));
+ foundationPersonVO.setFoundationConfigs(list);
+ // 查询店铺
+ TShop shop = shopService.getById(foundationPersonVO.getShopId());
+ foundationPersonVO.setShop(shop);
+ }
+ return AjaxResult.success(collect);
}
/**
--
Gitblit v1.7.1