人机材修改

wangqian
1 parent 0658762b
Showing 4 changed files with 11 additions and 2 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/PersonalCostController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/vo/PersonalCostRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostRespVO.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<Long> deptId;
-
+    private String deptNames;
     @ExcelProperty("状态 0:在用 1:报废")
     private Integer status;
 }
@@ -90,6 +90,7 @@ public class PersonalCostController {
     @GetMapping("/list")
     @Operation(summary = "获得人员费用录入 - 个人费用分页")
     @PreAuthorize("@ss.hasPermission('garden:personal-cost:query')")
+    @TransMethodResult
     public CommonResult<PageResult<PersonalCostRespVO>> list(@Valid PersonalCostPageReqVO pageReqVO) {
         PageResult<PersonalCostDO> pageResult = personalCostService.getPersonalCostPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, PersonalCostRespVO.class));
@@ -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<Long> deptId;
-
+    private String deptNames;
 }
@@ -93,6 +93,10 @@ public class RentalMechanicalCostRespVO {
     @ExcelProperty("班组")
     private List<TeamBizdomainRelVo> 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<Long> deptId;
  
+    private String deptNames;
+
 }