生成数据明细导出修改

xuhy

2024-11-30 bfdb3faf4f27df01718f58ac8c4ec0bcc092e7b6

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java

@@ -24,6 +24,8 @@

import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
 * <p>
@@ -59,7 +61,7 @@
    @ApiOperation( value = "查询基础设置列表")
    @PostMapping(value = "/list")
    public AjaxResult<List<TFoundationPersonVO>> list(@RequestBody TFoundationPersonQuery query) {
        return AjaxResult.success(foundationPersonService.getSetList(query));
        return AjaxResult.success(foundationPersonService.getSetList());
    }

    /**
@@ -87,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);
    }

    /**