内控项目加字段，成本测试加字段

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/ControlProjectInfo.java

@@ -54,6 +54,9 @@ public class ControlProjectInfo extends BaseEntity {
     @ApiModelProperty(value = "项目类型")
     private Integer projectType;
 
+    @ApiModelProperty(value = "项目归属公司")
+    private Integer projectCompany;
+
     @ApiModelProperty(value = "项目类别")
     private Integer projectClass;
 

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/ProjectCostBudgetStats.java

@@ -43,6 +43,9 @@ public class ProjectCostBudgetStats extends BaseEntity {
     @ApiModelProperty(value = "管理总金额")
     private BigDecimal manageCostTotal;
 
+    @ApiModelProperty(value = "税金")
+    private BigDecimal taxMoney;
+
     @ApiModelProperty(value = "之前是否审批通过,1通过")
     private Integer approve;
 

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/ControlProjectInfoVO.java

@@ -20,6 +20,8 @@ public class ControlProjectInfoVO extends ControlProjectInfo {
     private String projectTypeValue;
     @ApiModelProperty(value = "项目服务类型值")
     private String projectServerTypeValue;
+    @ApiModelProperty(value = "项目归属公司值")
+    private String projectCompanyName;
     @ApiModelProperty(value = "项目类别值")
     private String projectClassValue;
     @ApiModelProperty(value = "合同金额")

blade-service/blade-control/src/main/java/org/springblade/control/mapper/ProjectCostBudgetMapper.xml

@@ -57,6 +57,7 @@
                 (select IFNULL(SUM(budget_count_money),0) FROM c_project_cost_budget WHERE project_id = #{projectId} and cost_type = 4) as maintainCostTotal,
                 (select IFNULL(SUM(budget_count_money),0) FROM c_project_cost_budget WHERE project_id = #{projectId} and cost_type = 5) as manageCostTotal,
                 (select IFNULL(SUM(budget_count_money),0) FROM c_project_cost_budget WHERE project_id = #{projectId} and cost_type = 6) as outsourceCostTotal,
+                (select IFNULL(SUM(budget_count_money),0) FROM c_project_cost_budget WHERE project_id = #{projectId} and cost_type = 7) as taxMoney,
                 (select IFNULL(SUM(budget_count_money),0) FROM c_project_cost_budget WHERE project_id = #{projectId}) as projectCostTotal
     </select>
     <select id="page" resultType="org.springblade.control.vo.ControlProjectInfoVO">

blade-service/blade-control/src/main/java/org/springblade/control/mapper/ProjectInfoMapper.xml

@@ -9,6 +9,7 @@
         (select dict_name  from c_dict_info WHERE code = 'project_type' AND dict_value = pi.project_type) as projectTypeValue,
         (select dict_name  from c_dict_info WHERE code = 'project_class' AND dict_value = pi.project_class) as projectClassValue,
         (select dict_name  from c_dict_info WHERE code = 'project_server_type' AND dict_value = pi.project_server_type) as projectServerTypeValue,
+        (select dict_name  from c_dict_info WHERE code = 'project_company' AND dict_value = pi.project_company) as projectCompanyName,
         (select contract_money from c_control_contract_info WHERE project_id = pi.id)as contractMoney,
         (select name from blade_user WHERE id = pi.project_principal) as projectPrincipalName,
         (select name from blade_user WHERE id = pi.implement_principal) as implementPrincipalName