fix: 78332

企标详情--稽查内容--整改部门没有正常回显
This commit is contained in:
2023-11-09 09:05:32 +08:00
parent 086e598724
commit f3eb7fa17b
2 changed files with 15 additions and 1 deletions
@@ -1085,6 +1085,17 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
LambdaQueryWrapper<EnterpriseStandardInspectContent> esIcWrapper = new LambdaQueryWrapper<>();
esIcWrapper.eq(EnterpriseStandardInspectContent::getStandardId, id);
List<EnterpriseStandardInspectContent> list = esInspectContentService.list(esIcWrapper);
List<String> departIdList = list.stream().map(EnterpriseStandardInspectContent::getRectificationDepartment)
.collect(Collectors.toList());
if (departIdList.size() != 0) {
LambdaQueryWrapper<SysDepart> sysDepartLambdaQueryWrapper = new LambdaQueryWrapper<>();
sysDepartLambdaQueryWrapper.in(SysDepart::getId, departIdList);
List<SysDepart> departList = sysDepartService.list(sysDepartLambdaQueryWrapper);
Map<String, List<SysDepart>> departMap = departList.stream().collect(Collectors.groupingBy(SysDepart::getId));
for (EnterpriseStandardInspectContent content : list) {
content.setRectificationDepartment_dictText(departMap.get(content.getRectificationDepartment()).get(0).getDepartName());
}
}
stringObjectMap.put("checkList", list);
// 企标独有的授权部门
LambdaQueryWrapper<EnterpriseStandardAuthDept> authDeptWrapper = new LambdaQueryWrapper<>();
@@ -82,10 +82,13 @@ public class EnterpriseStandardInspectContent implements Serializable {
@ApiModelProperty(value = "标准内容或要求")
private String requirement;
/** 标准内容或要求 */
@JSONField(name = "rectificationDepartment")
@ApiModelProperty(value = "整改部门")
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
private String rectificationDepartment;
@JSONField(name = "rectificationDepartment_dictText")
@TableField(exist = false)
@ApiModelProperty(value = "整改部门手动翻译字段")
private String rectificationDepartment_dictText;
}