Commit ff01ab56 authored by 刘林's avatar 刘林

fix(jg):设计年限bug修改-可多次发起,不限制次数

parent 7ca41132
...@@ -192,11 +192,12 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign ...@@ -192,11 +192,12 @@ public class JgOverDesignServiceLifeServiceImpl extends BaseService<JgOverDesign
.map(v -> (String) v.get("record")) .map(v -> (String) v.get("record"))
.collect(Collectors.toList()) .collect(Collectors.toList())
); );
if (designInfoList.stream().anyMatch(info -> Optional.ofNullable(info.getOverDesignRegNum()).orElse(0) >= 2)) { //可多次发起,不限制次数
log.error("超设计使用年限变更登记设备最多延期两次, 设备record: {}", designInfoList.stream().filter(info -> info.getOverDesignRegNum() >= 2) // if (designInfoList.stream().anyMatch(info -> Optional.ofNullable(info.getOverDesignRegNum()).orElse(0) >= 2)) {
.map(IdxBizJgDesignInfo::getRecord).collect(Collectors.joining(","))); // log.error("超设计使用年限变更登记设备最多延期两次, 设备record: {}", designInfoList.stream().filter(info -> info.getOverDesignRegNum() >= 2)
throw new BadRequest("超设计使用年限变更登记设备最多延期两次!"); // .map(IdxBizJgDesignInfo::getRecord).collect(Collectors.joining(",")));
} // throw new BadRequest("超设计使用年限变更登记设备最多延期两次!");
// }
overDesignDto.setCreateDate(new Date()); overDesignDto.setCreateDate(new Date());
overDesignDto.setPromoter(reginParams.getUserModel().getUserId()); overDesignDto.setPromoter(reginParams.getUserModel().getUserId());
......
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