diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostRespVO.java index ceced99..77fedf2 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostRespVO.java @@ -93,8 +93,10 @@ public class MechanicalCostRespVO { private LocalDateTime createTime; @Schema(description = "班组", example = "班组") + @Trans(type = TransType.SIMPLE, targetClassName = "com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO", + key = "id", fields = "name", ref = "deptNames") private List deptId; - + private String deptNames; @ExcelProperty("状态 0:在用 1:报废") private Integer status; } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/PersonalCostController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/PersonalCostController.java index 7e25878..b793450 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/PersonalCostController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/PersonalCostController.java @@ -90,6 +90,7 @@ public class PersonalCostController { @GetMapping("/list") @Operation(summary = "获得人员费用录入 - 个人费用分页") @PreAuthorize("@ss.hasPermission('garden:personal-cost:query')") + @TransMethodResult public CommonResult> list(@Valid PersonalCostPageReqVO pageReqVO) { PageResult pageResult = personalCostService.getPersonalCostPage(pageReqVO); return success(BeanUtils.toBean(pageResult, PersonalCostRespVO.class)); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/vo/PersonalCostRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/vo/PersonalCostRespVO.java index 8a2bb4a..9ed5211 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/vo/PersonalCostRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/vo/PersonalCostRespVO.java @@ -58,6 +58,8 @@ public class PersonalCostRespVO implements VO { private LocalDateTime createTime; @Schema(description = "班组", example = "班组") + @Trans(type = TransType.SIMPLE, targetClassName = "com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO", + key = "id", fields = "name", ref = "deptNames") private List deptId; - + private String deptNames; } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostRespVO.java index 9fa4dca..38a4c0d 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostRespVO.java @@ -93,6 +93,10 @@ public class RentalMechanicalCostRespVO { @ExcelProperty("班组") private List teamIds; @Schema(description = "班组", example = "班组") + @Trans(type = TransType.SIMPLE, targetClassName = "com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO", + key = "id", fields = "name", ref = "deptNames") private List deptId; + private String deptNames; + }