Commit 9690e96e8937f4eae4179dd4ca7545cb3c4a3063

Authored by wangqian
1 parent 235c13e0

人机材修改

urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostRespVO.java
@@ -93,12 +93,8 @@ public class MechanicalCostRespVO { @@ -93,12 +93,8 @@ public class MechanicalCostRespVO {
93 private LocalDateTime createTime; 93 private LocalDateTime createTime;
94 94
95 @Schema(description = "班组", example = "班组") 95 @Schema(description = "班组", example = "班组")
96 - @Trans(type = TransType.SIMPLE, targetClassName = "com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO",  
97 - key = "id", fields = "name", ref = "deptNames")  
98 private List<Long> deptId; 96 private List<Long> deptId;
99 97
100 - private String deptNames;  
101 -  
102 @ExcelProperty("状态 0:在用 1:报废") 98 @ExcelProperty("状态 0:在用 1:报废")
103 private Integer status; 99 private Integer status;
104 } 100 }
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/PersonalCostController.java
@@ -90,7 +90,6 @@ public class PersonalCostController { @@ -90,7 +90,6 @@ public class PersonalCostController {
90 @GetMapping("/list") 90 @GetMapping("/list")
91 @Operation(summary = "获得人员费用录入 - 个人费用分页") 91 @Operation(summary = "获得人员费用录入 - 个人费用分页")
92 @PreAuthorize("@ss.hasPermission('garden:personal-cost:query')") 92 @PreAuthorize("@ss.hasPermission('garden:personal-cost:query')")
93 - @TransMethodResult  
94 public CommonResult<PageResult<PersonalCostRespVO>> list(@Valid PersonalCostPageReqVO pageReqVO) { 93 public CommonResult<PageResult<PersonalCostRespVO>> list(@Valid PersonalCostPageReqVO pageReqVO) {
95 PageResult<PersonalCostDO> pageResult = personalCostService.getPersonalCostPage(pageReqVO); 94 PageResult<PersonalCostDO> pageResult = personalCostService.getPersonalCostPage(pageReqVO);
96 return success(BeanUtils.toBean(pageResult, PersonalCostRespVO.class)); 95 return success(BeanUtils.toBean(pageResult, PersonalCostRespVO.class));
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/vo/PersonalCostRespVO.java
@@ -58,9 +58,6 @@ public class PersonalCostRespVO implements VO { @@ -58,9 +58,6 @@ public class PersonalCostRespVO implements VO {
58 private LocalDateTime createTime; 58 private LocalDateTime createTime;
59 59
60 @Schema(description = "班组", example = "班组") 60 @Schema(description = "班组", example = "班组")
61 - @Trans(type = TransType.SIMPLE, targetClassName = "com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO",  
62 - key = "id", fields = "name", ref = "deptNames")  
63 private List<Long> deptId; 61 private List<Long> deptId;
64 62
65 - private String deptNames;  
66 } 63 }
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostRespVO.java
@@ -93,9 +93,6 @@ public class RentalMechanicalCostRespVO { @@ -93,9 +93,6 @@ public class RentalMechanicalCostRespVO {
93 @ExcelProperty("班组") 93 @ExcelProperty("班组")
94 private List<TeamBizdomainRelVo> teamIds; 94 private List<TeamBizdomainRelVo> teamIds;
95 @Schema(description = "班组", example = "班组") 95 @Schema(description = "班组", example = "班组")
96 - @Trans(type = TransType.SIMPLE, targetClassName = "com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO",  
97 - key = "id", fields = "name", ref = "deptNames")  
98 private List<Long> deptId; 96 private List<Long> deptId;
99 97
100 - private String deptNames;  
101 } 98 }