From 05c0f4559369c5a206ddf9d8e1ca7c82341a56e6 Mon Sep 17 00:00:00 2001 From: wangqian <1406304305@qq.com> Date: Mon, 1 Dec 2025 22:30:02 +0800 Subject: [PATCH] 班组翻译 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/TeamBizdomainRelVo.java | 2 +- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/MechanicalCostController.java | 3 +++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostRespVO.java | 10 +++++++--- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/PersonalCostController.java | 4 +++- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/vo/PersonalCostRespVO.java | 14 +++++++++----- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/RentalMechanicalCostController.java | 3 +++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostRespVO.java | 11 +++++++---- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/WasteRecordController.java | 5 ++++- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/vo/WasteRecordRespVO.java | 10 +++++++--- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/mechanicalcost/MechanicalCostDO.java | 2 +- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/personalcost/PersonalCostDO.java | 2 +- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/rentalmechanicalcost/RentalMechanicalCostDO.java | 3 ++- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/wasterecord/WasteRecordDO.java | 2 +- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/mechanicalcost/MechanicalCostServiceImpl.java | 4 ++-- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/personalcost/PersonalCostServiceImpl.java | 4 ++-- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/rentalmechanicalcost/RentalMechanicalCostServiceImpl.java | 10 ++++++++++ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/wasterecord/WasteRecordServiceImpl.java | 4 ++-- 17 files changed, 65 insertions(+), 28 deletions(-) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/TeamBizdomainRelVo.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/TeamBizdomainRelVo.java index 612f8a7..5fc384b 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/TeamBizdomainRelVo.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/costfee/vo/TeamBizdomainRelVo.java @@ -13,7 +13,7 @@ public class TeamBizdomainRelVo { /** * 班组编码 */ - private String teamId; + private Long teamId; /** * 班组名称 */ diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/MechanicalCostController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/MechanicalCostController.java index b151e63..10c4a38 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/MechanicalCostController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/MechanicalCostController.java @@ -1,5 +1,6 @@ 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> getMechanicalCostPage(@Valid MechanicalCostPageReqVO pageReqVO) { PageResult 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> list(@Valid MechanicalCostPageReqVO pageReqVO) { PageResult pageResult = mechanicalCostService.getMechanicalCostPage(pageReqVO); return success(BeanUtils.toBean(pageResult, MechanicalCostRespVO.class)); 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 1d81203..87a48b1 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 @@ -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 teamIdList; + @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/personalcost/PersonalCostController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/personalcost/PersonalCostController.java index 9541f66..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 @@ -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> getPersonalCostPage(@Valid PersonalCostPageReqVO pageReqVO) { PageResult 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> 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 fe9f4d8..e02d53c 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 @@ -1,8 +1,10 @@ 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 teamIdList; + @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/RentalMechanicalCostController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/RentalMechanicalCostController.java index 2d163ed..083f53e 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/RentalMechanicalCostController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/RentalMechanicalCostController.java @@ -1,5 +1,6 @@ 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> getRentalMechanicalCostPage(@Valid RentalMechanicalCostPageReqVO pageReqVO) { PageResult 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> list(@Valid RentalMechanicalCostPageReqVO pageReqVO) { PageResult pageResult = rentalMechanicalCostService.getRentalMechanicalCostPage(pageReqVO); return success(BeanUtils.toBean(pageResult, RentalMechanicalCostRespVO.class)); 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 03c2b07..2c1d5db 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 @@ -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 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; } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/WasteRecordController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/WasteRecordController.java index 8b1cfe6..3317e2a 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/WasteRecordController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/WasteRecordController.java @@ -1,5 +1,6 @@ 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> getWasteRecordPage(@Valid WasteRecordPageReqVO pageReqVO) { PageResult 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> list(@Valid WasteRecordPageReqVO pageReqVO) { PageResult 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 +} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/vo/WasteRecordRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/vo/WasteRecordRespVO.java index 5fc6d16..3f95e3c 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/vo/WasteRecordRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/wasterecord/vo/WasteRecordRespVO.java @@ -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 teamIdList; + @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/dal/dataobject/mechanicalcost/MechanicalCostDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/mechanicalcost/MechanicalCostDO.java index 6e0fd7b..5908e27 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/mechanicalcost/MechanicalCostDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/mechanicalcost/MechanicalCostDO.java @@ -92,7 +92,7 @@ public class MechanicalCostDO extends BaseDO { * 部门id */ @TableField(typeHandler = JacksonTypeHandler.class) - private List deptId; + private List deptId; /** * 备注 */ diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/personalcost/PersonalCostDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/personalcost/PersonalCostDO.java index 16da4b1..725db6d 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/personalcost/PersonalCostDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/personalcost/PersonalCostDO.java @@ -63,7 +63,7 @@ public class PersonalCostDO extends BaseDO { * 部门id */ @TableField(typeHandler = JacksonTypeHandler.class) - private List deptId; + private List deptId; /** * 备注 */ diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/rentalmechanicalcost/RentalMechanicalCostDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/rentalmechanicalcost/RentalMechanicalCostDO.java index 251d502..d649327 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/rentalmechanicalcost/RentalMechanicalCostDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/rentalmechanicalcost/RentalMechanicalCostDO.java @@ -84,7 +84,8 @@ public class RentalMechanicalCostDO extends BaseDO { /** * 部门id */ - private Long deptId; + @TableField(typeHandler = JacksonTypeHandler.class) + private List deptId; /** * 班组ID数组（多选） */ diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/wasterecord/WasteRecordDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/wasterecord/WasteRecordDO.java index ddbe19e..25ccb62 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/wasterecord/WasteRecordDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/wasterecord/WasteRecordDO.java @@ -72,7 +72,7 @@ public class WasteRecordDO extends BaseDO { * 部门id */ @TableField(typeHandler = JacksonTypeHandler.class) - private List deptId; + private List deptId; /** * 状态（0正常 1停用） */ diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/mechanicalcost/MechanicalCostServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/mechanicalcost/MechanicalCostServiceImpl.java index 08f07e1..2755dc5 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/mechanicalcost/MechanicalCostServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/mechanicalcost/MechanicalCostServiceImpl.java @@ -40,7 +40,7 @@ public class MechanicalCostServiceImpl implements MechanicalCostService { // 插入 MechanicalCostDO mechanicalCost = BeanUtils.toBean(createReqVO, MechanicalCostDO.class); - List deptIds = createReqVO.getTeamIds().stream() + List 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 deptIds = updateReqVO.getTeamIds().stream() + List deptIds = updateReqVO.getTeamIds().stream() .map(TeamBizdomainRelVo::getTeamId) .collect(Collectors.toList()); updateObj.setDeptId(deptIds); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/personalcost/PersonalCostServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/personalcost/PersonalCostServiceImpl.java index 6a1d506..c691efc 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/personalcost/PersonalCostServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/personalcost/PersonalCostServiceImpl.java @@ -40,7 +40,7 @@ public class PersonalCostServiceImpl implements PersonalCostService { public Long createPersonalCost(PersonalCostSaveReqVO createReqVO) { // 插入 PersonalCostDO personalCost = BeanUtils.toBean(createReqVO, PersonalCostDO.class); - List deptIds = createReqVO.getTeamIds().stream() + List 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 deptIds = updateReqVO.getTeamIds().stream() + List deptIds = updateReqVO.getTeamIds().stream() .map(TeamBizdomainRelVo::getTeamId) .collect(Collectors.toList()); updateObj.setDeptId(deptIds); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/rentalmechanicalcost/RentalMechanicalCostServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/rentalmechanicalcost/RentalMechanicalCostServiceImpl.java index ad4249f..658993d 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/rentalmechanicalcost/RentalMechanicalCostServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/rentalmechanicalcost/RentalMechanicalCostServiceImpl.java @@ -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 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 deptIds = updateReqVO.getTeamIds().stream() + .map(TeamBizdomainRelVo::getTeamId) + .collect(Collectors.toList()); + updateObj.setDeptId(deptIds); rentalMechanicalCostMapper.updateById(updateObj); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/wasterecord/WasteRecordServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/wasterecord/WasteRecordServiceImpl.java index 92d2338..7046942 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/wasterecord/WasteRecordServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/wasterecord/WasteRecordServiceImpl.java @@ -35,7 +35,7 @@ public class WasteRecordServiceImpl implements WasteRecordService { public Long createWasteRecord(WasteRecordSaveReqVO createReqVO) { // 插入 WasteRecordDO wasteRecord = BeanUtils.toBean(createReqVO, WasteRecordDO.class); - List deptIds = createReqVO.getTeamIds().stream() + List 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 deptIds = updateReqVO.getTeamIds().stream() + List deptIds = updateReqVO.getTeamIds().stream() .map(TeamBizdomainRelVo::getTeamId) .collect(Collectors.toList()); updateObj.setDeptId(deptIds); -- libgit2 0.21.4