From e2aa1fbda91802be349225cd8bedd2028e8a4f1b Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Fri, 07 Apr 2023 14:55:55 +0800
Subject: [PATCH] Merge branch 'hongloumeng' of http://120.27.238.55:7000/r/xc-mall into hongloumeng
---
src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
index 3aa9632..fa0d6bb 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
@@ -256,6 +256,13 @@
String achieveReleasePercent = ObjectUtil.isEmpty(achieveReleasePercentDic.getValue()) ? "0" : achieveReleasePercentDic.getValue();
hlmVoucherSetDto.setAchieveReleasePercent(achieveReleasePercent);
}
+ DataDictionaryCustom achieveReleaseDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ GreenScoreEnum.ACHIEVE_RELEASE.getType(),
+ GreenScoreEnum.ACHIEVE_RELEASE.getCode());
+ if (achieveReleaseDic != null) {
+ String achieveRelease = ObjectUtil.isEmpty(achieveReleaseDic.getValue()) ? "0" : achieveReleaseDic.getValue();
+ hlmVoucherSetDto.setAchieveRelease(achieveRelease);
+ }
DataDictionaryCustom achieveMaxDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
GreenScoreEnum.ACHIEVE_MAX.getType(),
GreenScoreEnum.ACHIEVE_MAX.getCode());
--
Gitblit v1.9.1