|
@@ -99,10 +99,10 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public HttpResult<String> save(PtlAgreemenCostAdd ptlAgreemenCostAdd) {
|
|
public HttpResult<String> save(PtlAgreemenCostAdd ptlAgreemenCostAdd) {
|
|
|
log.info("报价配置/费用管理/新增费用. ptlAgreemenCostAdd=[{}]", JSONUtil.toJsonStr(ptlAgreemenCostAdd));
|
|
log.info("报价配置/费用管理/新增费用. ptlAgreemenCostAdd=[{}]", JSONUtil.toJsonStr(ptlAgreemenCostAdd));
|
|
|
- if(StrUtil.isEmpty(ptlAgreemenCostAdd.getPtlAgreementId()) || StrUtil.isEmpty(ptlAgreemenCostAdd.getPtlAgreementCode())){
|
|
|
|
|
- log.info("新增费用的时候,需要指定关联的协议信息。ptlAgreemenCostAdd=[{}]", JSONUtil.toJsonStr(ptlAgreemenCostAdd));
|
|
|
|
|
- return HttpResult.error("新增费用的时候,需要指定关联的协议信息");
|
|
|
|
|
- }
|
|
|
|
|
|
|
+// if(StrUtil.isEmpty(ptlAgreemenCostAdd.getPtlAgreementId()) || StrUtil.isEmpty(ptlAgreemenCostAdd.getPtlAgreementCode())){
|
|
|
|
|
+// log.info("新增费用的时候,需要指定关联的协议信息。ptlAgreemenCostAdd=[{}]", JSONUtil.toJsonStr(ptlAgreemenCostAdd));
|
|
|
|
|
+// return HttpResult.error("新增费用的时候,需要指定关联的协议信息");
|
|
|
|
|
+// }
|
|
|
List<CostAdd> costAddList = ptlAgreemenCostAdd.getCostAddList();
|
|
List<CostAdd> costAddList = ptlAgreemenCostAdd.getCostAddList();
|
|
|
if (costAddList.isEmpty()) {
|
|
if (costAddList.isEmpty()) {
|
|
|
log.info("费用管理:保存数据不能为空");
|
|
log.info("费用管理:保存数据不能为空");
|
|
@@ -113,6 +113,10 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
|
|
|
if (ListUtils.hasDuplicates(ptlAgreementCostAdd.getRuleConditions())){
|
|
if (ListUtils.hasDuplicates(ptlAgreementCostAdd.getRuleConditions())){
|
|
|
throw new SystemException("添加数据存在相同费用规则,请检查");
|
|
throw new SystemException("添加数据存在相同费用规则,请检查");
|
|
|
}
|
|
}
|
|
|
|
|
+ if(StrUtil.isEmpty(costAdd.getPtlAgreementId())){
|
|
|
|
|
+ log.info("新增费用的时候,需要指定关联的协议信息。ptlAgreemenCostAdd=[{}]", JSONUtil.toJsonStr(ptlAgreemenCostAdd));
|
|
|
|
|
+ return HttpResult.error("新增费用的时候,需要指定关联的协议信息");
|
|
|
|
|
+ }
|
|
|
ptlAgreementCostAdd.setPtlAgreementId(costAdd.getPtlAgreementId());
|
|
ptlAgreementCostAdd.setPtlAgreementId(costAdd.getPtlAgreementId());
|
|
|
ptlAgreementCostAdd.setProductId(costAdd.getProductId());
|
|
ptlAgreementCostAdd.setProductId(costAdd.getProductId());
|
|
|
ptlAgreementCostAdd.setProductName(costAdd.getProductName());
|
|
ptlAgreementCostAdd.setProductName(costAdd.getProductName());
|