修改

xuhy

2024-10-31 facc498b400eb52431452cfac2088e1c78d275ec

修改

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

@@ -50,10 +50,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(query));
    }

    /**

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TFoundationPersonMapper.java

@@ -25,4 +25,11 @@
     */
    List<TFoundationPersonVO> getList(@Param("query") TFoundationPersonQuery query, @Param("pageInfo")PageInfo<TFoundationPersonVO> pageInfo);

    /**
     * 查询基础设置列表
     * @param query
     * @return
     */
    List<TFoundationPersonVO> getSetList(@Param("query")TFoundationPersonQuery query);

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TFoundationPersonService.java

@@ -47,4 +47,6 @@
     */
    boolean hasDuplicateId(List<TFoundationPersonDTO> list);

    List<TFoundationPersonVO> getSetList(TFoundationPersonQuery query);

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java

@@ -120,4 +120,23 @@
        }
        return false; // 没有发现重复的人数
    }

    @Override
    public List<TFoundationPersonVO> getSetList(TFoundationPersonQuery query) {
        List<TFoundationPersonVO> list = this.baseMapper.getSetList(query);
        List<Long> ids = list.stream().map(TFoundationPersonVO::getId).collect(Collectors.toList());
        if(!CollectionUtils.isEmpty(ids)){
            List<TFoundationConfig> list1 = foundationConfigService.list(Wrappers.lambdaQuery(TFoundationConfig.class)
                    .in(TFoundationConfig::getPersonId, ids));
            list.forEach(item -> {
                List<TFoundationConfig> collect = list1.stream().filter(item1 -> item1.getPersonId().equals(item.getId())).collect(Collectors.toList());
                if(!CollectionUtils.isEmpty(collect)){
                    item.setMinDish(collect.stream().sorted(Comparator.comparingInt(TFoundationConfig::getMinCount)).findFirst().get().getMinCount());
                    item.setMaxDish(collect.stream().sorted(Comparator.comparingInt(TFoundationConfig::getMaxCount).reversed()).findFirst().get().getMaxCount());
                    item.setFoundationConfigs(collect);
                }
            });
        }
        return list;
    }
}

 ruoyi-system/src/main/resources/mapper/system/TFoundationPersonMapper.xml

@@ -27,5 +27,11 @@
        </where>
        ORDER BY tfp.createTime DESC
    </select>
    <select id="getSetList" resultType="com.ruoyi.system.vo.TFoundationPersonVO">
        select
        tfp.id, tfp.mealCount,tfp.createTime,tfp.shopId,tfp.mealType
        from t_foundation_person tfp
        ORDER BY tfp.createTime DESC
    </select>

</mapper>