新增直接费费用项相关修改

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CbDirectExpenseController.java

@@ -61,7 +61,7 @@ public class CbDirectExpenseController extends BaseController {
         return toAjax(baseService.addExpense(addBo));
     }
 
-    /***
+    /**
      * 删除直接费费用项
      */
     @DeleteMapping("/deleteExpense/{id}")

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/CbDirectExpense.java

@@ -119,6 +119,18 @@ public class CbDirectExpense extends BaseEntity implements Serializable {
      */
     @Excel(name = "含税成本合价")
     private String includeTaxCbSumPrice;
+    /**
+     * 规格型号
+     */
+    private String specificationModel;
+    /**
+     * 计算规则
+     */
+    private String calculateRule;
+    /**
+     * 甲供材料
+     */
+    private String supplierMaterial;
     /**
      * 合价偏差
      */

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/AddCbDirectExpenseBo.java

 package com.dsk.cscec.domain.bo;
 
+import com.dsk.common.annotation.Excel;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -32,13 +33,37 @@ public class AddCbDirectExpenseBo {
      */
     @NotBlank(message = "单位不能为空")
     private String unit;
+    /**
+     * 招标控制价单价
+     */
+    @NotBlank(message = "招标控制价单价不能为空")
+    private String tenderControlUnitPrice;
     /**
      * 不含税成本单价
      */
     @NotBlank(message = "不含税成本单价不能为空")
     private String excludeTaxCbUnitPrice;
+    /**
+     * 含税成本单价
+     */
+    @NotBlank(message = "含税成本单价不能为空")
+    private String includeTaxCbUnitPrice;
+    /**
+     * 规格型号
+     */
+    @NotBlank(message = "规格型号不能为空")
+    private String specificationModel;
     /**
      * 特征描述
      */
+    @NotBlank(message = "特征描述不能为空")
     private String projectFeature;
+    /**
+     * 计算规则
+     */
+    private String calculateRule;
+    /**
+     * 甲供材料
+     */
+    private String supplierMaterial;
 }
\ No newline at end of file