班组翻译

wangqian
1 parent 11e7e889
Showing 17 changed files with 65 additions and 28 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/TeamBizdomainRelVo.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/MechanicalCostController.java
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/RentalMechanicalCostController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/WasteRecordController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/vo/WasteRecordRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/mechanicalcost/MechanicalCostDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/personalcost/PersonalCostDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/rentalmechanicalcost/RentalMechanicalCostDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/wasterecord/WasteRecordDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/mechanicalcost/MechanicalCostServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/personalcost/PersonalCostServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/rentalmechanicalcost/RentalMechanicalCostServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/wasterecord/WasteRecordServiceImpl.java
@@ -13,7 +13,7 @@ public class TeamBizdomainRelVo {
     /**
      * 班组编码
      */
-    private String teamId;
+    private Long teamId;
     /**
      * 班组名称
      */
 package com.zteits.urbanops.module.garden.controller.admin.mechanicalcost;
+import com.fhs.core.trans.anno.TransMethodResult;
 import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
 import com.zteits.urbanops.framework.common.pojo.CommonResult;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
@@ -82,6 +83,7 @@ public class MechanicalCostController {
     @GetMapping("/page")
     @Operation(summary = "获得自有机械费用录入分页")
     @PreAuthorize("@ss.hasPermission('garden:mechanical-cost:query')")
+    @TransMethodResult
     public CommonResult<PageResult<MechanicalCostRespVO>> getMechanicalCostPage(@Valid MechanicalCostPageReqVO pageReqVO) {
         PageResult<MechanicalCostDO> pageResult = mechanicalCostService.getMechanicalCostPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, MechanicalCostRespVO.class));
@@ -90,6 +92,7 @@ public class MechanicalCostController {
     @GetMapping("/list")
     @Operation(summary = "自有机械费用录入-列表(兼容旧路径)")
     @PreAuthorize("@ss.hasPermission('garden:mechanical-cost:query')")
+    @TransMethodResult
     public CommonResult<PageResult<MechanicalCostRespVO>> list(@Valid MechanicalCostPageReqVO pageReqVO) {
         PageResult<MechanicalCostDO> pageResult = mechanicalCostService.getMechanicalCostPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, MechanicalCostRespVO.class));
@@ -3,6 +3,8 @@ package com.zteits.urbanops.module.garden.controller.admin.mechanicalcost.vo;
 import cn.hutool.core.annotation.Alias;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -85,8 +87,10 @@ public class MechanicalCostRespVO {
     private LocalDateTime createTime;
     @Schema(description = "班组", example = "班组")
-    @ExcelProperty("班组")
-    @Alias("deptId")
-    private List<String> teamIdList;
+    @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;
 }
@@ -20,7 +20,7 @@ import jakarta.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-
+import com.fhs.core.trans.anno.TransMethodResult;
 import java.io.IOException;
 import java.util.List;
@@ -81,6 +81,7 @@ public class PersonalCostController {
     @GetMapping("/page")
     @Operation(summary = "获得人员费用录入 - 个人费用分页")
     @PreAuthorize("@ss.hasPermission('garden:personal-cost:query')")
+    @TransMethodResult
     public CommonResult<PageResult<PersonalCostRespVO>> getPersonalCostPage(@Valid PersonalCostPageReqVO pageReqVO) {
         PageResult<PersonalCostDO> pageResult = personalCostService.getPersonalCostPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, PersonalCostRespVO.class));
@@ -89,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));
 package com.zteits.urbanops.module.garden.controller.admin.personalcost.vo;
-import cn.hutool.core.annotation.Alias;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
+import com.fhs.core.trans.vo.VO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -13,7 +15,7 @@ import java.util.List;
 @Schema(description = "管理后台 - 人员费用录入 - 个人费用 Response VO")
 @Data
 @ExcelIgnoreUnannotated
-public class PersonalCostRespVO {
+public class PersonalCostRespVO implements VO {
     @Schema(description = "记录ID，自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "14090")
     @ExcelProperty("记录ID，自增主键")
@@ -56,7 +58,9 @@ public class PersonalCostRespVO {
     private LocalDateTime createTime;
     @Schema(description = "班组", example = "班组")
-    @ExcelProperty("班组")
-    @Alias("deptId")
-    private List<String> teamIdList;
+    @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;
 }
 package com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost;
+import com.fhs.core.trans.anno.TransMethodResult;
 import com.zteits.urbanops.framework.apilog.core.annotation.ApiAccessLog;
 import com.zteits.urbanops.framework.common.pojo.CommonResult;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
@@ -81,6 +82,7 @@ public class RentalMechanicalCostController {
     @GetMapping("/page")
     @Operation(summary = "获得租赁机械费用录入分页")
     @PreAuthorize("@ss.hasPermission('garden:rental-mechanical-cost:query')")
+    @TransMethodResult
     public CommonResult<PageResult<RentalMechanicalCostRespVO>> getRentalMechanicalCostPage(@Valid RentalMechanicalCostPageReqVO pageReqVO) {
         PageResult<RentalMechanicalCostDO> pageResult = rentalMechanicalCostService.getRentalMechanicalCostPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, RentalMechanicalCostRespVO.class));
@@ -89,6 +91,7 @@ public class RentalMechanicalCostController {
     @GetMapping("/list")
     @Operation(summary = "租赁机械费用录入-列表(兼容旧路径)")
     @PreAuthorize("@ss.hasPermission('garden:rental-mechanical-cost:query')")
+    @TransMethodResult
     public CommonResult<PageResult<RentalMechanicalCostRespVO>> list(@Valid RentalMechanicalCostPageReqVO pageReqVO) {
         PageResult<RentalMechanicalCostDO> pageResult = rentalMechanicalCostService.getRentalMechanicalCostPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, RentalMechanicalCostRespVO.class));
@@ -2,6 +2,8 @@ package com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost.
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
 import com.zteits.urbanops.module.garden.controller.admin.costfee.vo.TeamBizdomainRelVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -71,10 +73,6 @@ public class RentalMechanicalCostRespVO {
     @ExcelProperty("归属公司ID")
     private String companyId;
-    @Schema(description = "部门id", example = "25446")
-    @ExcelProperty("部门id")
-    private Long deptId;
-
     @Schema(description = "道路ID数组（多选）")
     @ExcelProperty("道路ID数组（多选）")
     private String roadIds;
@@ -89,5 +87,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;
 }
 package com.zteits.urbanops.module.garden.controller.admin.wasterecord;
+import com.fhs.core.trans.anno.TransMethodResult;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -83,6 +84,7 @@ public class WasteRecordController {
     @GetMapping("/page")
     @Operation(summary = "获得园林废弃物录入分页")
     @PreAuthorize("@ss.hasPermission('garden:waste-record:query')")
+    @TransMethodResult
     public CommonResult<PageResult<WasteRecordRespVO>> getWasteRecordPage(@Valid WasteRecordPageReqVO pageReqVO) {
         PageResult<WasteRecordDO> pageResult = wasteRecordService.getWasteRecordPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, WasteRecordRespVO.class));
@@ -91,6 +93,7 @@ public class WasteRecordController {
     @GetMapping("/list")
     @Operation(summary = "园林废弃物录入-列表(兼容旧路径)")
     @PreAuthorize("@ss.hasPermission('garden:waste-record:query')")
+    @TransMethodResult
     public CommonResult<PageResult<WasteRecordRespVO>> list(@Valid WasteRecordPageReqVO pageReqVO) {
         PageResult<WasteRecordDO> pageResult = wasteRecordService.getWasteRecordPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, WasteRecordRespVO.class));
@@ -109,4 +112,4 @@ public class WasteRecordController {
                         BeanUtils.toBean(list, WasteRecordRespVO.class));
     }
-}
 \ No newline at end of file
+}
@@ -3,6 +3,8 @@ package com.zteits.urbanops.module.garden.controller.admin.wasterecord.vo;
 import cn.hutool.core.annotation.Alias;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -65,8 +67,10 @@ public class WasteRecordRespVO {
     private LocalDateTime createTime;
     @Schema(description = "班组", example = "班组")
-    @ExcelProperty("班组")
-    @Alias("deptId")
-    private List<String> teamIdList;
+    @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;
 }
@@ -92,7 +92,7 @@ public class MechanicalCostDO extends BaseDO {
      * 部门id
      */
     @TableField(typeHandler = JacksonTypeHandler.class)
-    private List<String> deptId;
+    private List<Long> deptId;
     /**
      * 备注
      */
@@ -63,7 +63,7 @@ public class PersonalCostDO extends BaseDO {
      * 部门id
      */
     @TableField(typeHandler = JacksonTypeHandler.class)
-    private List<String> deptId;
+    private List<Long> deptId;
     /**
      * 备注
      */
@@ -84,7 +84,8 @@ public class RentalMechanicalCostDO extends BaseDO {
     /**
      * 部门id
      */
-    private Long deptId;
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private List<Long> deptId;
     /**
      * 班组ID数组（多选）
      */
@@ -72,7 +72,7 @@ public class WasteRecordDO extends BaseDO {
      * 部门id
      */
     @TableField(typeHandler = JacksonTypeHandler.class)
-    private List<String> deptId;
+    private List<Long> deptId;
     /**
      * 状态（0正常 1停用）
      */
@@ -40,7 +40,7 @@ public class MechanicalCostServiceImpl implements MechanicalCostService {
         // 插入
         MechanicalCostDO mechanicalCost = BeanUtils.toBean(createReqVO, MechanicalCostDO.class);
-        List<String> deptIds = createReqVO.getTeamIds().stream()
+        List<Long> deptIds = createReqVO.getTeamIds().stream()
                 .map(TeamBizdomainRelVo::getTeamId)
                 .collect(Collectors.toList());
         mechanicalCost.setDeptId(deptIds);
@@ -57,7 +57,7 @@ public class MechanicalCostServiceImpl implements MechanicalCostService {
         // 更新
         MechanicalCostDO updateObj = BeanUtils.toBean(updateReqVO, MechanicalCostDO.class);
-        List<String> deptIds = updateReqVO.getTeamIds().stream()
+        List<Long> deptIds = updateReqVO.getTeamIds().stream()
                 .map(TeamBizdomainRelVo::getTeamId)
                 .collect(Collectors.toList());
         updateObj.setDeptId(deptIds);
@@ -40,7 +40,7 @@ public class PersonalCostServiceImpl implements PersonalCostService {
     public Long createPersonalCost(PersonalCostSaveReqVO createReqVO) {
         // 插入
         PersonalCostDO personalCost = BeanUtils.toBean(createReqVO, PersonalCostDO.class);
-        List<String> deptIds = createReqVO.getTeamIds().stream()
+        List<Long> deptIds = createReqVO.getTeamIds().stream()
                 .map(TeamBizdomainRelVo::getTeamId)
                 .collect(Collectors.toList());
         personalCost.setDeptId(deptIds);
@@ -56,7 +56,7 @@ public class PersonalCostServiceImpl implements PersonalCostService {
         validatePersonalCostExists(updateReqVO.getId());
         // 更新
         PersonalCostDO updateObj = BeanUtils.toBean(updateReqVO, PersonalCostDO.class);
-        List<String> deptIds = updateReqVO.getTeamIds().stream()
+        List<Long> deptIds = updateReqVO.getTeamIds().stream()
                 .map(TeamBizdomainRelVo::getTeamId)
                 .collect(Collectors.toList());
         updateObj.setDeptId(deptIds);
@@ -2,6 +2,7 @@ package com.zteits.urbanops.module.garden.service.rentalmechanicalcost;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
+import com.zteits.urbanops.module.garden.controller.admin.costfee.vo.TeamBizdomainRelVo;
 import com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost.vo.RentalMechanicalCostPageReqVO;
 import com.zteits.urbanops.module.garden.controller.admin.rentalmechanicalcost.vo.RentalMechanicalCostSaveReqVO;
 import com.zteits.urbanops.module.garden.dal.dataobject.rentalmechanicalcost.RentalMechanicalCostDO;
@@ -11,6 +12,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 import java.util.List;
+import java.util.stream.Collectors;
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.RENTAL_MECHANICAL_COST_NOT_EXISTS;
@@ -31,6 +33,10 @@ public class RentalMechanicalCostServiceImpl implements RentalMechanicalCostServ
     public Long createRentalMechanicalCost(RentalMechanicalCostSaveReqVO createReqVO) {
         // 插入
         RentalMechanicalCostDO rentalMechanicalCost = BeanUtils.toBean(createReqVO, RentalMechanicalCostDO.class);
+        List<Long> deptIds = createReqVO.getTeamIds().stream()
+                .map(TeamBizdomainRelVo::getTeamId)
+                .collect(Collectors.toList());
+        rentalMechanicalCost.setDeptId(deptIds);
         rentalMechanicalCostMapper.insert(rentalMechanicalCost);
         // 返回
         return rentalMechanicalCost.getId();
@@ -42,6 +48,10 @@ public class RentalMechanicalCostServiceImpl implements RentalMechanicalCostServ
         validateRentalMechanicalCostExists(updateReqVO.getId());
         // 更新
         RentalMechanicalCostDO updateObj = BeanUtils.toBean(updateReqVO, RentalMechanicalCostDO.class);
+        List<Long> deptIds = updateReqVO.getTeamIds().stream()
+                .map(TeamBizdomainRelVo::getTeamId)
+                .collect(Collectors.toList());
+        updateObj.setDeptId(deptIds);
         rentalMechanicalCostMapper.updateById(updateObj);
     }
@@ -35,7 +35,7 @@ public class WasteRecordServiceImpl implements WasteRecordService {
     public Long createWasteRecord(WasteRecordSaveReqVO createReqVO) {
         // 插入
         WasteRecordDO wasteRecord = BeanUtils.toBean(createReqVO, WasteRecordDO.class);
-        List<String> deptIds = createReqVO.getTeamIds().stream()
+        List<Long> deptIds = createReqVO.getTeamIds().stream()
                 .map(TeamBizdomainRelVo::getTeamId)
                 .collect(Collectors.toList());
         wasteRecord.setDeptId(deptIds);
@@ -52,7 +52,7 @@ public class WasteRecordServiceImpl implements WasteRecordService {
         // 更新
         WasteRecordDO updateObj = BeanUtils.toBean(updateReqVO, WasteRecordDO.class);
-        List<String> deptIds = updateReqVO.getTeamIds().stream()
+        List<Long> deptIds = updateReqVO.getTeamIds().stream()
                 .map(TeamBizdomainRelVo::getTeamId)
                 .collect(Collectors.toList());
         updateObj.setDeptId(deptIds);