Commit 7c95fe92 authored by 施翔轲's avatar 施翔轲

优化新增直接费费用项

parent a7bad7a8
...@@ -33,10 +33,20 @@ public class AddCbDirectExpenseBo { ...@@ -33,10 +33,20 @@ public class AddCbDirectExpenseBo {
@NotBlank(message = "单位不能为空") @NotBlank(message = "单位不能为空")
private String unit; private String unit;
/** /**
* 单价 * 招标控制价单价
*/ */
@NotBlank(message = "单价不能为空") @NotBlank(message = "招标控制价单价不能为空")
private String tenderControlUnitPrice; private String tenderControlUnitPrice;
/**
* 不含税成本单价
*/
@NotBlank(message = "不含税成本单价不能为空")
private String excludeTaxCbUnitPrice;
/**
* 含税成本单价
*/
@NotBlank(message = "含税成本单价不能为空")
private String includeTaxCbUnitPrice;
/** /**
* 特征描述 * 特征描述
*/ */
......
...@@ -277,8 +277,6 @@ public class CbDirectExpenseServiceImpl extends ServiceImpl<CbDirectExpenseMappe ...@@ -277,8 +277,6 @@ public class CbDirectExpenseServiceImpl extends ServiceImpl<CbDirectExpenseMappe
directExpense.setProjectFileId(-1L); directExpense.setProjectFileId(-1L);
directExpense.setIsImport(false); directExpense.setIsImport(false);
//TODO:单价对应哪个字段需要等产品确认
//取编码前两位字母,ZY代表专,LW代表劳,FG代表材 //取编码前两位字母,ZY代表专,LW代表劳,FG代表材
String code = directExpense.getCode().substring(0, 2); String code = directExpense.getCode().substring(0, 2);
switch (code) { switch (code) {
...@@ -298,6 +296,7 @@ public class CbDirectExpenseServiceImpl extends ServiceImpl<CbDirectExpenseMappe ...@@ -298,6 +296,7 @@ public class CbDirectExpenseServiceImpl extends ServiceImpl<CbDirectExpenseMappe
return baseMapper.insert(directExpense); return baseMapper.insert(directExpense);
} }
/** /**
* 删除直接费费用项 * 删除直接费费用项
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment