预算表基本保存

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

@@ -145,6 +145,15 @@ public class ProjectController extends BaseController{
         return "admin/project_budget_edit";
     }
 
+    /**
+     * 进行项目预算保存
+     */
+    @RequestMapping("/budgetEditSave")
+    public String budgetEditSave(Project project, BudgetBean budgetBean,
+                                   Map<String, Object> model) {
+        projectService.budgetEditSave(project, budgetBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_UNCOMMIT);
+        return "redirect:/project/list";
+    }
     @InitBinder
     public void initBinder(WebDataBinder webDataBinder){
         webDataBinder.addCustomFormatter(new DateFormatter("yyyy-MM-dd"));

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

@@ -0,0 +1,129 @@
+package cn.palmte.work.model;
+
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.*;
+import java.math.BigDecimal;
+
+/**
+ * 项目预算成本明细表
+ */
+@Entity
+@Table(name = "project_budget_cost_detail")
+public class ProjectBudgetCostDetail {
+    public static final int TYPE_DEVICE = 1;
+    public static final int TYPE_BUILD = 2;
+    public static final int TYPE_SERVICE = 3;
+    public static final int TYPE_OHTER = 4;
+
+    /**
+     * id
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GenericGenerator(name = "persistenceGenerator", strategy = "increment")
+    private Integer id;
+
+    @Column(name = "project_id")
+    private int projectId;
+
+    private int type;
+    private int category;
+
+    private String name;
+
+    private String unit;
+    private int amount;
+    private BigDecimal price;
+
+    @Column(name = "tax_rate")
+    private BigDecimal taxRate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public int getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(int projectId) {
+        this.projectId = projectId;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public int getCategory() {
+        return category;
+    }
+
+    public void setCategory(int category) {
+        this.category = category;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public int getAmount() {
+        return amount;
+    }
+
+    public void setAmount(int amount) {
+        this.amount = amount;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
+    public BigDecimal getTaxRate() {
+        return taxRate;
+    }
+
+    public void setTaxRate(BigDecimal taxRate) {
+        this.taxRate = taxRate;
+    }
+
+    public BigDecimal getTotalTaxInclude(){
+        if(null == price){
+            return null;
+        }
+        return price.multiply(new BigDecimal(amount));
+    }
+    public BigDecimal getTotalTaxExclude(){
+        BigDecimal totalTaxInclude = getTotalTaxInclude();
+        if(null == totalTaxInclude || taxRate == null){
+            return null;
+        }
+
+        //不含税总金额=含税总金额/（1+税率）
+        return totalTaxInclude.divide(taxRate.divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP), 2, BigDecimal.ROUND_HALF_UP);
+    }
+}

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

@@ -0,0 +1,9 @@
+package cn.palmte.work.model;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+public interface ProjectBudgetCostDetailRepository extends JpaRepository<ProjectBudgetCostDetail,Integer> {
+    List<ProjectBudgetCostDetail> findAllByProjectIdEquals(int id);
+}

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

@@ -0,0 +1,138 @@
+package cn.palmte.work.model;
+
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.*;
+import java.math.BigDecimal;
+
+/**
+ * 项目预算项目管理成本明细表
+ */
+@Entity
+@Table(name = "project_budget_cost_project_manage_detail")
+public class ProjectBudgetCostProjectManageDetail {
+    public static final int TYPE_PERSON = 1;
+    public static final int TYPE_BUSINESS = 2;
+    public static final int TYPE_OHTER = 3;
+
+    /**
+     * id
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GenericGenerator(name = "persistenceGenerator", strategy = "increment")
+    private Integer id;
+
+    @Column(name = "project_id")
+    private int projectId;
+
+    private int type;
+
+    private String name;
+    private String detail;
+
+    private String unit;
+    private int amount;
+    private BigDecimal price;
+
+    @Column(name = "predict_method")
+    private String predictMethod;
+    @Column(name = "predict_why")
+    private String predictWhy;
+    private String remark;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public int getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(int projectId) {
+        this.projectId = projectId;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public int getAmount() {
+        return amount;
+    }
+
+    public void setAmount(int amount) {
+        this.amount = amount;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+    public String getPredictMethod() {
+        return predictMethod;
+    }
+
+    public void setPredictMethod(String predictMethod) {
+        this.predictMethod = predictMethod;
+    }
+
+    public String getPredictWhy() {
+        return predictWhy;
+    }
+
+    public void setPredictWhy(String predictWhy) {
+        this.predictWhy = predictWhy;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public BigDecimal getTotal(){
+        if(null == price){
+            return null;
+        }
+        return price.multiply(new BigDecimal(amount));
+    }
+}

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

@@ -0,0 +1,9 @@
+package cn.palmte.work.model;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+public interface ProjectBudgetCostProjectManageDetailRepository extends JpaRepository<ProjectBudgetCostProjectManageDetail,Integer> {
+    List<ProjectBudgetCostProjectManageDetail> findAllByProjectIdEquals(int id);
+}

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

@@ -0,0 +1,119 @@
+package cn.palmte.work.model;
+
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.*;
+import java.math.BigDecimal;
+
+/**
+ * 项目预算收入明细表
+ */
+@Entity
+@Table(name = "project_budget_income_detail")
+public class ProjectBudgetIncomeDetail {
+    public static final int TYPE_DEVICE = 1;
+    public static final int TYPE_ENGINEER = 2;
+    public static final int TYPE_SERVICE = 3;
+
+    /**
+     * id
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GenericGenerator(name = "persistenceGenerator", strategy = "increment")
+    private Integer id;
+
+    @Column(name = "project_id")
+    private int projectId;
+
+    private int type;
+
+    private String name;
+
+    private String unit;
+    private int amount;
+    private BigDecimal price;
+
+    @Column(name = "tax_rate")
+    private BigDecimal taxRate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public int getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(int projectId) {
+        this.projectId = projectId;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public int getAmount() {
+        return amount;
+    }
+
+    public void setAmount(int amount) {
+        this.amount = amount;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
+    public BigDecimal getTaxRate() {
+        return taxRate;
+    }
+
+    public void setTaxRate(BigDecimal taxRate) {
+        this.taxRate = taxRate;
+    }
+
+    public BigDecimal getTotalTaxInclude(){
+        if(null == price){
+            return null;
+        }
+        return price.multiply(new BigDecimal(amount));
+    }
+    public BigDecimal getTotalTaxExclude(){
+        BigDecimal totalTaxInclude = getTotalTaxInclude();
+        if(null == totalTaxInclude || taxRate == null){
+            return null;
+        }
+
+        //不含税总金额=含税总金额/（1+税率）
+        return totalTaxInclude.divide(taxRate.divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP), 2, BigDecimal.ROUND_HALF_UP);
+    }
+}

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

@@ -0,0 +1,9 @@
+package cn.palmte.work.model;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+public interface ProjectBudgetIncomeDetailRepository extends JpaRepository<ProjectBudgetIncomeDetail,Integer> {
+    List<ProjectBudgetIncomeDetail> findAllByProjectIdEquals(int id);
+}

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

@@ -21,6 +21,12 @@ public class ProjectBudgetService {
     private ProjectBudgetCostRepository projectBudgetCostRepository;
     @Autowired
     private ProjectBudgetCostManageRepository projectBudgetCostManageRepository;
+    @Autowired
+    private ProjectBudgetIncomeDetailRepository projectBudgetIncomeDetailRepository;
+    @Autowired
+    private ProjectBudgetCostDetailRepository projectBudgetCostDetailRepository;
+    @Autowired
+    private ProjectBudgetCostProjectManageDetailRepository projectBudgetCostProjectManageDetailRepository;
 
 
     public void clearBudget(Project project){
@@ -194,4 +200,69 @@ public class ProjectBudgetService {
 
         return budgetBean;
     }
+
+
+    /**
+     * 清空项目的收入明细
+     */
+    public void clearBudgetIncomeDetail(Project project){
+        List<ProjectBudgetIncomeDetail> incomeDetails = projectBudgetIncomeDetailRepository.findAllByProjectIdEquals(project.getId());
+        if(CollectionUtil.isNotEmpty(incomeDetails)){
+            projectBudgetIncomeDetailRepository.deleteInBatch(incomeDetails);
+        }
+    }
+
+    /**
+     * 保存项目的收入明细
+     */
+    public void saveBudgetIncomeDetail(Project project, List<ProjectBudgetIncomeDetail> detailList){
+        if(CollectionUtil.isNotEmpty(detailList)){
+            for (ProjectBudgetIncomeDetail projectBudgetIncomeDetail : detailList) {
+                projectBudgetIncomeDetail.setProjectId(project.getId());
+            }
+            projectBudgetIncomeDetailRepository.save(detailList);
+        }
+    }
+    /**
+     * 清空项目的成本明细
+     */
+    public void clearBudgetCostDetail(Project project){
+        List<ProjectBudgetCostDetail> costDetails = projectBudgetCostDetailRepository.findAllByProjectIdEquals(project.getId());
+        if(CollectionUtil.isNotEmpty(costDetails)){
+            projectBudgetCostDetailRepository.deleteInBatch(costDetails);
+        }
+    }
+
+    /**
+     * 保存项目的成本明细
+     */
+    public void saveBudgetCostDetail(Project project, List<ProjectBudgetCostDetail> detailList){
+        if(CollectionUtil.isNotEmpty(detailList)){
+            for (ProjectBudgetCostDetail projectBudgetCostDetail : detailList) {
+                projectBudgetCostDetail.setProjectId(project.getId());
+            }
+            projectBudgetCostDetailRepository.save(detailList);
+        }
+    }
+    /**
+     * 清空项目的项目管理成本明细
+     */
+    public void clearBudgetCostProjectManageDetail(Project project){
+        List<ProjectBudgetCostProjectManageDetail> costDetails = projectBudgetCostProjectManageDetailRepository.findAllByProjectIdEquals(project.getId());
+        if(CollectionUtil.isNotEmpty(costDetails)){
+            projectBudgetCostProjectManageDetailRepository.deleteInBatch(costDetails);
+        }
+    }
+
+    /**
+     * 保存项目的项目管理成本明细
+     */
+    public void saveBudgetCostProjectManageDetail(Project project, List<ProjectBudgetCostProjectManageDetail> detailList){
+        if(CollectionUtil.isNotEmpty(detailList)){
+            for (ProjectBudgetCostProjectManageDetail projectBudgetCostProjectManageDetail : detailList) {
+                projectBudgetCostProjectManageDetail.setProjectId(project.getId());
+            }
+            projectBudgetCostProjectManageDetailRepository.save(detailList);
+        }
+    }
 }

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

@@ -1,9 +1,6 @@
 package cn.palmte.work.service;
 
-import cn.palmte.work.bean.ApproveStatusEnum;
+import cn.palmte.work.bean.*;
-import cn.palmte.work.bean.EstimateBean;
-import cn.palmte.work.bean.StatusEnum;
-import cn.palmte.work.bean.TypeEnum;
 import cn.palmte.work.model.Admin;
 import cn.palmte.work.model.Project;
 import cn.palmte.work.model.ProjectRepository;
@@ -29,6 +26,8 @@ public class ProjectService {
     private ProjectRepository projectRepository;
     @Autowired
     private ProjectEstimateService projectEstimateService;
+    @Autowired
+    private ProjectBudgetService projectBudgetService;
 
 
     private QueryHelper getQueryHelper(Map<String, String> searchInfo, int pageNumber, int pageSize) {
@@ -102,12 +101,13 @@ public class ProjectService {
     @Transactional(rollbackFor = RuntimeException.class)
     public Project estimateEditSave(Project project, EstimateBean estimateBean, Admin admin, ApproveStatusEnum approveStatusEnum) {
         Project p = editProject(project, admin, approveStatusEnum);
+        p.setApproveStatusEstimate(approveStatusEnum.getApproveStatus());
+        p = projectRepository.saveAndFlush(p);
         //清空重新保存概算信息
-        projectEstimateService.clearEstimate(project);
+        projectEstimateService.clearEstimate(p);
         projectEstimateService.saveEstimate(p, estimateBean);
         return p;
     }
-
     private Project addProject(Project project, Admin admin, ApproveStatusEnum approveStatusEnum) {
         project.setTypeDesc(TypeEnum.parseType(project.getType()).getTypeDesc());
         project.setStatus(StatusEnum.CREATED.getStatus());
@@ -144,6 +144,20 @@ public class ProjectService {
 
         p.setApproveStatusEstimate(approveStatusEnum.getApproveStatus());
 
-        return projectRepository.saveAndFlush(p);
+        return p;
+    }
+
+    /**
+     * 编辑预算保存项目
+     */
+    @Transactional(rollbackFor = RuntimeException.class)
+    public Project budgetEditSave(Project project, BudgetBean budgetBean, Admin admin, ApproveStatusEnum approveStatusEnum) {
+        Project p = editProject(project, admin, approveStatusEnum);
+        p.setApproveStatusEstimate(approveStatusEnum.getApproveStatus());
+        p = projectRepository.saveAndFlush(p);
+        //清空重新保存概算信息
+        projectBudgetService.clearBudget(p);
+        projectBudgetService.saveBudget(p, budgetBean);
+        return p;
     }
 }

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

@@ -191,26 +191,26 @@
                     <tr>
                         <td>收入</td>
                         <td>设备类</td>
-                        <td><input name="incomeDeviceTaxInclude" value="${budgetBean.incomeDeviceTaxInclude!}" required readonly></td>
+                        <td><input name="incomeDeviceTaxInclude" value="${budgetBean.incomeDeviceTaxInclude!1}" required readonly></td>
-                        <td><input name="incomeDeviceTaxExclude" value="${budgetBean.incomeDeviceTaxExclude!}" required readonly></td>
+                        <td><input name="incomeDeviceTaxExclude" value="${budgetBean.incomeDeviceTaxExclude!2}" required readonly></td>
                     </tr>
                     <tr>
                         <td>收入</td>
                         <td>工程类</td>
-                        <td><input name="incomeEngineerTaxInclude" value="${budgetBean.incomeEngineerTaxInclude!}" required readonly></td>
+                        <td><input name="incomeEngineerTaxInclude" value="${budgetBean.incomeEngineerTaxInclude!3}" required readonly></td>
-                        <td><input name="incomeEngineerTaxExclude" value="${budgetBean.incomeEngineerTaxExclude!}" required readonly></td>
+                        <td><input name="incomeEngineerTaxExclude" value="${budgetBean.incomeEngineerTaxExclude!4}" required readonly></td>
                     </tr>
                     <tr>
                         <td>收入</td>
                         <td>服务类</td>
-                        <td><input name="incomeServiceTaxInclude" value="${budgetBean.incomeServiceTaxInclude!}" required readonly></td>
+                        <td><input name="incomeServiceTaxInclude" value="${budgetBean.incomeServiceTaxInclude!5}" required readonly></td>
-                        <td><input name="incomeServiceTaxExclude" value="${budgetBean.incomeServiceTaxExclude!}" required readonly></td>
+                        <td><input name="incomeServiceTaxExclude" value="${budgetBean.incomeServiceTaxExclude!6}" required readonly></td>
                     </tr>
                     <tr>
                         <td>合计</td>
                         <td></td>
-                        <td><input name="incomeTotalTaxInclude" value="${budgetBean.incomeTotalTaxInclude!}" readonly required></td>
+                        <td><input name="incomeTotalTaxInclude" value="${budgetBean.incomeTotalTaxInclude!7}" readonly required></td>
-                        <td><input name="incomeTotalTaxExclude" value="${budgetBean.incomeTotalTaxExclude!}" readonly required></td>
+                        <td><input name="incomeTotalTaxExclude" value="${budgetBean.incomeTotalTaxExclude!8}" readonly required></td>
                     </tr>
                     </tbody>
                 </table>
@@ -230,50 +230,50 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>设备</td>
-                        <td><input name="costPurchaseDeviceTaxInclude" value="${budgetBean.costPurchaseDeviceTaxInclude!}" readonly required></td>
+                        <td><input name="costPurchaseDeviceTaxInclude" value="${budgetBean.costPurchaseDeviceTaxInclude!9}" readonly required></td>
-                        <td><input name="costPurchaseDeviceTaxExclude" value="${budgetBean.costPurchaseDeviceTaxExclude!}" readonly required></td>
+                        <td><input name="costPurchaseDeviceTaxExclude" value="${budgetBean.costPurchaseDeviceTaxExclude!10}" readonly required></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>施工</td>
-                        <td><input name="costPurchaseBuildTaxInclude" value="${budgetBean.costPurchaseBuildTaxInclude!}" readonly required></td>
+                        <td><input name="costPurchaseBuildTaxInclude" value="${budgetBean.costPurchaseBuildTaxInclude!11}" readonly required></td>
-                        <td><input name="costPurchaseBuildTaxExclude" value="${budgetBean.costPurchaseBuildTaxExclude!}" readonly required></td>
+                        <td><input name="costPurchaseBuildTaxExclude" value="${budgetBean.costPurchaseBuildTaxExclude!12}" readonly required></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>服务</td>
-                        <td><input name="costPurchaseServiceTaxInclude" value="${budgetBean.costPurchaseServiceTaxInclude!}" readonly required></td>
+                        <td><input name="costPurchaseServiceTaxInclude" value="${budgetBean.costPurchaseServiceTaxInclude!13}" readonly required></td>
-                        <td><input name="costPurchaseServiceTaxExclude" value="${budgetBean.costPurchaseServiceTaxExclude!}" readonly required></td>
+                        <td><input name="costPurchaseServiceTaxExclude" value="${budgetBean.costPurchaseServiceTaxExclude!0}" readonly required></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>其他</td>
-                        <td><input name="costPurchaseOtherTaxInclude" value="${budgetBean.costPurchaseOtherTaxInclude!}" readonly required></td>
+                        <td><input name="costPurchaseOtherTaxInclude" value="${budgetBean.costPurchaseOtherTaxInclude!14}" readonly required></td>
-                        <td><input name="costPurchaseOtherTaxExclude" value="${budgetBean.costPurchaseOtherTaxExclude!}" readonly required></td>
+                        <td><input name="costPurchaseOtherTaxExclude" value="${budgetBean.costPurchaseOtherTaxExclude!15}" readonly required></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>项目管理成本</td>
                         <td>项目管理成本</td>
-                        <td><input name="costProjectManageTaxInclude" value="${budgetBean.costProjectManageTaxInclude!}" readonly required></td>
+                        <td><input name="costProjectManageTaxInclude" value="${budgetBean.costProjectManageTaxInclude!16}" readonly required></td>
-                        <td><input name="costProjectManageTaxExclude" value="${budgetBean.costProjectManageTaxExclude!}" readonly required></td>
+                        <td><input name="costProjectManageTaxExclude" value="${budgetBean.costProjectManageTaxExclude!17}" readonly required></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>其他</td>
                         <td>其他</td>
-                        <td><input name="costOtherOtherTaxInclude" value="${budgetBean.costOtherOtherTaxInclude!}" readonly required></td>
+                        <td><input name="costOtherOtherTaxInclude" value="${budgetBean.costOtherOtherTaxInclude!}" required></td>
-                        <td><input name="costOtherOtherTaxExclude" value="${budgetBean.costOtherOtherTaxExclude!}" readonly required></td>
+                        <td><input name="costOtherOtherTaxExclude" value="${budgetBean.costOtherOtherTaxExclude!}" required></td>
                     </tr>
                     <tr>
                         <td>合计</td>
                         <td></td>
                         <td></td>
-                        <td><input name="costTotalTaxInclude" value="${budgetBean.costTotalTaxInclude!}" readonly required></td>
+                        <td><input name="costTotalTaxInclude" value="${budgetBean.costTotalTaxInclude!18}" readonly required></td>
-                        <td><input name="costTotalTaxExclude" value="${budgetBean.costTotalTaxExclude!}" readonly required></td>
+                        <td><input name="costTotalTaxExclude" value="${budgetBean.costTotalTaxExclude!19}" readonly required></td>
                     </tr>
                     </tbody>
                 </table>
@@ -289,12 +289,12 @@
                     <tr>
                         <td>财务费用</td>
                         <td>资金占用成本</td>
-                        <td><input name="costExpropriationTaxExclude" value="${budgetBean.costExpropriationTaxExclude!}" required readonly></td>
+                        <td><input name="costExpropriationTaxExclude" value="${budgetBean.costExpropriationTaxExclude!20}" required readonly></td>
                     </tr>
                     <tr>
                         <td>公司管理费用</td>
                         <td></td>
-                        <td><input name="costCompanyManageTaxExclude" value="${budgetBean.costCompanyManageTaxExclude!}" required readonly></td>
+                        <td><input name="costCompanyManageTaxExclude" value="${budgetBean.costCompanyManageTaxExclude!}" required></td>
                     </tr>
                     </tbody>
                 </table>
@@ -309,13 +309,13 @@
                     </tr>
                     <tr>
                         <td>项目毛利</td>
-                        <td><input name="projectGrossProfit" value="${budgetBean.projectGrossProfit!}" readonly required></td>
+                        <td><input name="projectGrossProfit" value="${budgetBean.projectGrossProfit!21}" readonly required></td>
-                        <td><input name="projectGrossProfitRate" value="${budgetBean.projectGrossProfitRate!}" readonly required></td>
+                        <td><input name="projectGrossProfitRate" value="${budgetBean.projectGrossProfitRate!22}" readonly required></td>
                     </tr>
                     <tr>
                         <td>项目贡献利润率</td>
-                        <td><input name="projectContributionProfit" value="${budgetBean.projectContributionProfit!}" readonly required></td>
+                        <td><input name="projectContributionProfit" value="${budgetBean.projectContributionProfit!23}" readonly required></td>
-                        <td><input name="projectContributionProfitRate" value="${budgetBean.projectContributionProfitRate!}" readonly required></td>
+                        <td><input name="projectContributionProfitRate" value="${budgetBean.projectContributionProfitRate!24}" readonly required></td>
                     </tr>
                     </tbody>
                 </table>
@@ -329,59 +329,59 @@
                     </tr>
                     <tr>
                         <td>销售商品、提供劳务收到的现金a</td>
-                        <td><input name="" value="${budgetBean.a!}" readonly required></td>
+                        <td><input name="" value="${budgetBean.a!0}" readonly required></td>
                     </tr>
                     <tr>
                         <td>收到的税费返还b</td>
-                        <td><input name="" value="${budgetBean.a!}" readonly required></td>
+                        <td><input name="" value="${budgetBean.a!0}" readonly required></td>
                     </tr>
                     <tr>
                         <td>收到其他与经营活动有关的现金c</td>
-                        <td><input name="" value="${budgetBean.a!}" readonly required></td>
+                        <td><input name="" value="${budgetBean.a!0}" readonly required></td>
                     </tr>
                     <tr>
                         <td>购买商品、接受劳务支付的现d</td>
-                        <td><input name="" value="${budgetBean.a!}" readonly required></td>
+                        <td><input name="" value="${budgetBean.a!0}" readonly required></td>
                     </tr>
                     <tr>
                         <td>支付的各项税费e</td>
-                        <td><input name="" value="${budgetBean.a!}" readonly required></td>
+                        <td><input name="" value="${budgetBean.a!0}" readonly required></td>
                     </tr>
                     <tr>
                         <td>支付其他与经营活动有关的现金f</td>
-                        <td><input name="" value="${budgetBean.a!}" readonly required></td>
+                        <td><input name="" value="${budgetBean.a!0}" readonly required></td>
                     </tr>
                     <tr>
                         <td>经营活动产生的现金流量净额g</td>
-                        <td><input name="" value="${budgetBean.a!}" readonly required></td>
+                        <td><input name="" value="${budgetBean.a!0}" readonly required></td>
                     </tr>
                     <tr>
                         <td>投资活动现金流入h</td>
-                        <td><input name="" value="${budgetBean.a!}" readonly required></td>
+                        <td><input name="" value="${budgetBean.a!0}" readonly required></td>
                     </tr>
                     <tr>
                         <td>投资活动现金流出i</td>
-                        <td><input name="" value="${budgetBean.a!}" readonly required></td>
+                        <td><input name="" value="${budgetBean.a!0}" readonly required></td>
                     </tr>
                     <tr>
                         <td>投资活动产生的现金流量净额j</td>
-                        <td><input name="" value="${budgetBean.a!}" readonly required></td>
+                        <td><input name="" value="${budgetBean.a!0}" readonly required></td>
                     </tr>
                     <tr>
                         <td>融资资金流入k</td>
-                        <td><input name="" value="${budgetBean.a!}" readonly required></td>
+                        <td><input name="" value="${budgetBean.a!0}" readonly required></td>
                     </tr>
                     <tr>
                         <td>还款资金流出l</td>
-                        <td><input name="" value="${budgetBean.a!}" readonly required></td>
+                        <td><input name="" value="${budgetBean.a!0}" readonly required></td>
                     </tr>
                     <tr>
                         <td>筹资活动产生的现金流量净额m</td>
-                        <td><input name="" value="${budgetBean.a!}" readonly required></td>
+                        <td><input name="" value="${budgetBean.a!0}" readonly required></td>
                     </tr>
                     <tr>
                         <td>货币资金净增加额n</td>
-                        <td><input name="" value="${budgetBean.a!}" readonly required></td>
+                        <td><input name="" value="${budgetBean.a!0}" readonly required></td>
                     </tr>
                     </tbody>
                 </table>