diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java
index 6f5c3ba..5cce687 100644
--- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java
@@ -515,13 +515,6 @@ public class ProjectBudgetService {
return projectBudgetPlanDetail;
}
- public ProjectConfigBean getProjectConfigBeanConfig(){
- ProjectConfigBean projectConfigBean = new ProjectConfigBean();
- projectConfigBean.setUnderwrittenTaxRate(sysConfigService.getUnderwrittenTaxRate());
- projectConfigBean.setProjectContributionProfitRateThreshold(sysConfigService.getProjectContributionProfitRateThreshold());
- return projectConfigBean;
- }
-
/**
* 根据资金计划获取资金使用统计值
* 月份去峰值月份
diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java
index 16aa346..c1aef7d 100644
--- a/src/main/java/cn/palmte/work/service/ProjectService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectService.java
@@ -27,11 +27,7 @@ public class ProjectService {
@Autowired
private ProjectRepository projectRepository;
@Autowired
- private ProjectEstimateService projectEstimateService;
- @Autowired
- private ProjectBudgetService projectBudgetService;
- @Autowired
- private ProjectInstanceService projectInstanceService;
+ private SysConfigService sysConfigService;
@Autowired
private ActTaskDefService actTaskDefService;
@Autowired
@@ -130,7 +126,7 @@ public class ProjectService {
project.setCreatorId(admin.getId());
project.setCreatorName(admin.getUserName());
- ProjectConfigBean projectConfigBeanConfig = projectBudgetService.getProjectConfigBeanConfig();
+ ProjectConfigBean projectConfigBeanConfig = sysConfigService.getProjectConfigBeanConfig();
project.setProjectContributionProfitRateThreshold(projectConfigBeanConfig.getProjectContributionProfitRateThreshold());
project.setUnderwrittenTaxRate(projectConfigBeanConfig.getUnderwrittenTaxRate());
diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl
index 92c0ec2..33a201c 100644
--- a/src/main/resources/templates/admin/project_list.ftl
+++ b/src/main/resources/templates/admin/project_list.ftl
@@ -202,24 +202,24 @@
<#--<@shiro.hasPermission name="PROJECT_EDIT">-->
<#--概算状态 并且概算审批状态为草稿和不通过-->
<#if list.status==1 && (list.approveStatusEstimate==0 || list.approveStatusEstimate==3)>
+ #if>
- #if>
<#-- @shiro.hasPermission>
<@shiro.hasPermission name="PROJECT_EDIT">-->
<#-- 概算审核通过、预算审批不等于待审核、 结算审批未通过-->
<#if list.approveStatusEstimate=2 && list.approveStatusBudget!=1 && list.approveStatusFinal!=2 >
+ #if>
- #if>
- <#-- @shiro.hasPermission>-->
+ <#-- @shiro.hasPermission>-->
<#-- 预算审核通过 并且结算审核不等于审批状态 决算审批未通过 才可以发起结算-->
<#if list.approveStatusBudget=2 && list.approveStatusSettle !=1 && list.approveStatusFinal !=2>