查看项目结算信息查看快照

src/main/java/cn/palmte/work/bean/SettleBean.java

@@ -11,16 +11,28 @@ public class SettleBean {
      */
     private BigDecimal incomeDevice;
 
+    private BigDecimal budgetIncomeDevice;
+
+    private BigDecimal estimateIncomeDevice;
+
     /**
      * 工程类决算总额
      */
     private BigDecimal incomeEngineer;
 
+    private BigDecimal budgetIncomeEngineer;
+
+    private BigDecimal estimateIncomeEngineer;
+
     /**
      * 服务类决算总额
      */
     private BigDecimal incomeService;
 
+    private BigDecimal budgetIncomeService;
+
+    private BigDecimal estimateIncomeService;
+
     /**
      * 获取所有收入总额
      *
@@ -36,6 +48,26 @@ public class SettleBean {
         return incomeDevice.add(incomeEngineer).add(incomeService);
     }
 
+    public BigDecimal getBudgetIncomeTotal() {
+        BigDecimal incomeDevice = getBudgetIncomeDevice();
+        BigDecimal incomeEngineer = getBudgetIncomeEngineer();
+        BigDecimal incomeService = getBudgetIncomeService();
+        if (null == incomeDevice || null == incomeEngineer || null == incomeService) {
+            return new BigDecimal(0);
+        }
+        return incomeDevice.add(incomeEngineer).add(incomeService);
+    }
+
+    public BigDecimal getEstimateIncomeTotal() {
+        BigDecimal incomeDevice = getEstimateIncomeDevice();
+        BigDecimal incomeEngineer = getEstimateIncomeEngineer();
+        BigDecimal incomeService = getEstimateIncomeService();
+        if (null == incomeDevice || null == incomeEngineer || null == incomeService) {
+            return new BigDecimal(0);
+        }
+        return incomeDevice.add(incomeEngineer).add(incomeService);
+    }
+
 
     //========================成本表================================
 
@@ -44,31 +76,55 @@ public class SettleBean {
      */
     private BigDecimal costPurchaseDevice;
 
+    private BigDecimal budgetCostPurchaseDevice;
+
+    private BigDecimal estimateCostPurchaseDevice;
+
     /**
      *施工采购成本决算总额
      */
     private BigDecimal costPurchaseBuild;
 
+    private BigDecimal budgetCostPurchaseBuild;
+
+    private BigDecimal estimateCostPurchaseBuild;
+
     /**
      *服务采购成本决算总额
      */
     private BigDecimal costPurchaseService;
 
+    private BigDecimal budgetCostPurchaseService;
+
+    private BigDecimal estimateCostPurchaseService;
+
     /**
      *其他采购成本决算总额
      */
     private BigDecimal costPurchaseOther;
 
+    private BigDecimal budgetCostPurchaseOther;
+
+    private BigDecimal estimateCostPurchaseOther;
+
     /**
      * 项目管理成本决算总额
      */
     private BigDecimal costProjectManage;
 
+    private BigDecimal budgetCostProjectManage;
+
+    private BigDecimal estimateCostProjectManage;
+
     /**
      * 其他成本决算总额
      */
     private BigDecimal costOther;
 
+    private BigDecimal budgetCostOther;
+
+    private BigDecimal estimateCostOther;
+
 
     /**
      * 获取所有成本总额
@@ -92,6 +148,40 @@ public class SettleBean {
                 .add(costPurchaseOther).add(costProjectManage).add(costOther);
     }
 
+    public BigDecimal getBudgetCostTotal() {
+        BigDecimal costPurchaseDevice = getBudgetCostPurchaseDevice();
+        BigDecimal costPurchaseBuild = getBudgetCostPurchaseBuild();
+        BigDecimal costPurchaseService = getBudgetCostPurchaseService();
+        BigDecimal costPurchaseOther = getBudgetCostPurchaseOther();
+        BigDecimal costProjectManage = getBudgetCostProjectManage();
+        BigDecimal costOther = getBudgetCostOther();
+
+        if (null == costPurchaseDevice || null == costPurchaseBuild || null == costPurchaseService
+                || null == costPurchaseOther || null == costProjectManage || null == costOther) {
+            return new BigDecimal(0);
+        }
+
+        return costPurchaseDevice.add(costPurchaseBuild).add(costPurchaseService)
+                .add(costPurchaseOther).add(costProjectManage).add(costOther);
+    }
+
+    public BigDecimal getEstimateCostTotal() {
+        BigDecimal costPurchaseDevice = getEstimateCostPurchaseDevice();
+        BigDecimal costPurchaseBuild = getEstimateCostPurchaseBuild();
+        BigDecimal costPurchaseService = getEstimateCostPurchaseService();
+        BigDecimal costPurchaseOther = getEstimateCostPurchaseOther();
+        BigDecimal costProjectManage = getEstimateCostProjectManage();
+        BigDecimal costOther = getEstimateCostOther();
+
+        if (null == costPurchaseDevice || null == costPurchaseBuild || null == costPurchaseService
+                || null == costPurchaseOther || null == costProjectManage || null == costOther) {
+            return new BigDecimal(0);
+        }
+
+        return costPurchaseDevice.add(costPurchaseBuild).add(costPurchaseService)
+                .add(costPurchaseOther).add(costProjectManage).add(costOther);
+    }
+
     /**
      * 获取所有成本总额
      *
@@ -119,11 +209,19 @@ public class SettleBean {
      */
     private BigDecimal costExpropriation;
 
+    private BigDecimal estimateCostExpropriation;
+
+    private BigDecimal budgetCostExpropriation;
+
     /**
      * 公司管理费用决算总额
      */
     private BigDecimal costCompanyManage;
 
+    private BigDecimal estimateCostCompanyManage;
+
+    private BigDecimal budgetCostCompanyManage;
+
     /**
      * 所得税费用决算总额
      */
@@ -141,6 +239,27 @@ public class SettleBean {
         return costExpropriation.add(costCompanyManage).add(costIncomeTax);
     }
 
+    public BigDecimal getEstimateCostManageTotal() {
+        BigDecimal costExpropriation = getEstimateCostExpropriation();
+        BigDecimal costCompanyManage = getEstimateCostCompanyManage();
+
+        if (null == costExpropriation || null == costCompanyManage ) {
+            return new BigDecimal(0);
+        }
+
+        return costExpropriation.add(costCompanyManage);
+    }
+
+    public BigDecimal getBudgetCostManageTotal() {
+        BigDecimal costExpropriation = getBudgetCostExpropriation();
+        BigDecimal costCompanyManage = getBudgetCostCompanyManage();
+
+        if (null == costExpropriation || null == costCompanyManage ) {
+            return new BigDecimal(0);
+        }
+
+        return costExpropriation.add(costCompanyManage);
+    }
 
     //========================利润率计算表================================
 
@@ -149,6 +268,10 @@ public class SettleBean {
      */
     private BigDecimal grossProfit;
 
+    private BigDecimal estimateGrossProfit;
+
+    private BigDecimal budgetGrossProfit;
+
     /**
      * 项目毛利利润率
      */
@@ -159,6 +282,10 @@ public class SettleBean {
      */
     private BigDecimal contributionProfit;
 
+    private BigDecimal estimateContributionProfit;
+
+    private BigDecimal budgetContributionProfit;
+
     /**
      * 项目贡献利润利润率
      */
@@ -180,6 +307,8 @@ public class SettleBean {
      * a销售商品、提供劳务收到的现金
      * */
     private BigDecimal saleIncomeCash;
+
+    private BigDecimal budgetSaleIncomeCash;
     /**
      * b收到的税费返还
      * */
@@ -188,10 +317,14 @@ public class SettleBean {
      * c其他与经营活动有关的现金【保证金收入】
      */
     private BigDecimal earnestMoneyIncome;
+
+    private BigDecimal budgetEarnestMoneyIncome;
     /**
      * d购买商品、接受劳务支付的现金【设备支出+工程支出】
      */
     private BigDecimal purchaseCost;
+
+    private BigDecimal budgetPurchaseCost;
     /**
      * e支付的各项税费
      */
@@ -200,11 +333,15 @@ public class SettleBean {
      *f支付其他与经营活动有关的现金
      */
     private BigDecimal earnestMoneyCost;
+
+    private BigDecimal budgetEarnestMoneyCost;
     /**
      * g经营活动产生的现金流量净额
      * g=a+c+b-d-f-e
      */
     private BigDecimal netCashFlow;
+
+    private BigDecimal budgetNetCashFlow;
     /**
      * h投资活动现金流入
      */
@@ -221,21 +358,29 @@ public class SettleBean {
      * k融资资金流入【垫资计划】
      */
     private BigDecimal financingCapitalInflow;
+
+    private BigDecimal budgetFinancingCapitalInflow;
     /**
      * l融资资金流出【还款计划】
      */
     private BigDecimal financingCapitalOutflow;
+
+    private BigDecimal budgetFinancingCapitalOutflow;
     /**
      *m筹资活动产生的现金流量净额
      * m=k-l
      */
     private BigDecimal financingCapitalCashflow;
+
+    private BigDecimal budgetFinancingCapitalCashflow;
     /**
      * n货币资金净增加额
      * n=g+j+m
      */
     private BigDecimal netIncreaseMonetaryFunds;
 
+    private BigDecimal budgetNetIncreaseMonetaryFunds;
+
     /**
      * 获取所有现金流量总额
      * @return
@@ -537,4 +682,284 @@ public class SettleBean {
     public void setProjectName(String projectName) {
         this.projectName = projectName;
     }
+
+    public BigDecimal getBudgetIncomeDevice() {
+        return budgetIncomeDevice;
+    }
+
+    public void setBudgetIncomeDevice(BigDecimal budgetIncomeDevice) {
+        this.budgetIncomeDevice = budgetIncomeDevice;
+    }
+
+    public BigDecimal getEstimateIncomeDevice() {
+        return estimateIncomeDevice;
+    }
+
+    public void setEstimateIncomeDevice(BigDecimal estimateIncomeDevice) {
+        this.estimateIncomeDevice = estimateIncomeDevice;
+    }
+
+    public BigDecimal getBudgetIncomeEngineer() {
+        return budgetIncomeEngineer;
+    }
+
+    public void setBudgetIncomeEngineer(BigDecimal budgetIncomeEngineer) {
+        this.budgetIncomeEngineer = budgetIncomeEngineer;
+    }
+
+    public BigDecimal getEstimateIncomeEngineer() {
+        return estimateIncomeEngineer;
+    }
+
+    public void setEstimateIncomeEngineer(BigDecimal estimateIncomeEngineer) {
+        this.estimateIncomeEngineer = estimateIncomeEngineer;
+    }
+
+    public BigDecimal getBudgetIncomeService() {
+        return budgetIncomeService;
+    }
+
+    public void setBudgetIncomeService(BigDecimal budgetIncomeService) {
+        this.budgetIncomeService = budgetIncomeService;
+    }
+
+    public BigDecimal getEstimateIncomeService() {
+        return estimateIncomeService;
+    }
+
+    public void setEstimateIncomeService(BigDecimal estimateIncomeService) {
+        this.estimateIncomeService = estimateIncomeService;
+    }
+
+    public BigDecimal getBudgetCostPurchaseDevice() {
+        return budgetCostPurchaseDevice;
+    }
+
+    public void setBudgetCostPurchaseDevice(BigDecimal budgetCostPurchaseDevice) {
+        this.budgetCostPurchaseDevice = budgetCostPurchaseDevice;
+    }
+
+    public BigDecimal getEstimateCostPurchaseDevice() {
+        return estimateCostPurchaseDevice;
+    }
+
+    public void setEstimateCostPurchaseDevice(BigDecimal estimateCostPurchaseDevice) {
+        this.estimateCostPurchaseDevice = estimateCostPurchaseDevice;
+    }
+
+    public BigDecimal getBudgetCostPurchaseBuild() {
+        return budgetCostPurchaseBuild;
+    }
+
+    public void setBudgetCostPurchaseBuild(BigDecimal budgetCostPurchaseBuild) {
+        this.budgetCostPurchaseBuild = budgetCostPurchaseBuild;
+    }
+
+    public BigDecimal getEstimateCostPurchaseBuild() {
+        return estimateCostPurchaseBuild;
+    }
+
+    public void setEstimateCostPurchaseBuild(BigDecimal estimateCostPurchaseBuild) {
+        this.estimateCostPurchaseBuild = estimateCostPurchaseBuild;
+    }
+
+    public BigDecimal getBudgetCostPurchaseService() {
+        return budgetCostPurchaseService;
+    }
+
+    public void setBudgetCostPurchaseService(BigDecimal budgetCostPurchaseService) {
+        this.budgetCostPurchaseService = budgetCostPurchaseService;
+    }
+
+    public BigDecimal getEstimateCostPurchaseService() {
+        return estimateCostPurchaseService;
+    }
+
+    public void setEstimateCostPurchaseService(BigDecimal estimateCostPurchaseService) {
+        this.estimateCostPurchaseService = estimateCostPurchaseService;
+    }
+
+    public BigDecimal getBudgetCostPurchaseOther() {
+        return budgetCostPurchaseOther;
+    }
+
+    public void setBudgetCostPurchaseOther(BigDecimal budgetCostPurchaseOther) {
+        this.budgetCostPurchaseOther = budgetCostPurchaseOther;
+    }
+
+    public BigDecimal getEstimateCostPurchaseOther() {
+        return estimateCostPurchaseOther;
+    }
+
+    public void setEstimateCostPurchaseOther(BigDecimal estimateCostPurchaseOther) {
+        this.estimateCostPurchaseOther = estimateCostPurchaseOther;
+    }
+
+    public BigDecimal getBudgetCostProjectManage() {
+        return budgetCostProjectManage;
+    }
+
+    public void setBudgetCostProjectManage(BigDecimal budgetCostProjectManage) {
+        this.budgetCostProjectManage = budgetCostProjectManage;
+    }
+
+    public BigDecimal getEstimateCostProjectManage() {
+        return estimateCostProjectManage;
+    }
+
+    public void setEstimateCostProjectManage(BigDecimal estimateCostProjectManage) {
+        this.estimateCostProjectManage = estimateCostProjectManage;
+    }
+
+    public BigDecimal getBudgetCostOther() {
+        return budgetCostOther;
+    }
+
+    public void setBudgetCostOther(BigDecimal budgetCostOther) {
+        this.budgetCostOther = budgetCostOther;
+    }
+
+    public BigDecimal getEstimateCostOther() {
+        return estimateCostOther;
+    }
+
+    public void setEstimateCostOther(BigDecimal estimateCostOther) {
+        this.estimateCostOther = estimateCostOther;
+    }
+
+    public BigDecimal getEstimateCostExpropriation() {
+        return estimateCostExpropriation;
+    }
+
+    public void setEstimateCostExpropriation(BigDecimal estimateCostExpropriation) {
+        this.estimateCostExpropriation = estimateCostExpropriation;
+    }
+
+    public BigDecimal getBudgetCostExpropriation() {
+        return budgetCostExpropriation;
+    }
+
+    public void setBudgetCostExpropriation(BigDecimal budgetCostExpropriation) {
+        this.budgetCostExpropriation = budgetCostExpropriation;
+    }
+
+    public BigDecimal getEstimateCostCompanyManage() {
+        return estimateCostCompanyManage;
+    }
+
+    public void setEstimateCostCompanyManage(BigDecimal estimateCostCompanyManage) {
+        this.estimateCostCompanyManage = estimateCostCompanyManage;
+    }
+
+    public BigDecimal getBudgetCostCompanyManage() {
+        return budgetCostCompanyManage;
+    }
+
+    public void setBudgetCostCompanyManage(BigDecimal budgetCostCompanyManage) {
+        this.budgetCostCompanyManage = budgetCostCompanyManage;
+    }
+
+    public BigDecimal getEstimateGrossProfit() {
+        return estimateGrossProfit;
+    }
+
+    public void setEstimateGrossProfit(BigDecimal estimateGrossProfit) {
+        this.estimateGrossProfit = estimateGrossProfit;
+    }
+
+    public BigDecimal getBudgetGrossProfit() {
+        return budgetGrossProfit;
+    }
+
+    public void setBudgetGrossProfit(BigDecimal budgetGrossProfit) {
+        this.budgetGrossProfit = budgetGrossProfit;
+    }
+
+    public BigDecimal getEstimateContributionProfit() {
+        return estimateContributionProfit;
+    }
+
+    public void setEstimateContributionProfit(BigDecimal estimateContributionProfit) {
+        this.estimateContributionProfit = estimateContributionProfit;
+    }
+
+    public BigDecimal getBudgetContributionProfit() {
+        return budgetContributionProfit;
+    }
+
+    public void setBudgetContributionProfit(BigDecimal budgetContributionProfit) {
+        this.budgetContributionProfit = budgetContributionProfit;
+    }
+
+    public BigDecimal getBudgetSaleIncomeCash() {
+        return budgetSaleIncomeCash;
+    }
+
+    public void setBudgetSaleIncomeCash(BigDecimal budgetSaleIncomeCash) {
+        this.budgetSaleIncomeCash = budgetSaleIncomeCash;
+    }
+
+    public BigDecimal getBudgetEarnestMoneyIncome() {
+        return budgetEarnestMoneyIncome;
+    }
+
+    public void setBudgetEarnestMoneyIncome(BigDecimal budgetEarnestMoneyIncome) {
+        this.budgetEarnestMoneyIncome = budgetEarnestMoneyIncome;
+    }
+
+    public BigDecimal getBudgetPurchaseCost() {
+        return budgetPurchaseCost;
+    }
+
+    public void setBudgetPurchaseCost(BigDecimal budgetPurchaseCost) {
+        this.budgetPurchaseCost = budgetPurchaseCost;
+    }
+
+    public BigDecimal getBudgetEarnestMoneyCost() {
+        return budgetEarnestMoneyCost;
+    }
+
+    public void setBudgetEarnestMoneyCost(BigDecimal budgetEarnestMoneyCost) {
+        this.budgetEarnestMoneyCost = budgetEarnestMoneyCost;
+    }
+
+    public BigDecimal getBudgetNetCashFlow() {
+        return budgetNetCashFlow;
+    }
+
+    public void setBudgetNetCashFlow(BigDecimal budgetNetCashFlow) {
+        this.budgetNetCashFlow = budgetNetCashFlow;
+    }
+
+    public BigDecimal getBudgetFinancingCapitalInflow() {
+        return budgetFinancingCapitalInflow;
+    }
+
+    public void setBudgetFinancingCapitalInflow(BigDecimal budgetFinancingCapitalInflow) {
+        this.budgetFinancingCapitalInflow = budgetFinancingCapitalInflow;
+    }
+
+    public BigDecimal getBudgetFinancingCapitalOutflow() {
+        return budgetFinancingCapitalOutflow;
+    }
+
+    public void setBudgetFinancingCapitalOutflow(BigDecimal budgetFinancingCapitalOutflow) {
+        this.budgetFinancingCapitalOutflow = budgetFinancingCapitalOutflow;
+    }
+
+    public BigDecimal getBudgetFinancingCapitalCashflow() {
+        return budgetFinancingCapitalCashflow;
+    }
+
+    public void setBudgetFinancingCapitalCashflow(BigDecimal budgetFinancingCapitalCashflow) {
+        this.budgetFinancingCapitalCashflow = budgetFinancingCapitalCashflow;
+    }
+
+    public BigDecimal getBudgetNetIncreaseMonetaryFunds() {
+        return budgetNetIncreaseMonetaryFunds;
+    }
+
+    public void setBudgetNetIncreaseMonetaryFunds(BigDecimal budgetNetIncreaseMonetaryFunds) {
+        this.budgetNetIncreaseMonetaryFunds = budgetNetIncreaseMonetaryFunds;
+    }
 }

src/main/java/cn/palmte/work/controller/backend/ProjectController.java

@@ -393,8 +393,8 @@ public class ProjectController extends BaseController {
             time = searchInfo.get("time");
         }
         model.put("formerBean", projectSettleService.getFormerSettle(project, time));
-        model.put("monthBean", projectSettleService.getMonthSettle(project, time));
-        model.put("currentBean", projectSettleService.getCurrentSettle(project, time));
+        model.put("monthBean", projectSettleService.getMonthSettleByTime(project, time));
+        model.put("currentBean", projectSettleService.getCurrentSettleBytime(project, time));
 
         //决算信息
         model.put("finalBean", projectFinalSevice.getFinal(project));

src/main/java/cn/palmte/work/model/ProjectSettleCashFlowRepository.java

@@ -17,6 +17,9 @@ public interface ProjectSettleCashFlowRepository extends JpaRepository<ProjectSe
     @Query(value = "select * from project_settle_cash_flow where project_id = ?1 and time < ?2", nativeQuery = true)
     List<ProjectSettleCashFlow> findAllByProjectIdBefore(int id, String time);
 
+    @Query(value = "select * from project_settle_cash_flow where project_id = ?1 and time <= ?2", nativeQuery = true)
+    List<ProjectSettleCashFlow> findAllByProjectIdAndTimeBeforeAndEquals(int id, String time);
+
     List<ProjectSettleCashFlow> findAllByProjectId(int id);
 
     List<ProjectSettleCashFlow> findAllByTime(String time);

src/main/java/cn/palmte/work/model/ProjectSettleCostManageRepository.java

@@ -17,6 +17,9 @@ public interface ProjectSettleCostManageRepository extends JpaRepository<Project
     @Query(value = "select * from project_settle_cost_manage where project_id = ?1 and time < ?2", nativeQuery = true)
     List<ProjectSettleCostManage> findAllByProjectIdBefore(int id, String time);
 
+    @Query(value = "select * from project_settle_cost_manage where project_id = ?1 and time <= ?2", nativeQuery = true)
+    List<ProjectSettleCostManage> findAllByProjectIdAndTimeBeforeAndEquals(int id, String time);
+
     @Query(value = "select sum(cost_tax_exclude) from project_settle_cost_manage where project_id = ? and type = ?", nativeQuery = true)
     BigDecimal costTaxExcludeSum(int projectId, int type);
 

src/main/java/cn/palmte/work/model/ProjectSettleCostRepository.java

@@ -17,6 +17,9 @@ public interface ProjectSettleCostRepository extends JpaRepository<ProjectSettle
     @Query(value = "select * from project_settle_cost where project_id = ?1 and time < ?2", nativeQuery = true)
     List<ProjectSettleCost> findAllByProjectIdBefore(int id, String time);
 
+    @Query(value = "select * from project_settle_cost where project_id = ?1 and time <= ?2", nativeQuery = true)
+    List<ProjectSettleCost> findAllByProjectIdAndTimeBeforeAndEquals(int id, String time);
+
     @Query(value = "select sum(cost_tax_exclude) from project_settle_cost where project_id = ? and type = ?", nativeQuery = true)
     BigDecimal costTaxExcludeSum(int projectId, int type);
 

src/main/java/cn/palmte/work/model/ProjectSettleIncomeRepository.java

@@ -17,6 +17,9 @@ public interface ProjectSettleIncomeRepository extends JpaRepository<ProjectSett
     @Query(value = "select * from project_settle_income where project_id = ?1 and time < ?2", nativeQuery = true)
     List<ProjectSettleIncome> findAllByProjectIdBefore(int id, String time);
 
+    @Query(value = "select * from project_settle_income where project_id = ?1 and time <= ?2", nativeQuery = true)
+    List<ProjectSettleIncome> findAllByProjectIdAndTimeBeforeAndEquals(int id, String time);
+
     @Query(value = "select sum(income_tax_exclude) from project_settle_income where project_id = ? and type = ?", nativeQuery = true)
     BigDecimal incomeTaxExcludeSum(int projectId, int type);
 

src/main/java/cn/palmte/work/model/ProjectSettleProfitMarginRepository.java

@@ -16,6 +16,9 @@ public interface ProjectSettleProfitMarginRepository extends JpaRepository<Proje
     @Query(value = "select * from project_settle_profit_margin where project_id = ?1 and time < ?2", nativeQuery = true)
     List<ProjectSettleProfitMargin> findAllByProjectIdBefore(int id, String time);
 
+    @Query(value = "select * from project_settle_profit_margin where project_id = ?1 and time <= ?2", nativeQuery = true)
+    List<ProjectSettleProfitMargin> findAllByProjectIdAndTimeBeforeAndEquals(int id, String time);
+
     List<ProjectSettleProfitMargin> findAllByProjectId(int id);
 
     List<ProjectSettleProfitMargin> findAllByTime(String time);

src/main/java/cn/palmte/work/service/ProjectSettleService.java

@@ -606,6 +606,148 @@ public class ProjectSettleService {
         return settleBean;
     }
 
+    public SettleBean getMonthSettleByTime(Project project, String time) {
+        SettleBean settleBean = new SettleBean();
+        List<ProjectSettleIncome> incomes = projectSettleIncomeRepository.findAllByProjectIdAndTime(project.getId(), time);
+        if(CollectionUtil.isNotEmpty(incomes)){
+            ProjectSettleIncome projectSettleIncomeDevice = incomes.stream().filter(d -> d.getType() == ProjectSettleIncome.TYPE_DEVICE).collect(Collectors.toList()).get(0);
+            settleBean.setIncomeDevice(projectSettleIncomeDevice.getIncomeTaxExclude());
+            settleBean.setBudgetIncomeDevice(projectSettleIncomeDevice.getBudget());
+            settleBean.setEstimateIncomeDevice(projectSettleIncomeDevice.getEstimate());
+
+            ProjectSettleIncome projectSettleIncomeEngineer = incomes.stream().filter(d -> d.getType() == ProjectSettleIncome.TYPE_ENGINEER).collect(Collectors.toList()).get(0);
+            settleBean.setIncomeEngineer(projectSettleIncomeEngineer.getIncomeTaxExclude());
+            settleBean.setBudgetIncomeEngineer(projectSettleIncomeEngineer.getBudget());
+            settleBean.setEstimateIncomeEngineer(projectSettleIncomeEngineer.getEstimate());
+
+            ProjectSettleIncome projectSettleIncomeService = incomes.stream().filter(d -> d.getType() == ProjectSettleIncome.TYPE_SERVICE).collect(Collectors.toList()).get(0);
+            settleBean.setIncomeService(projectSettleIncomeService.getIncomeTaxExclude());
+            settleBean.setBudgetIncomeService(projectSettleIncomeService.getBudget());
+            settleBean.setEstimateIncomeService(projectSettleIncomeService.getEstimate());
+        }
+
+        List<ProjectSettleCost> costs = projectSettleCostRepository.findAllByProjectIdAndTime(project.getId(), time);
+        if(CollectionUtil.isNotEmpty(costs)){
+            ProjectSettleCost projectSettleCostDevice = costs.stream().filter(d -> d.getType() == ProjectSettleCost.TYPE_DEVICE).collect(Collectors.toList()).get(0);
+            settleBean.setCostPurchaseDevice(projectSettleCostDevice.getCostTaxExclude());
+            settleBean.setBudgetCostPurchaseDevice(projectSettleCostDevice.getBudget());
+            settleBean.setEstimateCostPurchaseDevice(projectSettleCostDevice.getEstimate());
+
+            ProjectSettleCost projectSettleCostBuild = costs.stream().filter(d -> d.getType() == ProjectSettleCost.TYPE_BUILDING).collect(Collectors.toList()).get(0);
+            settleBean.setCostPurchaseBuild(projectSettleCostBuild.getCostTaxExclude());
+            settleBean.setBudgetCostPurchaseBuild(projectSettleCostBuild.getBudget());
+            settleBean.setEstimateCostPurchaseBuild(projectSettleCostBuild.getEstimate());
+
+            ProjectSettleCost projectSettleCostService = costs.stream().filter(d -> d.getType() == ProjectSettleCost.TYPE_SERVICE).collect(Collectors.toList()).get(0);
+            settleBean.setCostPurchaseService(projectSettleCostService.getCostTaxExclude());
+            settleBean.setBudgetCostPurchaseService(projectSettleCostService.getBudget());
+            settleBean.setEstimateCostPurchaseService(projectSettleCostService.getEstimate());
+
+            ProjectSettleCost projectSettleCostOther = costs.stream().filter(d -> d.getType() == ProjectSettleCost.TYPE_OTHER).collect(Collectors.toList()).get(0);
+            settleBean.setCostPurchaseOther(projectSettleCostOther.getCostTaxExclude());
+            settleBean.setBudgetCostPurchaseOther(projectSettleCostOther.getBudget());
+            settleBean.setEstimateCostPurchaseOther(projectSettleCostOther.getEstimate());
+
+            ProjectSettleCost projectSettleCostProjectManage = costs.stream().filter(d -> d.getType() == ProjectSettleCost.TYPE_PROJECT_MANAGE).collect(Collectors.toList()).get(0);
+            settleBean.setCostProjectManage(projectSettleCostProjectManage.getCostTaxExclude());
+            settleBean.setBudgetCostProjectManage(projectSettleCostProjectManage.getBudget());
+            settleBean.setEstimateCostProjectManage(projectSettleCostProjectManage.getEstimate());
+
+            ProjectSettleCost projectSettleCostOtherOther = costs.stream().filter(d -> d.getType() == ProjectSettleCost.TYPE_OTHER_OTHER).collect(Collectors.toList()).get(0);
+            settleBean.setCostOther(projectSettleCostOtherOther.getCostTaxExclude());
+            settleBean.setBudgetCostOther(projectSettleCostOtherOther.getBudget());
+            settleBean.setEstimateCostOther(projectSettleCostOtherOther.getEstimate());
+        }
+
+        List<ProjectSettleCostManage> costManages = projectSettleCostManageRepository.findAllByProjectIdAndTime(project.getId(), time);
+        if(CollectionUtil.isNotEmpty(costManages)){
+            ProjectSettleCostManage costManageExpropriation = costManages.stream().filter(d -> d.getType() == ProjectSettleCostManage.TYPE_EXPROPRIATION).collect(Collectors.toList()).get(0);
+            settleBean.setCostExpropriation(costManageExpropriation.getCostTaxExclude());
+            settleBean.setEstimateCostExpropriation(costManageExpropriation.getEstimate());
+            settleBean.setBudgetCostExpropriation(costManageExpropriation.getBudget());
+
+            ProjectSettleCostManage costManageCompany = costManages.stream().filter(d -> d.getType() == ProjectSettleCostManage.TYPE_COMPANY_MANAGE).collect(Collectors.toList()).get(0);
+            settleBean.setCostCompanyManage(costManageCompany.getCostTaxExclude());
+            settleBean.setEstimateCostCompanyManage(costManageCompany.getEstimate());
+            settleBean.setBudgetCostCompanyManage(costManageCompany.getBudget());
+
+            ProjectSettleCostManage costIncomeTax = costManages.stream().filter(d -> d.getType() == ProjectSettleCostManage.TYPE_INCOME_TAX).collect(Collectors.toList()).get(0);
+            settleBean.setCostIncomeTax(costIncomeTax.getCostTaxExclude());
+        }
+
+        List<ProjectSettleProfitMargin> profitMargins = projectSettleProfitMarginRepository.findAllByProjectIdAndTime(project.getId(), time);
+        if(CollectionUtil.isNotEmpty(profitMargins)){
+            ProjectSettleProfitMargin grossProfit = profitMargins.stream().filter(d -> d.getType() == ProjectSettleProfitMargin.TYPE_GROSS_PROFIT).collect(Collectors.toList()).get(0);
+            settleBean.setGrossProfit(grossProfit.getAmount());
+            settleBean.setEstimateGrossProfit(grossProfit.getEstimate());
+            settleBean.setBudgetGrossProfit(grossProfit.getBudget());
+
+            ProjectSettleProfitMargin contributionProfit = profitMargins.stream().filter(d -> d.getType() == ProjectSettleProfitMargin.TYPE_CONTRIBUTION_PROFIT).collect(Collectors.toList()).get(0);
+            settleBean.setContributionProfit(contributionProfit.getAmount());
+            settleBean.setEstimateContributionProfit(contributionProfit.getEstimate());
+            settleBean.setBudgetContributionProfit(contributionProfit.getBudget());
+
+            ProjectSettleProfitMargin netProfit = profitMargins.stream().filter(d -> d.getType() == ProjectSettleProfitMargin.TYPE_NET_PROFIT).collect(Collectors.toList()).get(0);
+            settleBean.setNetProfit(netProfit.getAmount());
+        }
+
+        List<ProjectSettleCashFlow> cashFlows = projectSettleCashFlowRepository.findAllByProjectIdAndTime(project.getId(), time);
+        if(CollectionUtil.isNotEmpty(cashFlows)){
+            ProjectSettleCashFlow saleIncomeCash = cashFlows.stream().filter(d -> d.getType() == ProjectSettleCashFlow.SALE_INCOME_CASH).collect(Collectors.toList()).get(0);
+            settleBean.setSaleIncomeCash(saleIncomeCash.getAmount());
+            settleBean.setBudgetSaleIncomeCash(saleIncomeCash.getBudget());
+
+            ProjectSettleCashFlow taxReturn = cashFlows.stream().filter(d -> d.getType() == ProjectSettleCashFlow.TAX_RETURN).collect(Collectors.toList()).get(0);
+            settleBean.setTaxReturn(taxReturn.getAmount());
+
+            ProjectSettleCashFlow earnestMoneyIncome = cashFlows.stream().filter(d -> d.getType() == ProjectSettleCashFlow.EARNEST_MONEY_INCOME).collect(Collectors.toList()).get(0);
+            settleBean.setEarnestMoneyIncome(earnestMoneyIncome.getAmount());
+            settleBean.setBudgetEarnestMoneyIncome(earnestMoneyIncome.getBudget());
+
+            ProjectSettleCashFlow purchaseCost = cashFlows.stream().filter(d -> d.getType() == ProjectSettleCashFlow.PURCHASE_COST).collect(Collectors.toList()).get(0);
+            settleBean.setPurchaseCost(purchaseCost.getAmount());
+            settleBean.setBudgetPurchaseCost(purchaseCost.getBudget());
+
+            ProjectSettleCashFlow taxCost = cashFlows.stream().filter(d -> d.getType() == ProjectSettleCashFlow.TAX_COST).collect(Collectors.toList()).get(0);
+            settleBean.setTaxCost(taxCost.getAmount());
+
+            ProjectSettleCashFlow earnestMoneyCost = cashFlows.stream().filter(d -> d.getType() == ProjectSettleCashFlow.EARNEST_MONEY_COST).collect(Collectors.toList()).get(0);
+            settleBean.setEarnestMoneyCost(earnestMoneyCost.getAmount());
+            settleBean.setBudgetEarnestMoneyCost(earnestMoneyCost.getBudget());
+
+            ProjectSettleCashFlow netCashFlow = cashFlows.stream().filter(d -> d.getType() == ProjectSettleCashFlow.NET_CASH_FLOW).collect(Collectors.toList()).get(0);
+            settleBean.setNetCashFlow(netCashFlow.getAmount());
+            settleBean.setBudgetNetCashFlow(netCashFlow.getBudget());
+
+            ProjectSettleCashFlow cashInflowFromInvestingActivities = cashFlows.stream().filter(d -> d.getType() == ProjectSettleCashFlow.CASH_INFLOW_FROM_INVESTING_ACTIVITIES).collect(Collectors.toList()).get(0);
+            settleBean.setCashInflowFromInvestingActivities(cashInflowFromInvestingActivities.getAmount());
+
+            ProjectSettleCashFlow cashOutflowFromInvestingActivities = cashFlows.stream().filter(d -> d.getType() == ProjectSettleCashFlow.CASH_OUTFLOW_FROM_INVESTING_ACTIVITIES).collect(Collectors.toList()).get(0);
+            settleBean.setCashOutflowFromInvestingActivities(cashOutflowFromInvestingActivities.getAmount());
+
+            ProjectSettleCashFlow netCashFromInvestingActivities = cashFlows.stream().filter(d -> d.getType() == ProjectSettleCashFlow.NET_CASH_FROM_INVESTING_ACTIVITIES).collect(Collectors.toList()).get(0);
+            settleBean.setNetCashFromInvestingActivities(netCashFromInvestingActivities.getAmount());
+
+            ProjectSettleCashFlow financingCapitalInflow = cashFlows.stream().filter(d -> d.getType() == ProjectSettleCashFlow.FINANCING_CAPITAL_INFLOW).collect(Collectors.toList()).get(0);
+            settleBean.setFinancingCapitalInflow(financingCapitalInflow.getAmount());
+            settleBean.setBudgetFinancingCapitalInflow(financingCapitalInflow.getBudget());
+
+            ProjectSettleCashFlow financingCapitalOutflow = cashFlows.stream().filter(d -> d.getType() == ProjectSettleCashFlow.FINANCING_CAPITAL_OUTFLOW).collect(Collectors.toList()).get(0);
+            settleBean.setFinancingCapitalOutflow(financingCapitalOutflow.getAmount());
+            settleBean.setBudgetFinancingCapitalOutflow(financingCapitalOutflow.getBudget());
+
+            ProjectSettleCashFlow financingCapitalCashflow = cashFlows.stream().filter(d -> d.getType() == ProjectSettleCashFlow.FINANCING_CAPITAL_CASHFLOW).collect(Collectors.toList()).get(0);
+            settleBean.setFinancingCapitalCashflow(financingCapitalCashflow.getAmount());
+            settleBean.setBudgetFinancingCapitalCashflow(financingCapitalCashflow.getBudget());
+
+            ProjectSettleCashFlow netIncreaseMonetaryFunds = cashFlows.stream().filter(d -> d.getType() == ProjectSettleCashFlow.NET_INCREASE_MONETARY_FUNDS).collect(Collectors.toList()).get(0);
+            settleBean.setNetIncreaseMonetaryFunds(netIncreaseMonetaryFunds.getAmount());
+            settleBean.setBudgetNetIncreaseMonetaryFunds(netIncreaseMonetaryFunds.getBudget());
+        }
+
+        return settleBean;
+    }
+
     public FormerBean getCurrentSettle(Project project, String time) {
         FormerBean settleBean = new FormerBean();
         List<ProjectSettleIncome> incomes = projectSettleIncomeRepository.findAllByProjectId(project.getId());
@@ -737,4 +879,29 @@ public class ProjectSettleService {
         }
         return settleBean;
     }
+
+    public FormerBean getCurrentSettleBytime(Project project, String time) {
+        FormerBean settleBean = new FormerBean();
+        List<ProjectSettleIncome> incomes = projectSettleIncomeRepository.findAllByProjectIdAndTimeBeforeAndEquals(project.getId(),time);
+
+        getIncomeFormerSettle(settleBean, incomes);
+
+        List<ProjectSettleCost> costs = projectSettleCostRepository.findAllByProjectIdAndTimeBeforeAndEquals(project.getId(),time);
+
+        getCostFormerSettle(settleBean, costs);
+
+        List<ProjectSettleCostManage> manages = projectSettleCostManageRepository.findAllByProjectIdAndTimeBeforeAndEquals(project.getId(),time);
+
+        getCostManageFormerSettle(settleBean, manages);
+
+        List<ProjectSettleProfitMargin> profits = projectSettleProfitMarginRepository.findAllByProjectIdAndTimeBeforeAndEquals(project.getId(),time);
+
+        getProfitFormerSettle(settleBean, profits);
+
+        List<ProjectSettleCashFlow> cashFlows = projectSettleCashFlowRepository.findAllByProjectIdAndTimeBeforeAndEquals(project.getId(),time);
+
+        getCashFlowFormerSettle(settleBean, cashFlows);
+
+        return settleBean;
+    }
 }

src/main/resources/templates/admin/project_approve.ftl

@@ -228,14 +228,14 @@
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
                             <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">华智产品金额</div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>${Utils.format(project.huazhiProductAmount)}</span>元
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
                             <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">紫光其他产品金额</div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <span>${Utils.format(project.ziguangOtherAmount)}</span>元
                                 </div>
@@ -665,8 +665,8 @@
                                 <tr>
                                     <td>收入</td>
                                     <td>设备类</td>
-                                    <td><input name="incomeDeviceEstimateTotal" type="number" value="${Utils.format(estimateBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类概算总额"></td>
-                                    <td><input name="incomeDeviceBudgetTotal" type="number" value="${Utils.format(budgetBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类预算总额"></td>
+                                    <td><input name="incomeDeviceEstimateTotal" type="number" value="${Utils.format(monthBean.estimateIncomeDevice,'0')}" required readonly title="设备类概算总额"></td>
+                                    <td><input name="incomeDeviceBudgetTotal" type="number" value="${Utils.format(monthBean.budgetIncomeDevice,'0')}" required readonly title="设备类预算总额"></td>
                                     <td><input name="incomeDeviceFormerSettleTotal" type="number" value="${Utils.format(formerBean.incomeDeviceTaxExclude,'0')}" required readonly title="设备类上月结算总额"></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeDevice" value="${Utils.format(monthBean.incomeDevice,'0')}" readonly required title="本月结算金额"></td>
                                     <td><input type="number" name="incomeDeviceSettleTotal" value="${Utils.format(currentBean.incomeDeviceTaxExclude,'0')}" readonly title="设备类结算总额"></td>
@@ -674,8 +674,8 @@
                                 <tr>
                                     <td>收入</td>
                                     <td>工程类</td>
-                                    <td><input name="incomeEngineerEstimateTotal" type="number" value="${Utils.format(estimateBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类概算总额"></td>
-                                    <td><input name="incomeEngineerBudgetTotal" type="number" value="${Utils.format(budgetBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类预算总额"></td>
+                                    <td><input name="incomeEngineerEstimateTotal" type="number" value="${Utils.format(monthBean.estimateIncomeEngineer,'0')}" required readonly title="工程类概算总额"></td>
+                                    <td><input name="incomeEngineerBudgetTotal" type="number" value="${Utils.format(monthBean.budgetIncomeEngineer,'0')}" required readonly title="工程类预算总额"></td>
                                     <td><input name="incomeEngineerFormerSettleTotal" type="number" value="${Utils.format(formerBean.incomeEngineerTaxExclude,'0')}" required readonly title="工程类上月结算总额"></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeEngineer" value="${Utils.format(monthBean.incomeEngineer,'0')}" readonly required title="工程类本月结算金额"></td>
                                     <td><input type="number" name="incomeEngineerSettleTotal" value="${Utils.format(currentBean.incomeEngineerTaxExclude,'0')}" readonly title="工程类结算总额"></td>
@@ -683,8 +683,8 @@
                                 <tr>
                                     <td>收入</td>
                                     <td>服务类</td>
-                                    <td><input name="incomeServiceEstimateTotal" type="number" value="${Utils.format(estimateBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类概算总额"></td>
-                                    <td><input name="incomeServiceBudgetTotal" type="number" value="${Utils.format(budgetBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类预算总额"></td>
+                                    <td><input name="incomeServiceEstimateTotal" type="number" value="${Utils.format(monthBean.estimateIncomeService,'0')}" required readonly title="服务类概算总额"></td>
+                                    <td><input name="incomeServiceBudgetTotal" type="number" value="${Utils.format(monthBean.budgetIncomeService,'0')}" required readonly title="服务类预算总额"></td>
                                     <td><input name="incomeServiceFormerSettleTotal" type="number" value="${Utils.format(formerBean.incomeServiceTaxExclude,'0')}" required readonly title="服务类上月结算总额"></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeService" value="${Utils.format(monthBean.incomeService,'0')}" readonly required title="服务类本月结算金额"></td>
                                     <td><input type="number" name="incomeServiceSettleTotal" value="${Utils.format(currentBean.incomeServiceTaxExclude,'0')}" readonly title="服务类结算总额"></td>
@@ -692,8 +692,8 @@
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
-                                    <td><input name="incomeEstimateTotal" type="number" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
-                                    <td><input name="incomeBudgetTotal" type="number"  value="${Utils.format(budgetBean.getIncomeTotalTaxExclude(),'0')}" readonly required title="此列累计"></td>
+                                    <td><input name="incomeEstimateTotal" type="number" value="${Utils.format(monthBean.getEstimateIncomeTotal(),'0')}" readonly required title="此列累计"></td>
+                                    <td><input name="incomeBudgetTotal" type="number"  value="${Utils.format(monthBean.getBudgetIncomeTotal(),'0')}" readonly required title="此列累计"></td>
                                     <td><input name="incomeFormerSettleTotal" type="number" value="${Utils.format(formerBean.getIncomeTotalTaxExclude(),'0')}" required readonly title="此列累计"></td>
                                     <td><input type="number" name="incomeTotal" value="${Utils.format(monthBean.getIncomeTotal(),'0')}" readonly title="此列累计"></td>
                                     <td><input type="number" name="incomeSettleTotal" value="${Utils.format(currentBean.getIncomeTotalTaxExclude(),'0')}" readonly title="此列累计"></td>
@@ -717,8 +717,8 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>设备</td>
-                                    <td><input name="costPurchaseDeviceEstimateTotal" type="number" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备概算总额"></td>
-                                    <td><input name="costPurchaseDeviceBudgetTotal" type="number" value="${Utils.format(budgetBean.costPurchaseDeviceTaxExclude,'0')}" readonly required title="购买设备预算总额"></td>
+                                    <td><input name="costPurchaseDeviceEstimateTotal" type="number" value="${Utils.format(monthBean.estimateCostPurchaseDevice,'0')}" readonly required title="购买设备概算总额"></td>
+                                    <td><input name="costPurchaseDeviceBudgetTotal" type="number" value="${Utils.format(monthBean.budgetCostPurchaseDevice,'0')}" readonly required title="购买设备预算总额"></td>
                                     <td><input name="costPurchaseDeviceFormerSettleTotal" type="number" value="${Utils.format(formerBean.costPurchaseDeviceTaxExclude,'0')}" required readonly title="购买设备上月结算总额"></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseDevice" value="${Utils.format(monthBean.costPurchaseDevice,'0')}" readonly required title="购买设备本月结算总额"></td>
                                     <td><input type="number" name="costPurchaseDeviceSettleTotal" value="${Utils.format(currentBean.costPurchaseDeviceTaxExclude,'0')}" readonly title="购买设备结算总额"></td>
@@ -727,8 +727,8 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>施工</td>
-                                    <td><input name="costPurchaseBuildEstimateTotal" type="number" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本概算总额"></td>
-                                    <td><input name="costPurchaseBuildBudgetTotal" type="number" value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}" readonly required title="施工采购成本预算总额"></td>
+                                    <td><input name="costPurchaseBuildEstimateTotal" type="number" value="${Utils.format(monthBean.estimateCostPurchaseBuild,'0')}" readonly required title="施工采购成本概算总额"></td>
+                                    <td><input name="costPurchaseBuildBudgetTotal" type="number" value="${Utils.format(monthBean.budgetCostPurchaseBuild,'0')}" readonly required title="施工采购成本预算总额"></td>
                                     <td><input name="costPurchaseBuildFormerSettleTotal" type="number" value="${Utils.format(formerBean.costPurchaseBuildTaxExclude,'0')}" required readonly title="施工采购成本上月结算总额"></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseBuild" value="${Utils.format(monthBean.costPurchaseBuild,'0')}" readonly required title="施工采购成本本月结算金额"></td>
                                     <td><input type="number" name="costPurchaseBuildSettleTotal" value="${Utils.format(currentBean.costPurchaseBuildTaxExclude,'0')}" readonly title="施工采购成本结算总额"></td>
@@ -737,8 +737,8 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>服务</td>
-                                    <td><input name="costPurchaseServiceEstimateTotal" type="number" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本概算总额"></td>
-                                    <td><input name="costPurchaseServiceBudgetTotal" type="number" value="${Utils.format(budgetBean.costPurchaseServiceTaxExclude,'0')}" readonly required title="服务采购成本预算总额"></td>
+                                    <td><input name="costPurchaseServiceEstimateTotal" type="number" value="${Utils.format(monthBean.estimateCostPurchaseService,'0')}" readonly required title="服务采购成本概算总额"></td>
+                                    <td><input name="costPurchaseServiceBudgetTotal" type="number" value="${Utils.format(monthBean.budgetCostPurchaseService,'0')}" readonly required title="服务采购成本预算总额"></td>
                                     <td><input name="costPurchaseServiceFormerSettleTotal" type="number" value="${Utils.format(formerBean.costPurchaseServiceTaxExclude,'0')}" required readonly title="服务采购成本上月结算总额"></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseService" value="${Utils.format(monthBean.costPurchaseService,'0')}" readonly required title="服务采购成本本月结算金额"></td>
                                     <td><input type="number" name="costPurchaseServiceSettleTotal" value="${Utils.format(currentBean.costPurchaseServiceTaxExclude,'0')}" readonly title="服务采购成本结算总额"></td>
@@ -747,8 +747,8 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>其他</td>
-                                    <td><input name="costPurchaseOtherEstimateTotal" type="number" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude,'0')}" readonly required title="其他采购成本概算总额"></td>
-                                    <td><input name="costPurchaseOtherBudgetTotal" type="number" value="${Utils.format(budgetBean.costPurchaseOtherTaxExclude,'0')}" readonly required title="其他采购成本预算总额"></td>
+                                    <td><input name="costPurchaseOtherEstimateTotal" type="number" value="${Utils.format(monthBean.estimateCostPurchaseOther,'0')}" readonly required title="其他采购成本概算总额"></td>
+                                    <td><input name="costPurchaseOtherBudgetTotal" type="number" value="${Utils.format(monthBean.budgetCostPurchaseOther,'0')}" readonly required title="其他采购成本预算总额"></td>
                                     <td><input name="costPurchaseOtherFormerSettleTotal" type="number" value="${Utils.format(formerBean.costPurchaseOtherTaxExclude,'0')}" required readonly title="其他采购成本上月结算总额"></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseOther" value="${Utils.format(monthBean.costPurchaseOther,'0')}" readonly required title="其他采购成本本月结算金额"></td>
                                     <td><input type="number" name="costPurchaseOtherSettleTotal" value="${Utils.format(currentBean.costPurchaseOtherTaxExclude,'0')}" readonly title="其他采购成本结算总额"></td>
@@ -757,8 +757,8 @@
                                     <td>成本</td>
                                     <td>项目管理成本</td>
                                     <td>项目管理成本</td>
-                                    <td><input name="costProjectManageEstimateTotal" type="number" value="${Utils.format(estimateBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本概算总额"></td>
-                                    <td><input name="costProjectManageBudgetTotal" type="number" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本预算总额"></td>
+                                    <td><input name="costProjectManageEstimateTotal" type="number" value="${Utils.format(monthBean.estimateCostProjectManage,'0')}" readonly required title="项目管理成本概算总额"></td>
+                                    <td><input name="costProjectManageBudgetTotal" type="number" value="${Utils.format(monthBean.budgetCostProjectManage,'0')}" readonly required title="项目管理成本预算总额"></td>
                                     <td><input name="costProjectManageFormerSettleTotal" type="number" value="${Utils.format(formerBean.costProjectManageTaxExclude,'0')}" required readonly title="项目管理成本上月结算总额"></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costProjectManage" value="${Utils.format(monthBean.costProjectManage,'0')}" readonly required title="项目管理成本本月结算金额"></td>
                                     <td><input type="number" name="costProjectManageSettleTotal" value="${Utils.format(currentBean.costProjectManageTaxExclude,'0')}" readonly title="项目管理成本结算总额"></td>
@@ -767,8 +767,8 @@
                                     <td>成本</td>
                                     <td>其他</td>
                                     <td>其他</td>
-                                    <td><input name="costOtherEstimateTotal" type="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
-                                    <td><input name="costOtherBudgetTotal" type="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
+                                    <td><input name="costOtherEstimateTotal" type="number" value="${Utils.format(monthBean.estimateCostOther,'0')}" readonly required title="其他成本概算总额"></td>
+                                    <td><input name="costOtherBudgetTotal" type="number" value="${Utils.format(monthBean.budgetCostOther,'0')}" readonly required title="其他成本预算总额"></td>
                                     <td><input name="costOtherFormerSettleTotal" type="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0')}" required readonly title="其他成本上月结算总额"></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOther" value="${Utils.format(monthBean.costOther,'0')}" required readonly title="其他成本本月结算金额"></td>
                                     <td><input type="number" name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0')}" readonly title="其他成本结算总额"></td>
@@ -777,8 +777,8 @@
                                     <td>合计</td>
                                     <td></td>
                                     <td></td>
-                                    <td><input name="costEstimateTotal" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
-                                    <td><input name="costBudgetTotal" value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
+                                    <td><input name="costEstimateTotal" value="${Utils.format(monthBean.getEstimateCostTotal(),'0')}" type="number" readonly required title="此列累计"></td>
+                                    <td><input name="costBudgetTotal" value="${Utils.format(monthBean.getBudgetCostTotal(),'0')}" type="number" readonly required title="此列累计"></td>
                                     <td><input name="costFormerSettleTotal" type="number" value="${Utils.format(formerBean.getCostTotalTaxExclude(),'0')}" required readonly title="此列累计"></td>
                                     <td><input type="number" name="costTotal" value="${Utils.format(monthBean.getCostTotal(),'0')}" readonly title="此列累计"></td>
                                     <td><input type="number" name="costSettleTotal" value="${Utils.format(currentBean.getCostTotalTaxExclude(),'0')}" readonly title="此列累计"></td>
@@ -800,8 +800,8 @@
                                 <tr>
                                     <td>财务费用</td>
                                     <td>资金占用成本</td>
-                                    <td><input name="costExpropriationEstimateTotal" type="number" value="${Utils.format(estimateBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本概算总额"></td>
-                                    <td><input name="costExpropriationBudgetTotal" type="number" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本预算总额"></td>
+                                    <td><input name="costExpropriationEstimateTotal" type="number" value="${Utils.format(monthBean.estimateCostExpropriation,'0')}" required readonly title="资金占用成本概算总额"></td>
+                                    <td><input name="costExpropriationBudgetTotal" type="number" value="${Utils.format(monthBean.budgetCostExpropriation,'0')}" required readonly title="资金占用成本预算总额"></td>
                                     <td><input name="costExpropriationFormerSettleTotal" type="number" value="${Utils.format(formerBean.costExpropriationTaxExclude,'0')}" required readonly title="资金占用成本上月结算总额"></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costExpropriation" value="${Utils.format(monthBean.costExpropriation,'0')}" readonly required title="资金占用成本本月结算金额"></td>
                                     <td><input type="number" name="costExpropriationSettleTotal" value="${Utils.format(currentBean.costExpropriationTaxExclude,'0')}" readonly title="资金占用成本结算总额"></td>
@@ -809,8 +809,8 @@
                                 <tr>
                                     <td>公司管理费用</td>
                                     <td></td>
-                                    <td><input name="costCompanyManageEstimateTotal" type="number" value="${Utils.format(estimateBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用概算总额"></td>
-                                    <td><input name="costCompanyManageBudgetTotal" type="number" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用预算总额"></td>
+                                    <td><input name="costCompanyManageEstimateTotal" type="number" value="${Utils.format(monthBean.estimateCostCompanyManage,'0')}" required readonly title="公司管理费用概算总额"></td>
+                                    <td><input name="costCompanyManageBudgetTotal" type="number" value="${Utils.format(monthBean.budgetCostCompanyManage,'0')}" required readonly title="公司管理费用预算总额"></td>
                                     <td><input name="costCompanyManageFormerSettleTotal" type="number" value="${Utils.format(formerBean.costCompanyManageTaxExclude,'0')}" required readonly title="公司管理费用上月结算总额"></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costCompanyManage" value="${Utils.format(monthBean.costCompanyManage,'0')}" readonly required title="公司管理费用本月结算金额"></td>
                                     <td><input type="number" name="costCompanyManageSettleTotal" value="${Utils.format(currentBean.costCompanyManageTaxExclude,'0')}" readonly title="公司管理费用结算总额"></td>
@@ -827,8 +827,8 @@
                                 <tr>
                                     <td>合计</td>
                                     <td></td>
-                                    <td><input name="costManageEstimateTotal" value="${Utils.format(estimateBean.costExpropriationTaxExclude + estimateBean.costCompanyManageTaxExclude,'0')}" type="number" readonly required title="此列累计"></td>
-                                    <td><input name="costManageBudgetTotal" value="${Utils.format(budgetBean.costExpropriationTaxExclude + budgetBean.costCompanyManageTaxExclude,'0')}" type="number" readonly required title="此列累计"></td>
+                                    <td><input name="costManageEstimateTotal" value="${Utils.format(monthBean.getEstimateCostManageTotal(),'0')}" type="number" readonly required title="此列累计"></td>
+                                    <td><input name="costManageBudgetTotal" value="${Utils.format(monthBean.getBudgetCostManageTotal(),'0')}" type="number" readonly required title="此列累计"></td>
                                     <td><input name="costManageFormerSettleTotal" type="number" value="${Utils.format(formerBean.getCostManageTotal(),'0')}" required readonly title="此列累计"></td>
                                     <td><input type="number" name="costManageTotal" value="${Utils.format(monthBean.getCostManageTotal(),'0')}" readonly title="此列累计"></td>
                                     <td><input type="number" name="costManageSettleTotal" value="${Utils.format(currentBean.getCostManageTotal(),'0')}" readonly title="此列累计"></td>
@@ -850,8 +850,8 @@
                                 </tr>
                                 <tr>
                                     <td>项目毛利</td>
-                                    <td><input name="grossProfitEstimateTotal" type="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0')}" required readonly title="项目毛利概算总额"></td>
-                                    <td><input name="grossProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0')}" required readonly title="项目毛利预算总额"></td>
+                                    <td><input name="grossProfitEstimateTotal" type="number" value="${Utils.format(monthBean.estimateGrossProfit,'0')}" required readonly title="项目毛利概算总额"></td>
+                                    <td><input name="grossProfitBudgetTotal" type="number" value="${Utils.format(monthBean.budgetGrossProfit,'0')}" required readonly title="项目毛利预算总额"></td>
                                     <td><input name="grossProfitFormerSettleTotal" type="number" value="${Utils.format(formerBean.grossProfit,'0')}" required readonly title="项目毛利上月结算总额"></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="grossProfit" value="${Utils.format(monthBean.grossProfit,'0')}" readonly required title="项目毛利本月结算金额"></td>
                                     <td><input type="number" name="grossProfitSettleTotal" value="${Utils.format(currentBean.grossProfit,'0')}" readonly title="项目毛利结算总额"></td>
@@ -859,8 +859,8 @@
                                 </tr>
                                 <tr>
                                     <td>项目贡献利润</td>
-                                    <td><input name="contributionProfitEstimateTotal" type="number" value="${Utils.format(estimateBean.getProjectContributionProfit(),'0')}" required readonly title="项目贡献利润概算总额"></td>
-                                    <td><input name="contributionProfitBudgetTotal" type="number" value="${Utils.format(budgetBean.getProjectContributionProfit(),'0')}" required readonly title="项目贡献利润预算总额"></td>
+                                    <td><input name="contributionProfitEstimateTotal" type="number" value="${Utils.format(monthBean.estimateContributionProfit,'0')}" required readonly title="项目贡献利润概算总额"></td>
+                                    <td><input name="contributionProfitBudgetTotal" type="number" value="${Utils.format(monthBean.budgetContributionProfit,'0')}" required readonly title="项目贡献利润预算总额"></td>
                                     <td><input name="contributionProfitFormerSettleTotal" type="number" value="${Utils.format(formerBean.contributionProfit,'0')}" required readonly title="项目贡献利润上月结算总额"></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="contributionProfit" value="${Utils.format(monthBean.contributionProfit,'0')}" required readonly title="项目贡献利润本月结算金额"></td>
                                     <td><input type="number" name="contributionProfitSettleTotal" value="${Utils.format(currentBean.contributionProfit,'0')}" readonly title="项目贡献利润结算总额"></td>
@@ -890,7 +890,7 @@
                                 </tr>
                                 <tr>
                                     <td>销售商品、提供劳务收到的现金</td>
-                                    <td><input name="saleIncomeCashBudget" type="number" value="${Utils.format(cashFlowBean.saleIncomeCash,'0')}" readonly required title="预算总额"></td>
+                                    <td><input name="saleIncomeCashBudget" type="number" value="${Utils.format(monthBean.budgetSaleIncomeCash,'0')}" readonly required title="预算总额"></td>
                                     <td><input name="saleIncomeCashFormerSettle" type="number" value="${Utils.format(formerBean.saleIncomeCash,'0')}" required readonly title="上月结算总额"></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="saleIncomeCash" value="${Utils.format(monthBean.saleIncomeCash,'0')}" required readonly title="本月结算金额"></td>
                                     <td><input name="saleIncomeCashSettle" type="number" value="${Utils.format(currentBean.saleIncomeCash,'0')}" readonly title="结算总额"></td>
@@ -904,14 +904,14 @@
                                 </tr>
                                 <tr>
                                     <td>收到其他与经营活动有关的现金</td>
-                                    <td><input name="earnestMoneyIncomeBudget" type="number" value="${Utils.format(cashFlowBean.earnestMoneyIncome,'0')}" readonly required title="预算总额"></td>
+                                    <td><input name="earnestMoneyIncomeBudget" type="number" value="${Utils.format(monthBean.budgetEarnestMoneyIncome,'0')}" readonly required title="预算总额"></td>
                                     <td><input name="earnestMoneyIncomeFormerSettle" type="number" value="${Utils.format(formerBean.earnestMoneyIncome,'0')}" required readonly title="上月结算总额"></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="earnestMoneyIncome" value="${Utils.format(monthBean.earnestMoneyIncome,'0')}" readonly required title="本月结算金额"></td>
                                     <td><input name="earnestMoneyIncomeSettle" type="number" value="${Utils.format(currentBean.earnestMoneyIncome,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>购买商品、接受劳务支付的现金</td>
-                                    <td><input name="purchaseCostBudget" type="number" value="${Utils.format(cashFlowBean.purchaseCost,'0')}" readonly required title="预算总额"></td>
+                                    <td><input name="purchaseCostBudget" type="number" value="${Utils.format(monthBean.budgetPurchaseCost,'0')}" readonly required title="预算总额"></td>
                                     <td><input name="purchaseCostFormerSettle" type="number" value="${Utils.format(formerBean.purchaseCost,'0')}" required readonly title="上月结算总额"></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="purchaseCost" value="${Utils.format(monthBean.purchaseCost,'0')}" required readonly title="本月结算金额"></td>
                                     <td><input name="purchaseCostSettle" type="number" value="${Utils.format(currentBean.purchaseCost,'0')}" readonly title="结算总额"></td>
@@ -925,14 +925,14 @@
                                 </tr>
                                 <tr>
                                     <td>支付其他与经营活动有关的现金</td>
-                                    <td><input name="earnestMoneyCostBudget" type="number" value="${Utils.format(cashFlowBean.earnestMoneyCost,'0')}" readonly required title="预算总额"></td>
+                                    <td><input name="earnestMoneyCostBudget" type="number" value="${Utils.format(monthBean.budgetEarnestMoneyCost,'0')}" readonly required title="预算总额"></td>
                                     <td><input name="earnestMoneyCostFormerSettle" type="number" value="${Utils.format(formerBean.earnestMoneyCost,'0')}" required readonly title="上月结算总额"></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="earnestMoneyCost" value="${Utils.format(monthBean.earnestMoneyCost,'0')}" readonly required title="本月结算金额"></td>
                                     <td><input name="earnestMoneyCostSettle" type="number" value="${Utils.format(currentBean.earnestMoneyCost,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>经营活动产生的现金流量净额</td>
-                                    <td><input name="netCashFlowBudget" type="number" value="${Utils.format(cashFlowBean.getNetCashFlow(),'0')}" readonly required title="预算总额"></td>
+                                    <td><input name="netCashFlowBudget" type="number" value="${Utils.format(monthBean.budgetNetCashFlow,'0')}" readonly required title="预算总额"></td>
                                     <td><input name="netCashFlowFormerSettle" type="number" value="${Utils.format(formerBean.netCashFlow,'0')}" required readonly title="上月结算总额"></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="netCashFlow" value="${Utils.format(monthBean.netCashFlow,'0')}" required readonly title="本月结算金额"></td>
                                     <td><input name="netCashFlowSettle" type="number" value="${Utils.format(currentBean.netCashFlow,'0')}" readonly title="结算总额"></td>
@@ -960,28 +960,28 @@
                                 </tr>
                                 <tr>
                                     <td>融资资金流入</td>
-                                    <td><input name="financingCapitalInflowBudget" type="number" value="${Utils.format(cashFlowBean.financingCapitalInflow,'0')}" readonly required title="预算总额"></td>
+                                    <td><input name="financingCapitalInflowBudget" type="number" value="${Utils.format(monthBean.budgetFinancingCapitalInflow,'0')}" readonly required title="预算总额"></td>
                                     <td><input name="financingCapitalInflowFormerSettle" type="number" value="${Utils.format(formerBean.financingCapitalInflow,'0')}" required readonly title="上月结算总额"></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="financingCapitalInflow" value="${Utils.format(monthBean.financingCapitalInflow,'0')}" required readonly title="本月结算金额"></td>
                                     <td><input name="financingCapitalInflowSettle" type="number" value="${Utils.format(currentBean.financingCapitalInflow,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>还款资金流出</td>
-                                    <td><input name="financingCapitalOutflowBudget" type="number" value="${Utils.format(cashFlowBean.financingCapitalOutflow,'0')}" readonly required title="预算总额"></td>
+                                    <td><input name="financingCapitalOutflowBudget" type="number" value="${Utils.format(monthBean.budgetFinancingCapitalOutflow,'0')}" readonly required title="预算总额"></td>
                                     <td><input name="financingCapitalOutflowFormerSettle" type="number" value="${Utils.format(formerBean.financingCapitalOutflow,'0')}" required readonly title="上月结算总额"></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="financingCapitalOutflow" value="${Utils.format(monthBean.financingCapitalOutflow,'0')}" required readonly title="本月结算金额"></td>
                                     <td><input name="financingCapitalOutflowSettle" type="number" value="${Utils.format(currentBean.financingCapitalOutflow,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>筹资活动产生的现金流量净额</td>
-                                    <td><input name="financingCapitalCashflowBudget" type="number" value="${Utils.format(cashFlowBean.getFinancingCapitalCashflow(),'0')}" readonly required title="预算总额"></td>
+                                    <td><input name="financingCapitalCashflowBudget" type="number" value="${Utils.format(monthBean.budgetFinancingCapitalCashflow,'0')}" readonly required title="预算总额"></td>
                                     <td><input name="financingCapitalCashflowFormerSettle" type="number" value="${Utils.format(formerBean.financingCapitalCashflow,'0')}" required readonly title="上月结算总额"></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="financingCapitalCashflow" value="${Utils.format(monthBean.financingCapitalCashflow,'0')}" required readonly title="本月结算金额"></td>
                                     <td><input name="financingCapitalCashflowSettle" type="number" value="${Utils.format(currentBean.financingCapitalCashflow,'0')}" readonly title="结算总额"></td>
                                 </tr>
                                 <tr>
                                     <td>货币资金净增加额</td>
-                                    <td><input name="netIncreaseMonetaryFundsBudget" type="number" value="${Utils.format(cashFlowBean.getNetIncreaseMonetaryFunds(),'0')}" readonly required title="预算总额"></td>
+                                    <td><input name="netIncreaseMonetaryFundsBudget" type="number" value="${Utils.format(monthBean.budgetNetIncreaseMonetaryFunds,'0')}" readonly required title="预算总额"></td>
                                     <td><input name="netIncreaseMonetaryFundsFormerSettle" type="number" value="${Utils.format(formerBean.netIncreaseMonetaryFunds,'0')}" required readonly title="上月结算总额"></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="netIncreaseMonetaryFunds" value="${Utils.format(monthBean.netIncreaseMonetaryFunds,'0')}" required readonly title="本月结算金额"></td>
                                     <td><input name="netIncreaseMonetaryFundsSettle" type="number" value="${Utils.format(currentBean.netIncreaseMonetaryFunds,'0')}" readonly title="结算总额"></td>