Commit c588147d authored by suhuiguang's avatar suhuiguang

1.报检规则自测bug修复

parent 8728ea12
...@@ -54,12 +54,13 @@ public class RuleActionHandler { ...@@ -54,12 +54,13 @@ public class RuleActionHandler {
public RuleActionHandler(TzBaseUnitLicenceMapper baseUnitLicenceMapper, public RuleActionHandler(TzBaseUnitLicenceMapper baseUnitLicenceMapper,
TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper, TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper,
RedissonClient redissonClient, RedisUtils redisUtils, RedissonClient redissonClient, RedisUtils redisUtils,
RuleCommonServiceImpl ruleCommonService) { RuleCommonServiceImpl ruleCommonService, JyjcInspectionApplicationNoAcceptLogServiceImpl noAcceptLogService) {
this.baseUnitLicenceMapper = baseUnitLicenceMapper; this.baseUnitLicenceMapper = baseUnitLicenceMapper;
this.tzBaseEnterpriseInfoMapper = tzBaseEnterpriseInfoMapper; this.tzBaseEnterpriseInfoMapper = tzBaseEnterpriseInfoMapper;
this.redissonClient = redissonClient; this.redissonClient = redissonClient;
this.redisUtils = redisUtils; this.redisUtils = redisUtils;
this.ruleCommonService = ruleCommonService; this.ruleCommonService = ruleCommonService;
this.noAcceptLogService = noAcceptLogService;
} }
/** /**
...@@ -275,9 +276,12 @@ public class RuleActionHandler { ...@@ -275,9 +276,12 @@ public class RuleActionHandler {
String areaCode = isMatchArea ? inspectionEquipInfo.getAreaCode() : ""; String areaCode = isMatchArea ? inspectionEquipInfo.getAreaCode() : "";
// 所有符合单位的code // 所有符合单位的code
Set<String> unitCodes = unitLicenceList.stream().map(TzBaseUnitLicence::getUnitCode).collect(Collectors.toSet()); Set<String> unitCodes = unitLicenceList.stream().map(TzBaseUnitLicence::getUnitCode).collect(Collectors.toSet());
List<TzBaseEnterpriseInfoDto> matchEnterpriseInfos = tzBaseEnterpriseInfoMapper.getInspectionUnitListByCode(new ArrayList<>(unitCodes), areaCode, openBizType); List<TzBaseEnterpriseInfoDto> matchEnterpriseInfos = new ArrayList<>();
if(unitCodes.size() > 0){
matchEnterpriseInfos = tzBaseEnterpriseInfoMapper.getInspectionUnitListByCode(new ArrayList<>(unitCodes), areaCode, openBizType);
// 返回下一步是否可不予返回,供下一节点审核时显示判断是否显示不予受理按钮,在提交时数据会写入到主表:true-必须处理,false-可不予受理 // 返回下一步是否可不予返回,供下一节点审核时显示判断是否显示不予受理按钮,在提交时数据会写入到主表:true-必须处理,false-可不予受理
this.setIsCanNoAccept(matchEnterpriseInfos, isCanNoAccept); this.setIsCanNoAccept(matchEnterpriseInfos, isCanNoAccept);
}
return matchEnterpriseInfos; 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