四算预算税金计算

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

@@ -27,10 +27,6 @@ public class BudgetBean extends IncomeCostBean{
      * 服务收入税金
      */
     private BigDecimal incomeServiceTax;
-    /**
-     * 总收入税金
-     */
-    private BigDecimal incomeTotalTax;
     /**
      * 采购设备成本税金
      */
@@ -51,6 +47,10 @@ public class BudgetBean extends IncomeCostBean{
      * 采购其他成本含税
      */
     private BigDecimal costOtherOtherTax;
+    /**
+     * 公司管理费用
+     */
+    private BigDecimal costCompanyManageTaxExclude;
     /**
      * null就返回0
      */
@@ -99,15 +99,6 @@ public class BudgetBean extends IncomeCostBean{
         this.incomeServiceTax = incomeServiceTax;
     }
 
-    @Override
-    public BigDecimal getIncomeTotalTax() {
-        return incomeTotalTax;
-    }
-
-    public void setIncomeTotalTax(BigDecimal incomeTotalTax) {
-        this.incomeTotalTax = incomeTotalTax;
-    }
-
     public BigDecimal getCostPurchaseDeviceTax() {
         return costPurchaseDeviceTax;
     }
@@ -147,4 +138,14 @@ public class BudgetBean extends IncomeCostBean{
     public void setCostOtherOtherTax(BigDecimal costOtherOtherTax) {
         this.costOtherOtherTax = costOtherOtherTax;
     }
+
+    @Override
+    public BigDecimal getCostCompanyManageTaxExclude() {
+        return getIncomeTotalTaxExclude().multiply(BigDecimal.valueOf(0.028));
+    }
+
+    @Override
+    public void setCostCompanyManageTaxExclude(BigDecimal costCompanyManageTaxExclude) {
+        this.costCompanyManageTaxExclude = costCompanyManageTaxExclude;
+    }
 }

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

@@ -410,10 +410,11 @@ public abstract class IncomeCostBean {
      * 计算所有的成本税金
      */
     public BigDecimal getIncomeTotalTax() {
-        if (getIncomeTotalTaxInclude() == null || getIncomeTotalTaxInclude() == null) {
+        if (getIncomeTotalTaxInclude() == null || getIncomeTotalTaxExclude() == null) {
             return handleSpecial(null);
         }
-        return getIncomeTotalTaxInclude().subtract(getIncomeTotalTaxInclude());
+        BigDecimal subtract = getIncomeTotalTaxInclude().subtract(getIncomeTotalTaxExclude());
+        return subtract;
     }
 
     /**

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

@@ -238,7 +238,7 @@ public class ProjectBudgetService {
             ProjectBudgetCost projectBudgetCostOtherOther = costs.stream().filter(d -> d.getType() == ProjectBudgetCost.TYPE_OTHER_OTHER).collect(Collectors.toList()).get(0);
             budgetBean.setCostOtherOtherTaxInclude(projectBudgetCostOtherOther.getCostTaxInclude());
             budgetBean.setCostOtherOtherTaxExclude(projectBudgetCostOtherOther.getCostTaxExclude());
-            budgetBean.setCostOtherOtherTax(budgetBean.getCostOtherOtherTaxInclude().subtract(budgetBean.getCostPurchaseTotalTaxExclude()));
+            budgetBean.setCostOtherOtherTax(budgetBean.getCostOtherOtherTaxInclude().subtract(budgetBean.getCostOtherOtherTaxExclude()));
         }
 
 

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

@@ -986,7 +986,7 @@
                         <td><input type="text" class="number" name="incomeTotalTax" value="${Utils.format(budgetBean.incomeTotalTax,'0')}" required readonly title="此列累计"></td>
                     </tr>
                     </tbody>
-                    (备注：本表所用税率分别为：<input type="text" name="incomeTaxRates" value="${incomeTaxRates!}" readonly>)
+                    (备注：本表所用税率分别为：${incomeTaxRates!})
                 </table>
                 <span>成本</span>
                <#-- <span class="am-text-primary"><a style="cursor: pointer"  id="cost-detail">采购成本明细表</a></span>
@@ -1059,7 +1059,7 @@
                         <td><input type="text" class="number" name="costTotalTax" value="${Utils.format(budgetBean.costTotalTax,'0')}" readonly required title="此列累计"></td>
                     </tr>
                     </tbody>
-                    (备注：本表所用税率分别为：<input type="text" name="costTaxRates" value="${costTaxRates!}" readonly>)
+                    (备注：本表所用税率分别为：${costTaxRates!})
                 </table>
                 <span>管理</span>
                 <#--<span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->