From facc498b400eb52431452cfac2088e1c78d275ec Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 31 十月 2024 09:52:28 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/TFoundationPersonService.java | 2 ++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java | 19 +++++++++++++++++++
ruoyi-system/src/main/resources/mapper/system/TFoundationPersonMapper.xml | 6 ++++++
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TFoundationPersonMapper.java | 7 +++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java | 10 ++++++++--
5 files changed, 42 insertions(+), 2 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 e800cb0..bf427a8 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
@@ -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));
}
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TFoundationPersonMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TFoundationPersonMapper.java
index ab80d12..bc4387b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TFoundationPersonMapper.java
+++ b/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);
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TFoundationPersonService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TFoundationPersonService.java
index 8fa63d9..f027638 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TFoundationPersonService.java
+++ b/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);
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java
index 7212aad..52a9bcd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java
+++ b/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;
+ }
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TFoundationPersonMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TFoundationPersonMapper.xml
index c2940a8..01dc249 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TFoundationPersonMapper.xml
+++ b/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>
--
Gitblit v1.7.1