From c7f54029c985ea40b3e5899d7323a4e862458392 Mon Sep 17 00:00:00 2001 From: xxssyyyyssxx Date: Fri, 5 Nov 2021 18:44:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A9=E7=8E=87=E5=92=8C=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=B4=A1=E7=8C=AE=E5=88=A9=E6=B6=A6=E7=8E=87=E4=BB=8E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/controller/backend/SysConfigController.java | 5 +++-- src/main/java/cn/palmte/work/model/SysConfig.java | 8 ++++++++ .../cn/palmte/work/service/ProjectBudgetService.java | 7 ++++--- .../java/cn/palmte/work/service/SysConfigService.java | 11 +++++++++-- 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/main/java/cn/palmte/work/controller/backend/SysConfigController.java b/src/main/java/cn/palmte/work/controller/backend/SysConfigController.java index 52dd942..ec26bfe 100644 --- a/src/main/java/cn/palmte/work/controller/backend/SysConfigController.java +++ b/src/main/java/cn/palmte/work/controller/backend/SysConfigController.java @@ -1,5 +1,6 @@ package cn.palmte.work.controller.backend; +import cn.palmte.work.model.SysConfig; import cn.palmte.work.model.SysConfigRepository; import cn.palmte.work.pojo.SysConfigRequest; import cn.palmte.work.service.SysConfigService; @@ -22,8 +23,8 @@ public class SysConfigController extends BaseController{ @RequestMapping("/edit") public String edit(Map model) { - model.put("underwrittenTaxRate",sysConfigRepository.findByCodeEquals("underwrittenTaxRate").getValue()); - model.put("projectContributionProfitRateThreshold",sysConfigRepository.findByCodeEquals("projectContributionProfitRateThreshold").getValue()); + model.put(SysConfig.KEY_UNDERWRITTENTAXRATE,sysConfigRepository.findByCodeEquals(SysConfig.KEY_UNDERWRITTENTAXRATE).getValue()); + model.put(SysConfig.KEY_PROJECTCONTRIBUTIONPROFITRATETHRESHOLD,sysConfigRepository.findByCodeEquals(SysConfig.KEY_PROJECTCONTRIBUTIONPROFITRATETHRESHOLD).getValue()); return "admin/profit_marfin_config_input"; } diff --git a/src/main/java/cn/palmte/work/model/SysConfig.java b/src/main/java/cn/palmte/work/model/SysConfig.java index 567524c..f793cdc 100644 --- a/src/main/java/cn/palmte/work/model/SysConfig.java +++ b/src/main/java/cn/palmte/work/model/SysConfig.java @@ -12,6 +12,14 @@ import java.util.Date; @Table(name = "sys_config") public class SysConfig { + /** + * 资金利率 + */ + public static final String KEY_UNDERWRITTENTAXRATE = "underwrittenTaxRate"; + /** + * 项目贡献利润率阀值 + */ + public static final String KEY_PROJECTCONTRIBUTIONPROFITRATETHRESHOLD = "projectContributionProfitRateThreshold"; /** * id */ diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java index 1eb52f2..ccb0f7f 100644 --- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java +++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java @@ -35,6 +35,8 @@ public class ProjectBudgetService { private ProjectBudgetCostProjectManageDetailRepository projectBudgetCostProjectManageDetailRepository; @Autowired private ProjectBudgetPlanDetailRepository projectBudgetPlanDetailRepository; + @Autowired + private SysConfigService sysConfigService; @Value("#{'${fourcal.fixedprojectmanagedetails}'.split('\\|')}") private String[] fixedProjectManageDetails; @@ -504,10 +506,9 @@ public class ProjectBudgetService { } public ProjectConfigBean getProjectConfigBeanConfig(){ - //TODO 从数据库配置中来 ProjectConfigBean projectConfigBean = new ProjectConfigBean(); - projectConfigBean.setUnderwrittenTaxRate(new BigDecimal("5.66")); - projectConfigBean.setProjectContributionProfitRateThreshold(new BigDecimal("5")); + projectConfigBean.setUnderwrittenTaxRate(sysConfigService.getUnderwrittenTaxRate()); + projectConfigBean.setProjectContributionProfitRateThreshold(sysConfigService.getProjectContributionProfitRateThreshold()); return projectConfigBean; } diff --git a/src/main/java/cn/palmte/work/service/SysConfigService.java b/src/main/java/cn/palmte/work/service/SysConfigService.java index 0696077..6eb4772 100644 --- a/src/main/java/cn/palmte/work/service/SysConfigService.java +++ b/src/main/java/cn/palmte/work/service/SysConfigService.java @@ -6,6 +6,7 @@ import cn.palmte.work.pojo.SysConfigRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.Date; @Service @@ -16,15 +17,21 @@ public class SysConfigService { public void saveOrUpdate(SysConfigRequest sysConfigRequest) { - SysConfig underwrittenTaxRate = sysConfigRepository.findByCodeEquals("underwrittenTaxRate"); + SysConfig underwrittenTaxRate = sysConfigRepository.findByCodeEquals(SysConfig.KEY_UNDERWRITTENTAXRATE); underwrittenTaxRate.setValue(sysConfigRequest.getUnderwrittenTaxRate()); underwrittenTaxRate.setUpdateTime(new Date()); sysConfigRepository.saveAndFlush(underwrittenTaxRate); - SysConfig projectContributionProfitRateThreshold = sysConfigRepository.findByCodeEquals("projectContributionProfitRateThreshold"); + SysConfig projectContributionProfitRateThreshold = sysConfigRepository.findByCodeEquals(SysConfig.KEY_PROJECTCONTRIBUTIONPROFITRATETHRESHOLD); projectContributionProfitRateThreshold.setValue(sysConfigRequest.getProjectContributionProfitRateThreshold()); projectContributionProfitRateThreshold.setUpdateTime(new Date()); sysConfigRepository.saveAndFlush(projectContributionProfitRateThreshold); + } + public BigDecimal getUnderwrittenTaxRate(){ + return new BigDecimal(sysConfigRepository.findByCodeEquals(SysConfig.KEY_UNDERWRITTENTAXRATE).getValue()); + } + public BigDecimal getProjectContributionProfitRateThreshold(){ + return new BigDecimal(sysConfigRepository.findByCodeEquals(SysConfig.KEY_PROJECTCONTRIBUTIONPROFITRATETHRESHOLD).getValue()); } }