|
|
@@ -231,16 +231,18 @@ public class PtlAgreementUndwrtRulesNewServiceImpl extends ServiceImpl<PtlAgreem
|
|
|
x.setOperator(x.getDictLabal().getJSONObject(0).getString("parentNumber"));
|
|
|
x.setRulesId(ptlAgreementUndwrtRulesNew.getId());
|
|
|
x.setId(0);
|
|
|
- costsAttrLink.add(x);
|
|
|
- PtlAgreementUndwrtRulesAttrLinkHistory undwrtRulesAttrLinkHistory = new PtlAgreementUndwrtRulesAttrLinkHistory();
|
|
|
- BeanUtils.copyProperties(x, undwrtRulesAttrLinkHistory);
|
|
|
- //设置承包规则费用因子历史记录
|
|
|
- undwrtRulesAttrLinkHistory.setBatch(uuid);
|
|
|
-
|
|
|
- undwrtRulesAttrLinkHistory.setOperatorType("add");
|
|
|
- undwrtRulesAttrLinkHistory.setModifier(BaseController.getUser().getId());
|
|
|
- undwrtRulesAttrLinkHistory.setOperatorTime(LocalDateTime.now());
|
|
|
- undwrtRulesAttrLinkHistories.add(undwrtRulesAttrLinkHistory);
|
|
|
+ if(x.getMinArray().length > 0) {
|
|
|
+ costsAttrLink.add(x);
|
|
|
+ PtlAgreementUndwrtRulesAttrLinkHistory undwrtRulesAttrLinkHistory = new PtlAgreementUndwrtRulesAttrLinkHistory();
|
|
|
+ BeanUtils.copyProperties(x, undwrtRulesAttrLinkHistory);
|
|
|
+ //设置承包规则费用因子历史记录
|
|
|
+ undwrtRulesAttrLinkHistory.setBatch(uuid);
|
|
|
+
|
|
|
+ undwrtRulesAttrLinkHistory.setOperatorType("add");
|
|
|
+ undwrtRulesAttrLinkHistory.setModifier(BaseController.getUser().getId());
|
|
|
+ undwrtRulesAttrLinkHistory.setOperatorTime(LocalDateTime.now());
|
|
|
+ undwrtRulesAttrLinkHistories.add(undwrtRulesAttrLinkHistory);
|
|
|
+ }
|
|
|
} else {
|
|
|
if ((!"0".equals(x.getMin()) && null != x.getMin()) || (!"0".equals(x.getMax()) && null != x.getMax())) {
|
|
|
|
|
|
@@ -298,20 +300,22 @@ public class PtlAgreementUndwrtRulesNewServiceImpl extends ServiceImpl<PtlAgreem
|
|
|
List<PtlAgreementUndwrtRulesAttrLink> costsAttrLink = new ArrayList<>();
|
|
|
costsAttrLinks.forEach(x -> {
|
|
|
//单独处理车牌号
|
|
|
- if ("LicenseNo".equals(x.getAttrCode()) && (x.getMin() != null && x.getMin() != "")) {
|
|
|
+ if ("LicenseNo".equals(x.getAttrCode())) {
|
|
|
x.setOperator(x.getDictLabal().getJSONObject(0).getString("parentNumber"));
|
|
|
x.setRulesId(ptlAgreementUndwrtRulesNew.getId());
|
|
|
x.setId(0);
|
|
|
- costsAttrLink.add(x);
|
|
|
- PtlAgreementUndwrtRulesAttrLinkHistory undwrtRulesAttrLinkHistory = new PtlAgreementUndwrtRulesAttrLinkHistory();
|
|
|
- BeanUtils.copyProperties(x, undwrtRulesAttrLinkHistory);
|
|
|
- //设置承包规则费用因子历史记录
|
|
|
- undwrtRulesAttrLinkHistory.setBatch(uuid);
|
|
|
-
|
|
|
- undwrtRulesAttrLinkHistory.setOperatorType("update");
|
|
|
- undwrtRulesAttrLinkHistory.setModifier(BaseController.getUser().getId());
|
|
|
- undwrtRulesAttrLinkHistory.setOperatorTime(LocalDateTime.now());
|
|
|
- undwrtRulesAttrLinkHistories.add(undwrtRulesAttrLinkHistory);
|
|
|
+ if(x.getMinArray().length > 0) {
|
|
|
+ costsAttrLink.add(x);
|
|
|
+ PtlAgreementUndwrtRulesAttrLinkHistory undwrtRulesAttrLinkHistory = new PtlAgreementUndwrtRulesAttrLinkHistory();
|
|
|
+ BeanUtils.copyProperties(x, undwrtRulesAttrLinkHistory);
|
|
|
+ //设置承包规则费用因子历史记录
|
|
|
+ undwrtRulesAttrLinkHistory.setBatch(uuid);
|
|
|
+
|
|
|
+ undwrtRulesAttrLinkHistory.setOperatorType("update");
|
|
|
+ undwrtRulesAttrLinkHistory.setModifier(BaseController.getUser().getId());
|
|
|
+ undwrtRulesAttrLinkHistory.setOperatorTime(LocalDateTime.now());
|
|
|
+ undwrtRulesAttrLinkHistories.add(undwrtRulesAttrLinkHistory);
|
|
|
+ }
|
|
|
} else {
|
|
|
PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr = undwrtRulesAttrList.stream().filter(y -> y.getAttrCode().equals(x.getAttrCode())).findFirst().orElse(null);
|
|
|
//单独判断radio radio中存在0的属性值
|