参数项收集清单-列表认证类型回显

This commit is contained in:
zhn
2023-10-30 19:09:19 +08:00
parent e70a42c824
commit 77383f26fe
@@ -62,6 +62,7 @@ import com.jero.modules.cert.report.service.IParamsReportConfigEOService;
import com.jero.modules.cert.report.service.IParamsReportDetailEOService;
import com.jero.modules.cert.report.service.IParamsReportEOService;
import com.jero.modules.cert.report.service.IReportCertCategoryParamsInfoEOService;
import com.jero.modules.cert.template.entity.CertCategoryParamsInfoEO;
import com.jero.modules.cert.template.entity.CertCategoryParamsInfoPublishEO;
import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
import com.jero.modules.cert.template.enums.ControlTypeEnum;
@@ -69,6 +70,7 @@ import com.jero.modules.cert.template.enums.ControlVerifyEnum;
import com.jero.modules.cert.template.enums.ParamsIsMustEnum;
import com.jero.modules.cert.template.service.ICertCategoryParamsInfoPublishEOService;
import com.jero.modules.cert.template.service.IParamsInfoPublishEOService;
import com.jero.modules.cert.template.service.impl.CertCategoryParamsInfoEOServiceImpl;
import com.jero.modules.document.vo.QueryConditionVO;
import com.jero.modules.feishu.enums.TemplateInfoEnum2;
import com.jero.modules.feishu.service.IFeishuService;
@@ -247,6 +249,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
private IParamsCollectManifestUserTypeLogEOService paramsCollectManifestUserTypeLogEOService;
@Autowired
private IParamsCollectExportService paramsCollectExportService;
@Autowired
private CertCategoryParamsInfoEOServiceImpl certCategoryParamsInfoEOService;
/**
* 保存
@@ -808,6 +814,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
List<String> paramsConfigIdList = paramsConfigEOList.stream().map(ParamsConfigEO::getId).collect(Collectors.toList());
List<ParamsConfigDataEO> paramsConfigDataEOList = paramsConfigDataEOService.queryListByConfigIdList(paramsConfigIdList); // 查询所有配置数据
List<CertCategoryParamsInfoEO> categoryParamsInfoEOList = new ArrayList<>();
if(ObjectUtil.isNotEmpty(list)){
String paramsTemplateId = list.get(0).getParamsTemplateId();//模板id
LambdaQueryWrapper<CertCategoryParamsInfoEO> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(CertCategoryParamsInfoEO::getParamsTemplateId,paramsTemplateId);
categoryParamsInfoEOList = certCategoryParamsInfoEOService.list(wrapper);
}
// 普通数据字典
List<SysDictItem> dictItemList = new ArrayList<>();
List<String> dictCodeList = new ArrayList<>();
@@ -819,6 +833,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
}
List<Map<String, Object>> listMap = new ArrayList<>();
List<CertCategoryParamsInfoEO> finalCategoryParamsInfoEOList = categoryParamsInfoEOList;
list.forEach(collectManifestEO -> { // 参数收集清单
// 处理数据字典字段 中英文切换 认证类型责任领域
List<String> certCategory = Arrays.asList(collectManifestEO.getCertCategory().split(","));
@@ -863,6 +878,17 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
String controlType = collectManifestEO.getControlType();
String paramsCollectManifestId = collectManifestEO.getId();
//认证类型
List<CertCategoryParamsInfoEO> certCategoryParamsInfoEOS = finalCategoryParamsInfoEOList.stream()
.filter(e -> e.getParamsTemplateId().equals(collectManifestEO.getParamsTemplateId())
&& e.getNioNumber().equals(collectManifestEO.getNioNumber())).collect(Collectors.toList());
if(ObjectUtil.isNotEmpty(certCategoryParamsInfoEOS)){
for (CertCategoryParamsInfoEO certCategoryParamsInfoEO : certCategoryParamsInfoEOS) {
String toHump = LineHumpUtil.lineToHump(certCategoryParamsInfoEO.getCertCategory());
manifestMap.put(toHump,certCategoryParamsInfoEO.getParamsNumber());
}
}
if (StringUtils.isNotEmpty(paramsManifestEO.getReferencesColName())) {
Map<String, Object> referencesColMap = new HashMap<>();
referencesColMap.put("referencesColFlag",true);