diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index e56d8a84..ee93e6b3 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -1085,6 +1085,17 @@ public class LawsCommonServiceImpl implements ILawsCommonService { LambdaQueryWrapper esIcWrapper = new LambdaQueryWrapper<>(); esIcWrapper.eq(EnterpriseStandardInspectContent::getStandardId, id); List list = esInspectContentService.list(esIcWrapper); + List departIdList = list.stream().map(EnterpriseStandardInspectContent::getRectificationDepartment) + .collect(Collectors.toList()); + if (departIdList.size() != 0) { + LambdaQueryWrapper sysDepartLambdaQueryWrapper = new LambdaQueryWrapper<>(); + sysDepartLambdaQueryWrapper.in(SysDepart::getId, departIdList); + List departList = sysDepartService.list(sysDepartLambdaQueryWrapper); + Map> 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 authDeptWrapper = new LambdaQueryWrapper<>(); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectContent.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectContent.java index 9d2b31a3..cd87fc9f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectContent.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardInspectContent.java @@ -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; }