From a20f90f94214d28d1f00b9d875e453c45d1abb7b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 12 Nov 2021 15:29:54 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
index ff89cae..f23d9a1 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
@@ -21,6 +21,7 @@
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hive.service.AchieveNewService;
import com.matrix.system.hive.service.SysProjServicesService;
+import com.matrix.system.hive.vo.DailyBeautyListVo;
import com.matrix.system.hiveErp.pojo.AchieveRuleItem;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -469,4 +470,21 @@
public List<AchieveNew> findOrderItemAchieve(Long orderId) {
return achieveNewDao.selectOrderItemAchieveByOrderId(orderId);
}
+
+ @Override
+ public List<DailyBeautyListVo> findDailyBeautyList(AchieveNew achieveNew, PaginationVO pageVo) {
+ List<DailyBeautyListVo> list = achieveNewDao.selectDailyBeautyList(achieveNew, pageVo);
+ if (CollUtil.isNotEmpty(list)) {
+ for (DailyBeautyListVo item : list) {
+ String pl = achieveNewDao.selectPlInfoByVipIdAndDate(item.getDatatime(), item.getVipId());
+ item.setProjInfo(pl);
+ }
+ }
+ return list;
+ }
+
+ @Override
+ public int findDailyBeautyListTotal(AchieveNew achieveNew) {
+ return achieveNewDao.selectDailyBeautyListTotal(achieveNew);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1