diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java index d392218..a9a8499 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -97,6 +97,11 @@ @TableField("director") private String director; + @ExcelProperty("父部门负责人") + @ApiModelProperty(value = "父部门负责人", dataType = "String") + @TableField(exist = false) + private String pDeptDirector; + /** * 计量专业 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java index d392218..a9a8499 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterOrganize.java @@ -97,6 +97,11 @@ @TableField("director") private String director; + @ExcelProperty("父部门负责人") + @ApiModelProperty(value = "父部门负责人", dataType = "String") + @TableField(exist = false) + private String pDeptDirector; + /** * 计量专业 */ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java index af4d423..51b0986 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterOrganizeServiceImpl.java @@ -57,6 +57,14 @@ } for (MeterOrganize record : organizePage.getRecords()) { DictCodeUtils.convertDictCodeToName(record); + if(Objects.nonNull(record.getPDeptId())){ + //获取父部门名称及负责人 + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("dept_id", record.getPDeptId()); + MeterOrganize meterOrganize = organizeMapper.selectOne(queryWrapper); + record.setPDeptName(meterOrganize.getOrganizeName()); + record.setPDeptDirector(meterOrganize.getDirector()); + } } return organizePage; } @@ -70,6 +78,14 @@ } for (MeterOrganize record : meterOrganizes) { DictCodeUtils.convertDictCodeToName(record); + if(Objects.nonNull(record.getPDeptId())){ + //获取父部门名称及负责人 + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("dept_id", record.getPDeptId()); + MeterOrganize meterOrganize = organizeMapper.selectOne(queryWrapper); + record.setPDeptName(meterOrganize.getOrganizeName()); + record.setPDeptDirector(meterOrganize.getDirector()); + } } return meterOrganizes; }