利率和项目贡献利润率从数据库获取
parent
a14981c34f
commit
c7f54029c9
|
@ -1,5 +1,6 @@
|
||||||
package cn.palmte.work.controller.backend;
|
package cn.palmte.work.controller.backend;
|
||||||
|
|
||||||
|
import cn.palmte.work.model.SysConfig;
|
||||||
import cn.palmte.work.model.SysConfigRepository;
|
import cn.palmte.work.model.SysConfigRepository;
|
||||||
import cn.palmte.work.pojo.SysConfigRequest;
|
import cn.palmte.work.pojo.SysConfigRequest;
|
||||||
import cn.palmte.work.service.SysConfigService;
|
import cn.palmte.work.service.SysConfigService;
|
||||||
|
@ -22,8 +23,8 @@ public class SysConfigController extends BaseController{
|
||||||
|
|
||||||
@RequestMapping("/edit")
|
@RequestMapping("/edit")
|
||||||
public String edit(Map<String, Object> model) {
|
public String edit(Map<String, Object> model) {
|
||||||
model.put("underwrittenTaxRate",sysConfigRepository.findByCodeEquals("underwrittenTaxRate").getValue());
|
model.put(SysConfig.KEY_UNDERWRITTENTAXRATE,sysConfigRepository.findByCodeEquals(SysConfig.KEY_UNDERWRITTENTAXRATE).getValue());
|
||||||
model.put("projectContributionProfitRateThreshold",sysConfigRepository.findByCodeEquals("projectContributionProfitRateThreshold").getValue());
|
model.put(SysConfig.KEY_PROJECTCONTRIBUTIONPROFITRATETHRESHOLD,sysConfigRepository.findByCodeEquals(SysConfig.KEY_PROJECTCONTRIBUTIONPROFITRATETHRESHOLD).getValue());
|
||||||
return "admin/profit_marfin_config_input";
|
return "admin/profit_marfin_config_input";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,14 @@ import java.util.Date;
|
||||||
@Table(name = "sys_config")
|
@Table(name = "sys_config")
|
||||||
public class SysConfig {
|
public class SysConfig {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 资金利率
|
||||||
|
*/
|
||||||
|
public static final String KEY_UNDERWRITTENTAXRATE = "underwrittenTaxRate";
|
||||||
|
/**
|
||||||
|
* 项目贡献利润率阀值
|
||||||
|
*/
|
||||||
|
public static final String KEY_PROJECTCONTRIBUTIONPROFITRATETHRESHOLD = "projectContributionProfitRateThreshold";
|
||||||
/**
|
/**
|
||||||
* id
|
* id
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -35,6 +35,8 @@ public class ProjectBudgetService {
|
||||||
private ProjectBudgetCostProjectManageDetailRepository projectBudgetCostProjectManageDetailRepository;
|
private ProjectBudgetCostProjectManageDetailRepository projectBudgetCostProjectManageDetailRepository;
|
||||||
@Autowired
|
@Autowired
|
||||||
private ProjectBudgetPlanDetailRepository projectBudgetPlanDetailRepository;
|
private ProjectBudgetPlanDetailRepository projectBudgetPlanDetailRepository;
|
||||||
|
@Autowired
|
||||||
|
private SysConfigService sysConfigService;
|
||||||
|
|
||||||
@Value("#{'${fourcal.fixedprojectmanagedetails}'.split('\\|')}")
|
@Value("#{'${fourcal.fixedprojectmanagedetails}'.split('\\|')}")
|
||||||
private String[] fixedProjectManageDetails;
|
private String[] fixedProjectManageDetails;
|
||||||
|
@ -504,10 +506,9 @@ public class ProjectBudgetService {
|
||||||
}
|
}
|
||||||
|
|
||||||
public ProjectConfigBean getProjectConfigBeanConfig(){
|
public ProjectConfigBean getProjectConfigBeanConfig(){
|
||||||
//TODO 从数据库配置中来
|
|
||||||
ProjectConfigBean projectConfigBean = new ProjectConfigBean();
|
ProjectConfigBean projectConfigBean = new ProjectConfigBean();
|
||||||
projectConfigBean.setUnderwrittenTaxRate(new BigDecimal("5.66"));
|
projectConfigBean.setUnderwrittenTaxRate(sysConfigService.getUnderwrittenTaxRate());
|
||||||
projectConfigBean.setProjectContributionProfitRateThreshold(new BigDecimal("5"));
|
projectConfigBean.setProjectContributionProfitRateThreshold(sysConfigService.getProjectContributionProfitRateThreshold());
|
||||||
return projectConfigBean;
|
return projectConfigBean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,7 @@ import cn.palmte.work.pojo.SysConfigRequest;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
|
@ -16,15 +17,21 @@ public class SysConfigService {
|
||||||
|
|
||||||
|
|
||||||
public void saveOrUpdate(SysConfigRequest sysConfigRequest) {
|
public void saveOrUpdate(SysConfigRequest sysConfigRequest) {
|
||||||
SysConfig underwrittenTaxRate = sysConfigRepository.findByCodeEquals("underwrittenTaxRate");
|
SysConfig underwrittenTaxRate = sysConfigRepository.findByCodeEquals(SysConfig.KEY_UNDERWRITTENTAXRATE);
|
||||||
underwrittenTaxRate.setValue(sysConfigRequest.getUnderwrittenTaxRate());
|
underwrittenTaxRate.setValue(sysConfigRequest.getUnderwrittenTaxRate());
|
||||||
underwrittenTaxRate.setUpdateTime(new Date());
|
underwrittenTaxRate.setUpdateTime(new Date());
|
||||||
sysConfigRepository.saveAndFlush(underwrittenTaxRate);
|
sysConfigRepository.saveAndFlush(underwrittenTaxRate);
|
||||||
|
|
||||||
SysConfig projectContributionProfitRateThreshold = sysConfigRepository.findByCodeEquals("projectContributionProfitRateThreshold");
|
SysConfig projectContributionProfitRateThreshold = sysConfigRepository.findByCodeEquals(SysConfig.KEY_PROJECTCONTRIBUTIONPROFITRATETHRESHOLD);
|
||||||
projectContributionProfitRateThreshold.setValue(sysConfigRequest.getProjectContributionProfitRateThreshold());
|
projectContributionProfitRateThreshold.setValue(sysConfigRequest.getProjectContributionProfitRateThreshold());
|
||||||
projectContributionProfitRateThreshold.setUpdateTime(new Date());
|
projectContributionProfitRateThreshold.setUpdateTime(new Date());
|
||||||
sysConfigRepository.saveAndFlush(projectContributionProfitRateThreshold);
|
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());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue