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

查看处去掉相应字段

master
OathK1per 2021-12-28 15:47:56 +08:00
parent a4fa58e81f
commit a1a21bba25
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/palmte/work/service/ProjectEstimateService.java
View File

@ -264,7 +264,7 @@ public class ProjectEstimateService {
estimateApprove(approveStatusEstimate, projectInDb, admin); estimateApprove(approveStatusEstimate, projectInDb, admin);
} }
public void estimateApprove(Integer approveStatusEstimate, Project projectInDb, Admin admin) { public void estimateApprove(Integer approveStatusEstimate, Project projectInDb, Admin admin) throws Exception {
if(null != approveStatusEstimate && if(null != approveStatusEstimate &&
ApproveStatusEnum.APPROVAL_UNPASS.getApproveStatus() == approveStatusEstimate){ ApproveStatusEnum.APPROVAL_UNPASS.getApproveStatus() == approveStatusEstimate){
//审核不通过的情况下重新编辑后就完成当前任务【此时任务节点在第一个，也就是发起审批】 //审核不通过的情况下重新编辑后就完成当前任务【此时任务节点在第一个，也就是发起审批】

28
src/main/resources/templates/admin/project_approve.ftl
View File

@ -199,20 +199,20 @@
</div> </div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div> <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div> </div>
<div class="am-g am-form-group am-margin-top"> <#-- <div class="am-g am-form-group am-margin-top">-->
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资利息</div> <#-- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资利息</div>-->
<div class="am-u-sm-6 am-u-md-6"> <#-- <div class="am-u-sm-6 am-u-md-6">-->
<span>${Utils.format(project.advanceInterestAmount)}</span>元 <#-- <span>${Utils.format(project.advanceInterestAmount)}</span>元-->
</div> <#-- </div>-->
<div class="am-u-sm-2 am-u-md-4 input-msg"></div> <#-- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>-->
</div> <#-- </div>-->
<div class="am-g am-form-group am-margin-top"> <#-- <div class="am-g am-form-group am-margin-top">-->
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资峰值</div> <#-- <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资峰值</div>-->
<div class="am-u-sm-6 am-u-md-6"> <#-- <div class="am-u-sm-6 am-u-md-6">-->
<span>${Utils.format(project.advancePeakAmount)}</span>元 <#-- <span>${Utils.format(project.advancePeakAmount)}</span>元-->
</div> <#-- </div>-->
<div class="am-u-sm-2 am-u-md-4 input-msg"></div> <#-- <div class="am-u-sm-2 am-u-md-4 input-msg"></div>-->
</div> <#-- </div>-->
<div class="am-g am-form-group am-margin-top"> <div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>合同金额</div> <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>合同金额</div>
<div class="am-u-sm-6 am-u-md-6"> <div class="am-u-sm-6 am-u-md-6">