mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:ZhangYunTianXia/fourcal

master
White 2022-12-21 10:33:55 +08:00
parent b0f3b089a2 8a45e064c7
commit 4b34695939
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/cn/palmte/work/service/ProjectBudgetService.java
View File

@ -950,8 +950,9 @@ public class ProjectBudgetService {
if (extend == null) { if (extend == null) {
extend = new ProjectExtend(); extend = new ProjectExtend();
extend.setProjectId(p.getId()); extend.setProjectId(p.getId());
extend.setIsBudget(1);
} }
extend.setIsBudget(1);
List<ProjectBudgetPlanDetail> projectBudgetPlanDetails = projectBudgetService.getProjectBudgetPlanDetails(p); List<ProjectBudgetPlanDetail> projectBudgetPlanDetails = projectBudgetService.getProjectBudgetPlanDetails(p);
ProjectUnderwrittenPlanStatisticBean bean = projectBudgetService.getProjectUnderwrittenPlanStatisticBean(projectBudgetPlanDetails); ProjectUnderwrittenPlanStatisticBean bean = projectBudgetService.getProjectUnderwrittenPlanStatisticBean(projectBudgetPlanDetails);
extend.setAdvanceInterestAmount(bean.getCapitalInterest()); extend.setAdvanceInterestAmount(bean.getCapitalInterest());

37
src/main/resources/templates/admin/project_budget_edit.ftl
View File

@ -322,6 +322,43 @@
>${project.calculationCollection!}</textarea> >${project.calculationCollection!}</textarea>
</td> </td>
</tr> </tr>
<tr class="am-text-nowrap">
<th class="table-title" colspan="1" ><span style="font-size: 15px">项目阶段:</span></th>
<td class="table-title" colspan="5" >
<#if project.stage??>
<#if (project.stage) =0>
<input readonly value="S0-概算立项"/>
<#elseif (project.stage) =1>
<input readonly value="S1-项目调研"/>
<#elseif (project.stage) =2>
<input readonly value="S2-方案设计"/>
<#elseif (project.stage) =3>
<input readonly value="S3-预算评估"/>
<#elseif (project.stage) =4>
<input readonly value="S4-招标期"/>
<#elseif (project.stage) =5>
<input readonly value="S5-合同期"/>
<#elseif (project.stage) =6>
<input readonly value="S6-交付期"/>
<#elseif (project.stage) =7>
<input readonly value="S7-结算期"/>
<#elseif (project.stage) =8>
<input readonly value="S8-决算期"/>
<#elseif (project.stage) =9>
<input readonly value="L-项目丢失"/>
</#if>
<#else>
<input readonly value=""/>
</#if>
</td>
</tr>
<tr class="am-text-nowrap">
<th class="table-title" colspan="1" ><span style="font-size: 15px">当前进度描述:</span></th>
<td class="table-title" colspan="5" >
<textarea rows="3" cols="20" style="border-style:none;background-color: white;" disabled="disabled"
>${project.stageRemark!}</textarea>
</td>
</tr>
</table> </table>
</div> </div>
<div class="am-tab-panel am-fade am-in am-active" id="tab2"> <div class="am-tab-panel am-fade am-in am-active" id="tab2">