Commit e2344bff authored by suhuiguang's avatar suhuiguang

fix(jyjc): 报检规则4.0开发

1.定向单位,匹配不到时显示了全部
parent 67a27385
......@@ -252,9 +252,15 @@ public class RuleActionHandler {
.collect(Collectors.toSet());
// 需要匹配核准项目时,将符合核准项目要求的单位code和指定的单位code取交集,否则直接符合指定的机构
List<String> designatedUnitMatch = isMatchItem ? Arrays.stream(defaultInspectionCode.split(",")).filter(unitCodes::contains).collect(Collectors.toList()) : Arrays.asList(defaultInspectionCode.split(","));
matchEnterpriseInfos = tzBaseEnterpriseInfoMapper.getInspectionUnitListByCodeNoZjjg(designatedUnitMatch, areaCode, openBizType);
// 返回下一步是否可不予返回,供下一节点审核时显示判断是否显示不予受理按钮,在提交时数据会写入到主表:true-必须处理,false-可不予受理
this.setIsCanNoAccept(matchEnterpriseInfos, isMustAccept);
if(!designatedUnitMatch.isEmpty()){
matchEnterpriseInfos = tzBaseEnterpriseInfoMapper.getInspectionUnitListByCodeNoZjjg(designatedUnitMatch, areaCode, openBizType);
// 返回下一步是否可不予返回,供下一节点审核时显示判断是否显示不予受理按钮,在提交时数据会写入到主表:true-必须处理,false-可不予受理
this.setIsCanNoAccept(matchEnterpriseInfos, isMustAccept);
}
// 未匹配到法定机构
if (matchEnterpriseInfos.isEmpty()) {
log.info("指定定向单位,按照资质、区域、属地,未匹配到法定检验机构:isMatchItem:{},areaCode:{},openBizType:{},defaultInspectionCode:{}", isMatchItem, areaCode, openBizType, defaultInspectionCode);
}
}
return matchEnterpriseInfos;
}
......
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