Merge remote-tracking branch 'origin/master'
xxssyyyyssxx
commit
45bf72be14
|
|
@ -1,12 +1,15 @@
|
|||
package cn.palmte.work.controller.backend;
|
||||
|
||||
import cn.palmte.work.bean.ResponseMsg;
|
||||
import cn.palmte.work.model.SysConfig;
|
||||
import cn.palmte.work.model.SysConfigRepository;
|
||||
import cn.palmte.work.pojo.SysConfigRequest;
|
||||
import cn.palmte.work.service.SysConfigService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
|
|
@ -28,10 +31,10 @@ public class SysConfigController extends BaseController{
|
|||
return "admin/profit_marfin_config_input";
|
||||
}
|
||||
|
||||
@ResponseBody
|
||||
@RequestMapping("/save")
|
||||
public String save(SysConfigRequest sysConfigRequest, Map<String, Object> model) {
|
||||
sysConfigService.saveOrUpdate(sysConfigRequest);
|
||||
return "redirect:/sys/config/edit";
|
||||
public ResponseMsg save(@RequestBody String json) {
|
||||
return sysConfigService.saveOrUpdate(json);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,27 +52,32 @@ public class ProjectFinalSevice {
|
|||
@Autowired
|
||||
private ProjectInstanceService projectInstanceService;
|
||||
|
||||
@Autowired
|
||||
private ProjectSettleService projectSettleService;
|
||||
|
||||
@Transactional
|
||||
public void save(Project project, FinalBean finalBean) {
|
||||
//预算表数据
|
||||
EstimateBean estimate = projectEstimateService.getEstimate(project);
|
||||
//概算表数据
|
||||
BudgetBean budget = projectBudgetService.getBudget(project);
|
||||
|
||||
FormerBean settle = projectSettleService.getCurrentSettle(project, null);
|
||||
//现金流量表数据
|
||||
List<ProjectBudgetPlanDetail> projectBudgetPlanDetails = projectBudgetService.getProjectBudgetPlanDetails(project);
|
||||
CashFlowBean cashFlowBean = projectBudgetService.getCashFlowBean(project, projectBudgetPlanDetails);
|
||||
|
||||
//保存项目决算收入信息
|
||||
saveProjectFinalIncome(project,finalBean,estimate,budget);
|
||||
saveProjectFinalIncome(project,finalBean,estimate,budget,settle);
|
||||
|
||||
//保存项目决算成本信息
|
||||
saveProjectFinalCost(project,finalBean,estimate,budget);
|
||||
saveProjectFinalCost(project,finalBean,estimate,budget,settle);
|
||||
|
||||
//保存项目结算管理成本信息
|
||||
saveProjectFinalCostManage(project,finalBean,estimate,budget);
|
||||
saveProjectFinalCostManage(project,finalBean,estimate,budget,settle);
|
||||
|
||||
//保存项目结算现金流量信息
|
||||
saveProjectFinalCashFlux(project,finalBean,cashFlowBean);
|
||||
saveProjectFinalCashFlux(project,finalBean,cashFlowBean,settle);
|
||||
|
||||
projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.FINAL_ACCOUNTS, ApproveStatusEnum.APPROVAL_UNCOMMIT);
|
||||
|
||||
|
|
@ -80,6 +85,7 @@ public class ProjectFinalSevice {
|
|||
|
||||
@Transactional
|
||||
public void saveAndApprove(Project project, FinalBean finalBean) throws Exception {
|
||||
FormerBean settle = projectSettleService.getCurrentSettle(project, null);
|
||||
//预算表数据
|
||||
EstimateBean estimate = projectEstimateService.getEstimate(project);
|
||||
//概算表数据
|
||||
|
|
@ -89,16 +95,16 @@ public class ProjectFinalSevice {
|
|||
CashFlowBean cashFlowBean = projectBudgetService.getCashFlowBean(project, projectBudgetPlanDetails);
|
||||
|
||||
//保存项目决算收入信息
|
||||
saveProjectFinalIncome(project,finalBean,estimate,budget);
|
||||
saveProjectFinalIncome(project,finalBean,estimate,budget,settle);
|
||||
|
||||
//保存项目决算成本信息
|
||||
saveProjectFinalCost(project,finalBean,estimate,budget);
|
||||
saveProjectFinalCost(project,finalBean,estimate,budget,settle);
|
||||
|
||||
//保存项目结算管理成本信息
|
||||
saveProjectFinalCostManage(project,finalBean,estimate,budget);
|
||||
saveProjectFinalCostManage(project,finalBean,estimate,budget,settle);
|
||||
|
||||
//保存项目结算现金流量信息
|
||||
saveProjectFinalCashFlux(project,finalBean,cashFlowBean);
|
||||
saveProjectFinalCashFlux(project,finalBean,cashFlowBean,settle);
|
||||
|
||||
//更新项目和审批状态
|
||||
projectService.updateStatusAndApproveStatus(project.getId(), StatusEnum.FINAL_ACCOUNTS, ApproveStatusEnum.APPROVAL_PENDING);
|
||||
|
|
@ -107,13 +113,13 @@ public class ProjectFinalSevice {
|
|||
|
||||
}
|
||||
|
||||
public void saveProjectFinalCostManage(Project project, FinalBean finalBean,EstimateBean estimate,BudgetBean budget){
|
||||
public void saveProjectFinalCostManage(Project project, FinalBean finalBean,EstimateBean estimate,BudgetBean budget,FormerBean settle){
|
||||
ProjectFinalCostManage expropriationManage = new ProjectFinalCostManage();
|
||||
expropriationManage.setProjectId(project.getId());
|
||||
expropriationManage.setType(ProjectFinalCostManage.TYPE_EXPROPRIATION);
|
||||
expropriationManage.setEstimateTotalManageCost(estimate.getCostExpropriationTaxExclude());
|
||||
expropriationManage.setBudgetTotalManageCost(budget.getCostExpropriationTaxExclude());
|
||||
expropriationManage.setSettleTotalManageCost(new BigDecimal(0));
|
||||
expropriationManage.setSettleTotalManageCost(settle.getCostExpropriationTaxExclude());
|
||||
expropriationManage.setFinalTotalManageCost(finalBean.getCostExpropriationFinalTotal());
|
||||
projectFinalCostManageRepository.saveAndFlush(expropriationManage);
|
||||
|
||||
|
|
@ -122,7 +128,7 @@ public class ProjectFinalSevice {
|
|||
companyManage.setType(ProjectFinalCostManage.TYPE_COMPANY_MANAGE);
|
||||
companyManage.setEstimateTotalManageCost(estimate.getCostCompanyManageTaxExclude());
|
||||
companyManage.setBudgetTotalManageCost(budget.getCostCompanyManageTaxExclude());
|
||||
companyManage.setSettleTotalManageCost(new BigDecimal(0));
|
||||
companyManage.setSettleTotalManageCost(settle.getCostCompanyManageTaxExclude());
|
||||
companyManage.setFinalTotalManageCost(finalBean.getCostCompanyManageFinalTotal());
|
||||
projectFinalCostManageRepository.saveAndFlush(companyManage);
|
||||
|
||||
|
|
@ -135,13 +141,13 @@ public class ProjectFinalSevice {
|
|||
|
||||
}
|
||||
|
||||
private void saveProjectFinalIncome(Project project, FinalBean finalBean,EstimateBean estimate,BudgetBean budget) {
|
||||
private void saveProjectFinalIncome(Project project, FinalBean finalBean,EstimateBean estimate,BudgetBean budget,FormerBean settle) {
|
||||
ProjectFinalIncome projectFinalIncomeDevice = new ProjectFinalIncome();
|
||||
projectFinalIncomeDevice.setProjectId(project.getId());
|
||||
projectFinalIncomeDevice.setType(ProjectFinalIncome.TYPE_DEVICE);
|
||||
projectFinalIncomeDevice.setEstimateTotalIncome(estimate.getIncomeDeviceTaxExclude());
|
||||
projectFinalIncomeDevice.setBudgetTotalIncome(budget.getIncomeDeviceTaxExclude());
|
||||
projectFinalIncomeDevice.setSettleTotalIncome(new BigDecimal(0));
|
||||
projectFinalIncomeDevice.setSettleTotalIncome(settle.getIncomeDeviceTaxExclude());
|
||||
projectFinalIncomeDevice.setFinalTotalIncome(finalBean.getIncomeDeviceFinalTotal());
|
||||
projectFinalIncomeReposiry.saveAndFlush(projectFinalIncomeDevice);
|
||||
|
||||
|
|
@ -150,7 +156,7 @@ public class ProjectFinalSevice {
|
|||
projectFinalIncomeEngineer.setType(ProjectFinalIncome.TYPE_ENGINEER);
|
||||
projectFinalIncomeEngineer.setEstimateTotalIncome(estimate.getIncomeEngineerTaxExclude());
|
||||
projectFinalIncomeEngineer.setBudgetTotalIncome(budget.getIncomeEngineerTaxExclude());
|
||||
projectFinalIncomeEngineer.setSettleTotalIncome(new BigDecimal(0));
|
||||
projectFinalIncomeEngineer.setSettleTotalIncome(settle.getIncomeEngineerTaxExclude());
|
||||
projectFinalIncomeEngineer.setFinalTotalIncome(finalBean.getIncomeEngineerFinalTotal());
|
||||
projectFinalIncomeReposiry.saveAndFlush(projectFinalIncomeEngineer);
|
||||
|
||||
|
|
@ -159,19 +165,19 @@ public class ProjectFinalSevice {
|
|||
projectFinalIncomeService.setType(ProjectFinalIncome.TYPE_SERVICE);
|
||||
projectFinalIncomeService.setEstimateTotalIncome(estimate.getIncomeServiceTaxExclude());
|
||||
projectFinalIncomeService.setBudgetTotalIncome(budget.getIncomeServiceTaxExclude());
|
||||
projectFinalIncomeService.setSettleTotalIncome(new BigDecimal(0));
|
||||
projectFinalIncomeService.setSettleTotalIncome(settle.getIncomeServiceTaxExclude());
|
||||
projectFinalIncomeService.setFinalTotalIncome(finalBean.getIncomeServiceFinalTotal());
|
||||
projectFinalIncomeReposiry.saveAndFlush(projectFinalIncomeService);
|
||||
}
|
||||
|
||||
public void saveProjectFinalCost(Project project, FinalBean finalBean,EstimateBean estimate,BudgetBean budget){
|
||||
public void saveProjectFinalCost(Project project, FinalBean finalBean,EstimateBean estimate,BudgetBean budget,FormerBean settle){
|
||||
ProjectFinalCost projectFinalCostDevice = new ProjectFinalCost();
|
||||
projectFinalCostDevice.setProjectId(project.getId());
|
||||
projectFinalCostDevice.setFee(ProjectFinalCost.FEE_PURCHASE);
|
||||
projectFinalCostDevice.setType(ProjectFinalCost.TYPE_DEVICE);
|
||||
projectFinalCostDevice.setEstimateTotalCost(estimate.getCostPurchaseDeviceTaxExclude());
|
||||
projectFinalCostDevice.setBudgetTotalCost(budget.getCostPurchaseDeviceTaxExclude());
|
||||
projectFinalCostDevice.setSettleTotalCost(new BigDecimal(0));
|
||||
projectFinalCostDevice.setSettleTotalCost(settle.getCostPurchaseDeviceTaxExclude());
|
||||
projectFinalCostDevice.setFinalTotalCost(finalBean.getCostPurchaseDeviceFinalTotal());
|
||||
projectFinalCostRepository.saveAndFlush(projectFinalCostDevice);
|
||||
|
||||
|
|
@ -182,7 +188,7 @@ public class ProjectFinalSevice {
|
|||
projectFinalCostBuild.setType(ProjectFinalCost.TYPE_BUILDING);
|
||||
projectFinalCostBuild.setEstimateTotalCost(estimate.getCostPurchaseBuildTaxExclude());
|
||||
projectFinalCostBuild.setBudgetTotalCost(budget.getCostPurchaseBuildTaxExclude());
|
||||
projectFinalCostBuild.setSettleTotalCost(new BigDecimal(0));
|
||||
projectFinalCostBuild.setSettleTotalCost(settle.getCostPurchaseBuildTaxExclude());
|
||||
projectFinalCostBuild.setFinalTotalCost(finalBean.getCostPurchaseBuildFinalTotal());
|
||||
projectFinalCostRepository.saveAndFlush(projectFinalCostBuild);
|
||||
|
||||
|
|
@ -192,7 +198,7 @@ public class ProjectFinalSevice {
|
|||
projectFinalCostService.setType(ProjectFinalCost.TYPE_SERVICE);
|
||||
projectFinalCostService.setEstimateTotalCost(estimate.getCostPurchaseServiceTaxExclude());
|
||||
projectFinalCostService.setBudgetTotalCost(budget.getCostPurchaseServiceTaxExclude());
|
||||
projectFinalCostService.setSettleTotalCost(new BigDecimal(0));
|
||||
projectFinalCostService.setSettleTotalCost(settle.getCostPurchaseServiceTaxExclude());
|
||||
projectFinalCostService.setFinalTotalCost(finalBean.getCostPurchaseServiceFinalTotal());
|
||||
projectFinalCostRepository.saveAndFlush(projectFinalCostService);
|
||||
|
||||
|
|
@ -202,7 +208,7 @@ public class ProjectFinalSevice {
|
|||
projectFinalCostOther.setType(ProjectFinalCost.TYPE_OTHER);
|
||||
projectFinalCostOther.setEstimateTotalCost(estimate.getCostPurchaseOtherTaxExclude());
|
||||
projectFinalCostOther.setBudgetTotalCost(budget.getCostPurchaseOtherTaxExclude());
|
||||
projectFinalCostOther.setSettleTotalCost(new BigDecimal(0));
|
||||
projectFinalCostOther.setSettleTotalCost(settle.getCostPurchaseOtherTaxExclude());
|
||||
projectFinalCostOther.setFinalTotalCost(finalBean.getCostPurchaseOtherFinalTotal());
|
||||
projectFinalCostRepository.saveAndFlush(projectFinalCostOther);
|
||||
|
||||
|
|
@ -212,7 +218,7 @@ public class ProjectFinalSevice {
|
|||
projectFinalCostProject.setType(ProjectFinalCost.TYPE_PROJECT_MANAGE);
|
||||
projectFinalCostProject.setEstimateTotalCost(estimate.getCostProjectManageTaxExclude());
|
||||
projectFinalCostProject.setBudgetTotalCost(budget.getCostProjectManageTaxExclude());
|
||||
projectFinalCostProject.setSettleTotalCost(new BigDecimal(0));
|
||||
projectFinalCostProject.setSettleTotalCost(settle.getCostProjectManageTaxExclude());
|
||||
projectFinalCostProject.setFinalTotalCost(finalBean.getCostProjectManageFinalTotal());
|
||||
projectFinalCostRepository.saveAndFlush(projectFinalCostProject);
|
||||
|
||||
|
|
@ -222,19 +228,19 @@ public class ProjectFinalSevice {
|
|||
projectFinalCostOtherOther.setType(ProjectFinalCost.TYPE_OTHER_OTHER);
|
||||
projectFinalCostOtherOther.setEstimateTotalCost(estimate.getCostOtherOtherTaxExclude());
|
||||
projectFinalCostOtherOther.setBudgetTotalCost(budget.getCostOtherOtherTaxExclude());
|
||||
projectFinalCostOtherOther.setSettleTotalCost(new BigDecimal(0));
|
||||
projectFinalCostOtherOther.setSettleTotalCost(settle.getCostOtherOtherTaxExclude());
|
||||
projectFinalCostOtherOther.setFinalTotalCost(finalBean.getCostOtherFinalTotal());
|
||||
projectFinalCostRepository.saveAndFlush(projectFinalCostOtherOther);
|
||||
}
|
||||
|
||||
public void saveProjectFinalCashFlux(Project project, FinalBean finalBean, CashFlowBean cashFlowBean) {
|
||||
public void saveProjectFinalCashFlux(Project project, FinalBean finalBean, CashFlowBean cashFlowBean,FormerBean settle) {
|
||||
List<ProjectFinalCashFlux> list = new ArrayList<>();
|
||||
|
||||
ProjectFinalCashFlux projectFinalCashFlux1 = new ProjectFinalCashFlux();
|
||||
projectFinalCashFlux1.setProjectId(project.getId());
|
||||
projectFinalCashFlux1.setType(ProjectFinalCashFlux.TYPE1);
|
||||
projectFinalCashFlux1.setBudgetTotalCashFlux(cashFlowBean.getSaleIncomeCash());
|
||||
projectFinalCashFlux1.setFinalTotalCashFlux(new BigDecimal(0));
|
||||
projectFinalCashFlux1.setSettleTotalCashFlux(settle.getSaleIncomeCash());
|
||||
projectFinalCashFlux1.setFinalTotalCashFlux(finalBean.getSaleIncomeCash());
|
||||
projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux1);
|
||||
|
||||
|
|
@ -242,7 +248,7 @@ public class ProjectFinalSevice {
|
|||
projectFinalCashFlux2.setProjectId(project.getId());
|
||||
projectFinalCashFlux2.setType(ProjectFinalCashFlux.TYPE2);
|
||||
projectFinalCashFlux2.setBudgetTotalCashFlux(cashFlowBean.getTaxReturn());
|
||||
projectFinalCashFlux2.setFinalTotalCashFlux(new BigDecimal(0));
|
||||
projectFinalCashFlux2.setSettleTotalCashFlux(settle.getTaxReturn());
|
||||
projectFinalCashFlux2.setFinalTotalCashFlux(finalBean.getTaxReturn());
|
||||
projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux2);
|
||||
|
||||
|
|
@ -250,7 +256,7 @@ public class ProjectFinalSevice {
|
|||
projectFinalCashFlux3.setProjectId(project.getId());
|
||||
projectFinalCashFlux3.setType(ProjectFinalCashFlux.TYPE3);
|
||||
projectFinalCashFlux3.setBudgetTotalCashFlux(cashFlowBean.getEarnestMoneyIncome());
|
||||
projectFinalCashFlux3.setFinalTotalCashFlux(new BigDecimal(0));
|
||||
projectFinalCashFlux3.setSettleTotalCashFlux(settle.getEarnestMoneyIncome());
|
||||
projectFinalCashFlux3.setFinalTotalCashFlux(finalBean.getEarnestMoneyIncome());
|
||||
projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux3);
|
||||
|
||||
|
|
@ -258,7 +264,7 @@ public class ProjectFinalSevice {
|
|||
projectFinalCashFlux4.setProjectId(project.getId());
|
||||
projectFinalCashFlux4.setType(ProjectFinalCashFlux.TYPE4);
|
||||
projectFinalCashFlux4.setBudgetTotalCashFlux(cashFlowBean.getPurchaseCost());
|
||||
projectFinalCashFlux4.setFinalTotalCashFlux(new BigDecimal(0));
|
||||
projectFinalCashFlux4.setSettleTotalCashFlux(settle.getPurchaseCost());
|
||||
projectFinalCashFlux4.setFinalTotalCashFlux(finalBean.getPurchaseCost());
|
||||
projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux4);
|
||||
|
||||
|
|
@ -266,7 +272,7 @@ public class ProjectFinalSevice {
|
|||
projectFinalCashFlux5.setProjectId(project.getId());
|
||||
projectFinalCashFlux5.setType(ProjectFinalCashFlux.TYPE5);
|
||||
projectFinalCashFlux5.setBudgetTotalCashFlux(cashFlowBean.getTaxCost());
|
||||
projectFinalCashFlux5.setFinalTotalCashFlux(new BigDecimal(0));
|
||||
projectFinalCashFlux5.setSettleTotalCashFlux(settle.getTaxCost());
|
||||
projectFinalCashFlux5.setFinalTotalCashFlux(finalBean.getTaxCost());
|
||||
projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux5);
|
||||
|
||||
|
|
@ -274,7 +280,7 @@ public class ProjectFinalSevice {
|
|||
projectFinalCashFlux6.setProjectId(project.getId());
|
||||
projectFinalCashFlux6.setType(ProjectFinalCashFlux.TYPE6);
|
||||
projectFinalCashFlux6.setBudgetTotalCashFlux(cashFlowBean.getEarnestMoneyCost());
|
||||
projectFinalCashFlux6.setFinalTotalCashFlux(new BigDecimal(0));
|
||||
projectFinalCashFlux6.setSettleTotalCashFlux(settle.getEarnestMoneyCost());
|
||||
projectFinalCashFlux6.setFinalTotalCashFlux(finalBean.getEarnestMoneyCost());
|
||||
projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux6);
|
||||
|
||||
|
|
@ -282,7 +288,7 @@ public class ProjectFinalSevice {
|
|||
projectFinalCashFlux7.setProjectId(project.getId());
|
||||
projectFinalCashFlux7.setType(ProjectFinalCashFlux.TYPE7);
|
||||
projectFinalCashFlux7.setBudgetTotalCashFlux(cashFlowBean.getNetCashFlow());
|
||||
projectFinalCashFlux7.setFinalTotalCashFlux(new BigDecimal(0));
|
||||
projectFinalCashFlux7.setSettleTotalCashFlux(settle.getNetCashFlow());
|
||||
projectFinalCashFlux7.setFinalTotalCashFlux(finalBean.getNetCashFlow());
|
||||
projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux7);
|
||||
|
||||
|
|
@ -290,7 +296,7 @@ public class ProjectFinalSevice {
|
|||
projectFinalCashFlux8.setProjectId(project.getId());
|
||||
projectFinalCashFlux8.setType(ProjectFinalCashFlux.TYPE8);
|
||||
projectFinalCashFlux8.setBudgetTotalCashFlux(cashFlowBean.getCashInflowFromInvestingActivities());
|
||||
projectFinalCashFlux8.setFinalTotalCashFlux(new BigDecimal(0));
|
||||
projectFinalCashFlux8.setSettleTotalCashFlux(settle.getCashInflowFromInvestingActivities());
|
||||
projectFinalCashFlux8.setFinalTotalCashFlux(finalBean.getCashInflowFromInvestingActivities());
|
||||
projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux8);
|
||||
|
||||
|
|
@ -298,7 +304,7 @@ public class ProjectFinalSevice {
|
|||
projectFinalCashFlux9.setProjectId(project.getId());
|
||||
projectFinalCashFlux9.setType(ProjectFinalCashFlux.TYPE9);
|
||||
projectFinalCashFlux9.setBudgetTotalCashFlux(cashFlowBean.getCashOutflowFromInvestingActivities());
|
||||
projectFinalCashFlux9.setFinalTotalCashFlux(new BigDecimal(0));
|
||||
projectFinalCashFlux9.setSettleTotalCashFlux(settle.getCashOutflowFromInvestingActivities());
|
||||
projectFinalCashFlux9.setFinalTotalCashFlux(finalBean.getCashOutflowFromInvestingActivities());
|
||||
projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux9);
|
||||
|
||||
|
|
@ -306,7 +312,7 @@ public class ProjectFinalSevice {
|
|||
projectFinalCashFlux10.setProjectId(project.getId());
|
||||
projectFinalCashFlux10.setType(ProjectFinalCashFlux.TYPE10);
|
||||
projectFinalCashFlux10.setBudgetTotalCashFlux(cashFlowBean.getNetCashFromInvestingActivities());
|
||||
projectFinalCashFlux10.setFinalTotalCashFlux(new BigDecimal(0));
|
||||
projectFinalCashFlux10.setSettleTotalCashFlux(settle.getNetCashFromInvestingActivities());
|
||||
projectFinalCashFlux10.setFinalTotalCashFlux(finalBean.getNetCashFromInvestingActivities());
|
||||
projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux10);
|
||||
|
||||
|
|
@ -314,7 +320,7 @@ public class ProjectFinalSevice {
|
|||
projectFinalCashFlux11.setProjectId(project.getId());
|
||||
projectFinalCashFlux11.setType(ProjectFinalCashFlux.TYPE11);
|
||||
projectFinalCashFlux11.setBudgetTotalCashFlux(cashFlowBean.getFinancingCapitalInflow());
|
||||
projectFinalCashFlux11.setFinalTotalCashFlux(new BigDecimal(0));
|
||||
projectFinalCashFlux11.setSettleTotalCashFlux(settle.getFinancingCapitalInflow());
|
||||
projectFinalCashFlux11.setFinalTotalCashFlux(finalBean.getFinancingCapitalInflow());
|
||||
projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux11);
|
||||
|
||||
|
|
@ -322,7 +328,7 @@ public class ProjectFinalSevice {
|
|||
projectFinalCashFlux12.setProjectId(project.getId());
|
||||
projectFinalCashFlux12.setType(ProjectFinalCashFlux.TYPE12);
|
||||
projectFinalCashFlux12.setBudgetTotalCashFlux(cashFlowBean.getFinancingCapitalOutflow());
|
||||
projectFinalCashFlux12.setFinalTotalCashFlux(new BigDecimal(0));
|
||||
projectFinalCashFlux12.setSettleTotalCashFlux(settle.getFinancingCapitalOutflow());
|
||||
projectFinalCashFlux12.setFinalTotalCashFlux(finalBean.getFinancingCapitalOutflow());
|
||||
projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux12);
|
||||
|
||||
|
|
@ -330,7 +336,7 @@ public class ProjectFinalSevice {
|
|||
projectFinalCashFlux13.setProjectId(project.getId());
|
||||
projectFinalCashFlux13.setType(ProjectFinalCashFlux.TYPE13);
|
||||
projectFinalCashFlux13.setBudgetTotalCashFlux(cashFlowBean.getFinancingCapitalCashflow());
|
||||
projectFinalCashFlux13.setFinalTotalCashFlux(new BigDecimal(0));
|
||||
projectFinalCashFlux13.setSettleTotalCashFlux(settle.getFinancingCapitalCashflow());
|
||||
projectFinalCashFlux13.setFinalTotalCashFlux(finalBean.getFinancingCapitalCashflow());
|
||||
projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux13);
|
||||
|
||||
|
|
@ -338,7 +344,7 @@ public class ProjectFinalSevice {
|
|||
projectFinalCashFlux14.setProjectId(project.getId());
|
||||
projectFinalCashFlux14.setType(ProjectFinalCashFlux.TYPE14);
|
||||
projectFinalCashFlux14.setBudgetTotalCashFlux(cashFlowBean.getNetIncreaseMonetaryFunds());
|
||||
projectFinalCashFlux14.setFinalTotalCashFlux(new BigDecimal(0));
|
||||
projectFinalCashFlux14.setSettleTotalCashFlux(settle.getNetIncreaseMonetaryFunds());
|
||||
projectFinalCashFlux14.setFinalTotalCashFlux(finalBean.getNetIncreaseMonetaryFunds());
|
||||
projectFinalCashFluxRepository.saveAndFlush(projectFinalCashFlux14);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,12 @@
|
|||
package cn.palmte.work.service;
|
||||
|
||||
import cn.palmte.work.bean.ProjectConfigBean;
|
||||
import cn.palmte.work.bean.ResponseMsg;
|
||||
import cn.palmte.work.model.SysConfig;
|
||||
import cn.palmte.work.model.SysConfigRepository;
|
||||
import cn.palmte.work.pojo.SysConfigRequest;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
|
|
@ -17,16 +20,18 @@ public class SysConfigService {
|
|||
private SysConfigRepository sysConfigRepository;
|
||||
|
||||
|
||||
public void saveOrUpdate(SysConfigRequest sysConfigRequest) {
|
||||
public ResponseMsg saveOrUpdate(String json) {
|
||||
JSONObject obj = JSON.parseObject(json);
|
||||
SysConfig underwrittenTaxRate = sysConfigRepository.findByCodeEquals(SysConfig.KEY_UNDERWRITTENTAXRATE);
|
||||
underwrittenTaxRate.setValue(sysConfigRequest.getUnderwrittenTaxRate());
|
||||
underwrittenTaxRate.setValue(obj.getString("underwrittenTaxRate"));
|
||||
underwrittenTaxRate.setUpdateTime(new Date());
|
||||
sysConfigRepository.saveAndFlush(underwrittenTaxRate);
|
||||
|
||||
SysConfig projectContributionProfitRateThreshold = sysConfigRepository.findByCodeEquals(SysConfig.KEY_PROJECTCONTRIBUTIONPROFITRATETHRESHOLD);
|
||||
projectContributionProfitRateThreshold.setValue(sysConfigRequest.getProjectContributionProfitRateThreshold());
|
||||
projectContributionProfitRateThreshold.setValue(obj.getString("projectContributionProfitRateThreshold"));
|
||||
projectContributionProfitRateThreshold.setUpdateTime(new Date());
|
||||
sysConfigRepository.saveAndFlush(projectContributionProfitRateThreshold);
|
||||
return ResponseMsg.buildSuccessMsg("配置成功");
|
||||
}
|
||||
|
||||
public BigDecimal getUnderwrittenTaxRate(){
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
|
||||
<!--选项卡（tabs）end-->
|
||||
<div class="am-margin">
|
||||
<button type="submit" class="am-btn am-btn-primary am-btn-xs">提交保存</button>
|
||||
<button type="button" class="am-btn am-btn-primary am-btn-xs" onclick="submit_function()">提交保存</button>
|
||||
<#--<button type="button" class="am-btn am-btn-warning am-btn-xs"
|
||||
onclick="javascript:history.go(-1);">返回上一级
|
||||
</button>-->
|
||||
|
|
@ -74,6 +74,31 @@
|
|||
var urlBase = "${base}";
|
||||
var url;
|
||||
|
||||
var submit_function = function () {
|
||||
var projectContributionProfitRateThreshold = $("#projectContributionProfitRateThreshold").val();
|
||||
var underwrittenTaxRate = $("#underwrittenTaxRate").val();
|
||||
var params = {
|
||||
projectContributionProfitRateThreshold: projectContributionProfitRateThreshold,
|
||||
underwrittenTaxRate: underwrittenTaxRate
|
||||
};
|
||||
$.ajax({
|
||||
url: '${base}/sys/config/save',
|
||||
data: JSON.stringify(params),
|
||||
dataType: "json",
|
||||
contentType: "application/json",
|
||||
type: 'post',
|
||||
async: false,
|
||||
success: function (data) {
|
||||
if (data.status == 0) {
|
||||
alert("配置成功");
|
||||
window.location.href = window.location.href;
|
||||
} else if (data.status == 1) {
|
||||
alert("配置失败");
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
$(function () {
|
||||
/*表单验证：begin*/
|
||||
//自定义规则，用法：验证元素上加class="js-pattern-sort"
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<div class="am-fl am-cf"><strong class="am-text-primary am-text-lg">项目决算表</strong> / <small>${project.name}</small></div>
|
||||
</div>
|
||||
|
||||
<form method="post" class="am-form" id="pmsForm" action="${base}/project/budgetEditSave">
|
||||
<form method="post" class="am-form" id="pmsForm" action="${base}/project/budgetEditSave" data-am-validator>
|
||||
<!--选项卡（tabs）begin-->
|
||||
<div class="am-tabs am-margin" data-am-tabs>
|
||||
<ul class="am-tabs-nav am-nav am-nav-tabs">
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
<td><input name="incomeDeviceTaxExclude" type="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类概算总额"></td>
|
||||
<td><input name="incomeDeviceTaxExclude" type="number" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类结算总额"></td>
|
||||
<td><input name="incomeDeviceFinalTotal" type="number" required title="设备类决算总额"></td>
|
||||
<td><input name="incomeDeviceFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" required title="设备类决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>收入</td>
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
<td><input name="incomeEngineerTaxExclude" type="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类概算总额"></td>
|
||||
<td><input name="incomeEngineerTaxExclude" type="number" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类结算总额"></td>
|
||||
<td><input name="incomeEngineerFinalTotal" type="number" required title="工程类决算总额"></td>
|
||||
<td><input name="incomeEngineerFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" required title="工程类决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>收入</td>
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
<td><input name="incomeServiceTaxExclude" type="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类概算总额"></td>
|
||||
<td><input name="incomeServiceTaxExclude" type="number" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类结算总额"></td>
|
||||
<td><input name="incomeServiceFinalTotal" type="number" required title="服务类决算总额"></td>
|
||||
<td><input name="incomeServiceFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" required title="服务类决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>合计</td>
|
||||
|
|
@ -98,7 +98,7 @@
|
|||
<td><input name="costPurchaseDeviceTaxExclude" type="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备概算总额"></td>
|
||||
<td><input name="costPurchaseDeviceTaxExclude" type="number" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备结算总额"></td>
|
||||
<td><input name="costPurchaseDeviceFinalTotal" type="number" required title="购买设备决算总额"></td>
|
||||
<td><input name="costPurchaseDeviceFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" required title="购买设备决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>成本</td>
|
||||
|
|
@ -107,7 +107,7 @@
|
|||
<td><input name="costPurchaseBuildTaxExclude" type="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本概算总额"></td>
|
||||
<td><input name="costPurchaseBuildTaxExclude" type="number" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本结算总额"></td>
|
||||
<td><input name="costPurchaseBuildFinalTotal" type="number" required title="施工采购成本决算总额"></td>
|
||||
<td><input name="costPurchaseBuildFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" required title="施工采购成本决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>成本</td>
|
||||
|
|
@ -116,7 +116,7 @@
|
|||
<td><input name="costPurchaseServiceTaxExclude" type="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本概算总额"></td>
|
||||
<td><input name="costPurchaseServiceTaxExclude" type="number" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本结算总额"></td>
|
||||
<td><input name="costPurchaseServiceFinalTotal" type="number" required title="服务采购成本决算总额"></td>
|
||||
<td><input name="costPurchaseServiceFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" required title="服务采购成本决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>成本</td>
|
||||
|
|
@ -125,7 +125,7 @@
|
|||
<td><input name="costPurchaseOtherTaxInclude" type="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本概算总额"></td>
|
||||
<td><input name="costPurchaseOtherTaxInclude" type="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本预算总额"></td>
|
||||
<td><input name="costPurchaseOtherSettleTotal" value="${Utils.format(settleBean.costPurchaseOtherTaxExclude,'0')}" type="number" readonly required title="其他采购成本结算总额"></td>
|
||||
<td><input name="costPurchaseOtherFinalTotal" type="number" required title="其他采购成本决算总额"></td>
|
||||
<td><input name="costPurchaseOtherFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" required title="其他采购成本决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>成本</td>
|
||||
|
|
@ -134,7 +134,7 @@
|
|||
<td><input name="costProjectManageTaxExclude" type="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本概算总额"></td>
|
||||
<td><input name="costProjectManageTaxExclude" type="number" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本预算总额"></td>
|
||||
<td><input name="costProjectManageSettleTotal" value="${Utils.format(settleBean.costProjectManageTaxExclude,'0')}" type="number" readonly required title="项目管理成本结算总额"></td>
|
||||
<td><input name="costProjectManageFinalTotal" type="number" required title="项目管理成本决算总额"></td>
|
||||
<td><input name="costProjectManageFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" required title="项目管理成本决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>成本</td>
|
||||
|
|
@ -143,7 +143,7 @@
|
|||
<td><input name="costOtherOtherTaxExclude" type="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
|
||||
<td><input name="costOtherOtherTaxExclude" type="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
|
||||
<td><input name="costOtherSettleTotal" value="${Utils.format(settleBean.costOtherOtherTaxExclude,'0')}" type="number" type="number"readonly required title="其他成本结算总额"></td>
|
||||
<td><input name="costOtherFinalTotal" type="number" required title="其他成本决算总额"></td>
|
||||
<td><input name="costOtherFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" required title="其他成本决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>合计</td>
|
||||
|
|
@ -173,7 +173,7 @@
|
|||
<td><input name="costExpropriationTaxExclude" type="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本概算总额"></td>
|
||||
<td><input name="costExpropriationTaxExclude" type="number" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本结算总额"></td>
|
||||
<td><input name="costExpropriationFinalTotal" type="number" required title="资金占用成本决算总额"></td>
|
||||
<td><input name="costExpropriationFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" required title="资金占用成本决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>公司管理费用</td>
|
||||
|
|
@ -181,7 +181,7 @@
|
|||
<td><input name="costCompanyManageTaxExclude" type="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用概算总额"></td>
|
||||
<td><input name="costCompanyManageTaxExclude" type="number" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用结算总额"></td>
|
||||
<td><input name="costCompanyManageFinalTotal" type="number" required title="公司管理费用决算总额"></td>
|
||||
<td><input name="costCompanyManageFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" required title="公司管理费用决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>所得税费用</td>
|
||||
|
|
@ -189,7 +189,7 @@
|
|||
<td>/</td>
|
||||
<td>/</td>
|
||||
<td><input name="costIncomeTaxSettleTotal" value="${Utils.format(settleBean.costIncomeTax,'0')}" type="number" required readonly title="所得税费用结算总额"></td>
|
||||
<td><input name="costIncomeTaxFinalTotal" type="number" required title="所得税费用决算总额"></td>
|
||||
<td><input name="costIncomeTaxFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" required title="所得税费用决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>合计</td>
|
||||
|
|
@ -253,37 +253,37 @@
|
|||
<td>销售商品、提供劳务收到的现金</td>
|
||||
<td><input name="budgetSaleIncomeCash" type="number" value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly required title="预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.saleIncomeCash,'0')}" readonly required title="结算总额"></td>
|
||||
<td><input name="saleIncomeCash" type="number" required title="决算总额"></td>
|
||||
<td><input name="saleIncomeCash" type="number" min="0.00" max="99999999.99" step="0.01" required title="决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>收到的税费返还</td>
|
||||
<td>/</td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.taxReturn,'0')}" readonly required title="结算总额"></td>
|
||||
<td><input name="taxReturn" type="number" required title="决算总额"></td>
|
||||
<td><input name="taxReturn" type="number" min="0.00" max="99999999.99" step="0.01" required title="决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>收到其他与经营活动有关的现金</td>
|
||||
<td><input name="budgetEarnestMoneyIncome" type="number" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly required title="预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.earnestMoneyIncome,'0')}" readonly required title="结算总额"></td>
|
||||
<td><input name="earnestMoneyIncome" type="number" required title="决算总额"></td>
|
||||
<td><input name="earnestMoneyIncome" type="number" min="0.00" max="99999999.99" step="0.01" required title="决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>购买商品、接受劳务支付的现金</td>
|
||||
<td><input name="budgetPurchaseCost" type="number" value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required title="预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.purchaseCost,'0')}" readonly required title="结算总额"></td>
|
||||
<td><input name="purchaseCost" type="number" required title="决算总额"></td>
|
||||
<td><input name="purchaseCost" type="number" min="0.00" max="99999999.99" step="0.01" required title="决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>支付的各项税费</td>
|
||||
<td>/</td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.taxCost,'0')}" readonly required title="结算总额"></td>
|
||||
<td><input name="taxCost" type="number" required title="决算总额"></td>
|
||||
<td><input name="taxCost" type="number" min="0.00" max="99999999.99" step="0.01" required title="决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>支付其他与经营活动有关的现金</td>
|
||||
<td><input name="budgetEarnestMoneyCost" type="number" value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly required title="预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.earnestMoneyCost,'0')}" readonly required title="结算总额"></td>
|
||||
<td><input name="earnestMoneyCost" type="number" required title="决算总额"></td>
|
||||
<td><input name="earnestMoneyCost" type="number" min="0.00" max="99999999.99" step="0.01" required title="决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>经营活动产生的现金流量净额</td>
|
||||
|
|
@ -295,13 +295,13 @@
|
|||
<td>投资活动现金流入</td>
|
||||
<td>/</td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.cashInflowFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
|
||||
<td><input name="cashInflowFromInvestingActivities" type="number" required title="决算总额"></td>
|
||||
<td><input name="cashInflowFromInvestingActivities" type="number" min="0.00" max="99999999.99" step="0.01" required title="决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>投资活动现金流出</td>
|
||||
<td>/</td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.cashOutflowFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
|
||||
<td><input name="cashOutflowFromInvestingActivities" type="number" required title="决算总额"></td>
|
||||
<td><input name="cashOutflowFromInvestingActivities" type="number" min="0.00" max="99999999.99" step="0.01" required title="决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>投资活动产生的现金流量净额</td>
|
||||
|
|
@ -313,13 +313,13 @@
|
|||
<td>融资资金流入</td>
|
||||
<td><input name="budgetFinancingCapitalInflow" type="number" value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly required title="预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.financingCapitalInflow,'0')}" readonly required title="结算总额"></td>
|
||||
<td><input name="financingCapitalInflow" type="number" required title="决算总额"></td>
|
||||
<td><input name="financingCapitalInflow" type="number" min="0.00" max="99999999.99" step="0.01" required title="决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>还款资金流出</td>
|
||||
<td><input name="budgetFinancingCapitalOutflow" type="number" value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}" readonly required title="预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.financingCapitalOutflow,'0')}" readonly required title="结算总额"></td>
|
||||
<td><input name="financingCapitalOutflow" type="number" required title="决算总额"></td>
|
||||
<td><input name="financingCapitalOutflow" type="number" min="0.00" max="99999999.99" step="0.01" required title="决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>筹资活动产生的现金流量净额</td>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<div class="am-fl am-cf"><strong class="am-text-primary am-text-lg">项目决算表</strong> / <small>${project.name}</small></div>
|
||||
</div>
|
||||
|
||||
<form method="post" class="am-form" id="pmsForm" action="${base}/project/budgetEditSave">
|
||||
<form method="post" class="am-form" id="pmsForm" action="${base}/project/budgetEditSave" data-am-validator>
|
||||
<!--选项卡（tabs）begin-->
|
||||
<div class="am-tabs am-margin" data-am-tabs>
|
||||
<ul class="am-tabs-nav am-nav am-nav-tabs">
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
<td><input name="incomeDeviceTaxExclude" type="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类概算总额"></td>
|
||||
<td><input name="incomeDeviceTaxExclude" type="number" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类结算总额"></td>
|
||||
<td><input name="incomeDeviceFinalTotal" type="number" value="${Utils.format(finalBean.incomeDeviceFinalTotal,'0')}" required title="设备类决算总额"></td>
|
||||
<td><input name="incomeDeviceFinalTotal" min="0.00" max="99999999.99" step="0.01" type="number" value="${Utils.format(finalBean.incomeDeviceFinalTotal,'0')}" required title="设备类决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>收入</td>
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
<td><input name="incomeEngineerTaxExclude" type="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类概算总额"></td>
|
||||
<td><input name="incomeEngineerTaxExclude" type="number" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类结算总额"></td>
|
||||
<td><input name="incomeEngineerFinalTotal" type="number" value="${Utils.format(finalBean.incomeEngineerFinalTotal,'0')}" required title="工程类决算总额"></td>
|
||||
<td><input name="incomeEngineerFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.incomeEngineerFinalTotal,'0')}" required title="工程类决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>收入</td>
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
<td><input name="incomeServiceTaxExclude" type="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类概算总额"></td>
|
||||
<td><input name="incomeServiceTaxExclude" type="number" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类结算总额"></td>
|
||||
<td><input name="incomeServiceFinalTotal" type="number" value="${Utils.format(finalBean.incomeServiceFinalTotal,'0')}" required title="服务类决算总额"></td>
|
||||
<td><input name="incomeServiceFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.incomeServiceFinalTotal,'0')}" required title="服务类决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>合计</td>
|
||||
|
|
@ -98,7 +98,7 @@
|
|||
<td><input name="costPurchaseDeviceTaxExclude" type="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备概算总额"></td>
|
||||
<td><input name="costPurchaseDeviceTaxExclude" type="number" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备结算总额"></td>
|
||||
<td><input name="costPurchaseDeviceFinalTotal" type="number" value="${Utils.format(finalBean.costPurchaseDeviceFinalTotal,'0')}" required title="购买设备决算总额"></td>
|
||||
<td><input name="costPurchaseDeviceFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.costPurchaseDeviceFinalTotal,'0')}" required title="购买设备决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>成本</td>
|
||||
|
|
@ -107,7 +107,7 @@
|
|||
<td><input name="costPurchaseBuildTaxExclude" type="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本概算总额"></td>
|
||||
<td><input name="costPurchaseBuildTaxExclude" type="number" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本结算总额"></td>
|
||||
<td><input name="costPurchaseBuildFinalTotal" type="number" value="${Utils.format(finalBean.costPurchaseBuildFinalTotal,'0')}" required title="施工采购成本决算总额"></td>
|
||||
<td><input name="costPurchaseBuildFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.costPurchaseBuildFinalTotal,'0')}" required title="施工采购成本决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>成本</td>
|
||||
|
|
@ -116,7 +116,7 @@
|
|||
<td><input name="costPurchaseServiceTaxExclude" type="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本概算总额"></td>
|
||||
<td><input name="costPurchaseServiceTaxExclude" type="number" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本结算总额"></td>
|
||||
<td><input name="costPurchaseServiceFinalTotal" type="number" value="${Utils.format(finalBean.costPurchaseServiceFinalTotal,'0')}" required title="服务采购成本决算总额"></td>
|
||||
<td><input name="costPurchaseServiceFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.costPurchaseServiceFinalTotal,'0')}" required title="服务采购成本决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>成本</td>
|
||||
|
|
@ -125,7 +125,7 @@
|
|||
<td><input name="costPurchaseOtherTaxInclude" type="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本概算总额"></td>
|
||||
<td><input name="costPurchaseOtherTaxInclude" type="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxInclude,'0')}" readonly required title="其他采购成本预算总额"></td>
|
||||
<td><input name="costPurchaseOtherSettleTotal" value="${Utils.format(settleBean.costPurchaseOtherTaxExclude,'0')}" type="number" readonly required title="其他采购成本结算总额"></td>
|
||||
<td><input name="costPurchaseOtherFinalTotal" type="number" value="${Utils.format(finalBean.costPurchaseOtherFinalTotal,'0')}" required title="其他采购成本决算总额"></td>
|
||||
<td><input name="costPurchaseOtherFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.costPurchaseOtherFinalTotal,'0')}" required title="其他采购成本决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>成本</td>
|
||||
|
|
@ -134,7 +134,7 @@
|
|||
<td><input name="costProjectManageTaxExclude" type="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本概算总额"></td>
|
||||
<td><input name="costProjectManageTaxExclude" type="number" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本预算总额"></td>
|
||||
<td><input name="costProjectManageSettleTotal" value="${Utils.format(settleBean.costProjectManageTaxExclude,'0')}" type="number" readonly required title="项目管理成本结算总额"></td>
|
||||
<td><input name="costProjectManageFinalTotal" type="number" value="${Utils.format(finalBean.costProjectManageFinalTotal,'0')}" required title="项目管理成本决算总额"></td>
|
||||
<td><input name="costProjectManageFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.costProjectManageFinalTotal,'0')}" required title="项目管理成本决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>成本</td>
|
||||
|
|
@ -143,7 +143,7 @@
|
|||
<td><input name="costOtherOtherTaxExclude" type="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
|
||||
<td><input name="costOtherOtherTaxExclude" type="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
|
||||
<td><input name="costOtherSettleTotal" value="${Utils.format(settleBean.costOtherOtherTaxExclude,'0')}" type="number" type="number"readonly required title="其他成本结算总额"></td>
|
||||
<td><input name="costOtherFinalTotal" type="number" value="${Utils.format(finalBean.costOtherFinalTotal,'0')}" required title="其他成本决算总额"></td>
|
||||
<td><input name="costOtherFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.costOtherFinalTotal,'0')}" required title="其他成本决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>合计</td>
|
||||
|
|
@ -173,7 +173,7 @@
|
|||
<td><input name="costExpropriationTaxExclude" type="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本概算总额"></td>
|
||||
<td><input name="costExpropriationTaxExclude" type="number" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本结算总额"></td>
|
||||
<td><input name="costExpropriationFinalTotal" type="number" value="${Utils.format(finalBean.costExpropriationFinalTotal,'0')}" required title="资金占用成本决算总额"></td>
|
||||
<td><input name="costExpropriationFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.costExpropriationFinalTotal,'0')}" required title="资金占用成本决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>公司管理费用</td>
|
||||
|
|
@ -181,7 +181,7 @@
|
|||
<td><input name="costCompanyManageTaxExclude" type="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用概算总额"></td>
|
||||
<td><input name="costCompanyManageTaxExclude" type="number" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用结算总额"></td>
|
||||
<td><input name="costCompanyManageFinalTotal" type="number" value="${Utils.format(finalBean.costCompanyManageFinalTotal,'0')}" required title="公司管理费用决算总额"></td>
|
||||
<td><input name="costCompanyManageFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.costCompanyManageFinalTotal,'0')}" required title="公司管理费用决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>所得税费用</td>
|
||||
|
|
@ -189,7 +189,7 @@
|
|||
<td>/</td>
|
||||
<td>/</td>
|
||||
<td><input name="costIncomeTaxSettleTotal" value="${Utils.format(settleBean.costIncomeTax,'0')}" type="number" required readonly title="所得税费用结算总额"></td>
|
||||
<td><input name="costIncomeTaxFinalTotal" type="number" value="${Utils.format(finalBean.costIncomeTaxFinalTotal,'0')}" required title="所得税费用决算总额"></td>
|
||||
<td><input name="costIncomeTaxFinalTotal" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.costIncomeTaxFinalTotal,'0')}" required title="所得税费用决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>合计</td>
|
||||
|
|
@ -253,37 +253,37 @@
|
|||
<td>销售商品、提供劳务收到的现金</td>
|
||||
<td><input name="budgetSaleIncomeCash" type="number" value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly required title="预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.saleIncomeCash,'0')}" readonly required title="结算总额"></td>
|
||||
<td><input name="saleIncomeCash" type="number" value="${Utils.format(finalBean.saleIncomeCash,'0')}" required title="决算总额"></td>
|
||||
<td><input name="saleIncomeCash" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.saleIncomeCash,'0')}" required title="决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>收到的税费返还</td>
|
||||
<td>/</td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.taxReturn,'0')}" readonly required title="结算总额"></td>
|
||||
<td><input name="taxReturn" type="number" value="${Utils.format(finalBean.taxReturn,'0')}" required title="决算总额"></td>
|
||||
<td><input name="taxReturn" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.taxReturn,'0')}" required title="决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>收到其他与经营活动有关的现金</td>
|
||||
<td><input name="budgetEarnestMoneyIncome" type="number" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly required title="预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.earnestMoneyIncome,'0')}" readonly required title="结算总额"></td>
|
||||
<td><input name="earnestMoneyIncome" type="number" value="${Utils.format(finalBean.earnestMoneyIncome,'0')}" required title="决算总额"></td>
|
||||
<td><input name="earnestMoneyIncome" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.earnestMoneyIncome,'0')}" required title="决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>购买商品、接受劳务支付的现金</td>
|
||||
<td><input name="budgetPurchaseCost" type="number" value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required title="预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.purchaseCost,'0')}" readonly required title="结算总额"></td>
|
||||
<td><input name="purchaseCost" type="number" value="${Utils.format(finalBean.purchaseCost,'0')}" required title="决算总额"></td>
|
||||
<td><input name="purchaseCost" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.purchaseCost,'0')}" required title="决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>支付的各项税费</td>
|
||||
<td>/</td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.taxCost,'0')}" readonly required title="结算总额"></td>
|
||||
<td><input name="taxCost" type="number" value="${Utils.format(finalBean.taxCost,'0')}" required title="决算总额"></td>
|
||||
<td><input name="taxCost" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.taxCost,'0')}" required title="决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>支付其他与经营活动有关的现金</td>
|
||||
<td><input name="budgetEarnestMoneyCost" type="number" value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly required title="预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.earnestMoneyCost,'0')}" readonly required title="结算总额"></td>
|
||||
<td><input name="earnestMoneyCost" type="number" value="${Utils.format(finalBean.earnestMoneyCost,'0')}" required title="决算总额"></td>
|
||||
<td><input name="earnestMoneyCost" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.earnestMoneyCost,'0')}" required title="决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>经营活动产生的现金流量净额</td>
|
||||
|
|
@ -295,13 +295,13 @@
|
|||
<td>投资活动现金流入</td>
|
||||
<td>/</td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.cashInflowFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
|
||||
<td><input name="cashInflowFromInvestingActivities" value="${Utils.format(finalBean.cashInflowFromInvestingActivities,'0')}" type="number" required title="决算总额"></td>
|
||||
<td><input name="cashInflowFromInvestingActivities" value="${Utils.format(finalBean.cashInflowFromInvestingActivities,'0')}" type="number" min="0.00" max="99999999.99" step="0.01" required title="决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>投资活动现金流出</td>
|
||||
<td>/</td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.cashOutflowFromInvestingActivities,'0')}" readonly required title="结算总额"></td>
|
||||
<td><input name="cashOutflowFromInvestingActivities" type="number" value="${Utils.format(finalBean.cashOutflowFromInvestingActivities,'0')}" required title="决算总额"></td>
|
||||
<td><input name="cashOutflowFromInvestingActivities" type="number" value="${Utils.format(finalBean.cashOutflowFromInvestingActivities,'0')}" required min="0.00" max="99999999.99" step="0.01" title="决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>投资活动产生的现金流量净额</td>
|
||||
|
|
@ -313,13 +313,13 @@
|
|||
<td>融资资金流入</td>
|
||||
<td><input name="budgetFinancingCapitalInflow" type="number" value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly required title="预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.financingCapitalInflow,'0')}" readonly required title="结算总额"></td>
|
||||
<td><input name="financingCapitalInflow" type="number" value="${Utils.format(finalBean.financingCapitalInflow,'0')}" required title="决算总额"></td>
|
||||
<td><input name="financingCapitalInflow" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.financingCapitalInflow,'0')}" required title="决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>还款资金流出</td>
|
||||
<td><input name="budgetFinancingCapitalOutflow" type="number" value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}" readonly required title="预算总额"></td>
|
||||
<td><input type="number" value="${Utils.format(settleBean.financingCapitalOutflow,'0')}" readonly required title="结算总额"></td>
|
||||
<td><input name="financingCapitalOutflow" type="number" value="${Utils.format(finalBean.financingCapitalOutflow,'0')}" required title="决算总额"></td>
|
||||
<td><input name="financingCapitalOutflow" type="number" min="0.00" max="99999999.99" step="0.01" value="${Utils.format(finalBean.financingCapitalOutflow,'0')}" required title="决算总额"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>筹资活动产生的现金流量净额</td>
|
||||
|
|
|
|||
|
|
@ -195,7 +195,7 @@
|
|||
<div class="am-btn-group am-btn-group-xs">
|
||||
<button type="button"
|
||||
class="am-btn am-btn-default am-btn-xs am-text-secondary"
|
||||
onclick="location.href='${base}/project/detail?id=${list.id}'"><span
|
||||
onclick="location.href='${base}/project/approve?listFrom=list&id=${list.id}'"><span
|
||||
class="am-icon-pencil-square-o"></span>查看
|
||||
</button>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue