From b99550afdb79042a6d5975bd9b45829b7ec587c9 Mon Sep 17 00:00:00 2001
From: wangqian <1406304305@qq.com>
Date: Wed, 26 Nov 2025 17:31:17 +0800
Subject: [PATCH] 派单及人机材功能迁移

---
 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostSaveReqVO.java | 13 +++++++------
 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/mechanicalcost/MechanicalCostServiceImpl.java           |  8 +++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostSaveReqVO.java
index 5e08b77..e5b8363 100644
--- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostSaveReqVO.java
+++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostSaveReqVO.java
@@ -1,14 +1,15 @@
 package com.zteits.urbanops.module.garden.controller.admin.mechanicalcost.vo;
 
 import cn.idev.excel.annotation.ExcelProperty;
-import com.zteits.urbanops.module.garden.dal.dataobject.teambizdomainrel.TeamBizdomainRelDO;
+import com.zteits.urbanops.module.garden.controller.admin.costfee.vo.TeamBizdomainRelVo;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
 
-import java.time.LocalDate;
-import java.util.*;
-import jakarta.validation.constraints.*;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
 
 @Schema(description = "管理后台 - 自有机械费用录入新增/修改 Request VO")
 @Data
@@ -74,6 +75,6 @@ public class MechanicalCostSaveReqVO {
     private String remark;
 
     @ExcelProperty("班组")
-    private List<TeamBizdomainRelDO> teamIds;
+    private List<TeamBizdomainRelVo> teamIds;
 
 }
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 2c0eb85..08f07e1 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
@@ -4,12 +4,10 @@ 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.mechanicalcost.vo.MechanicalCostPageReqVO;
 import com.zteits.urbanops.module.garden.controller.admin.mechanicalcost.vo.MechanicalCostSaveReqVO;
+import com.zteits.urbanops.module.garden.controller.admin.costfee.vo.TeamBizdomainRelVo;
 import com.zteits.urbanops.module.garden.dal.dataobject.mechanicalcost.MechanicalCostDO;
-import com.zteits.urbanops.module.garden.dal.dataobject.teambizdomainrel.TeamBizdomainRelDO;
 import com.zteits.urbanops.module.garden.dal.mysql.mechanicalcost.MechanicalCostMapper;
-import com.zteits.urbanops.module.garden.enums.CostFeeConstants;
 import com.zteits.urbanops.module.garden.service.mechanicaldepreciation.MechanicalDepreciationService;
-import com.zteits.urbanops.module.garden.service.teambizdomainrel.TeamBizdomainRelService;
 import jakarta.annotation.Resource;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
@@ -43,7 +41,7 @@ public class MechanicalCostServiceImpl implements MechanicalCostService {
         MechanicalCostDO mechanicalCost = BeanUtils.toBean(createReqVO, MechanicalCostDO.class);
 
         List<String> deptIds = createReqVO.getTeamIds().stream()
-                .map(TeamBizdomainRelDO::getTeamId)
+                .map(TeamBizdomainRelVo::getTeamId)
                 .collect(Collectors.toList());
         mechanicalCost.setDeptId(deptIds);
 
@@ -60,7 +58,7 @@ public class MechanicalCostServiceImpl implements MechanicalCostService {
         MechanicalCostDO updateObj = BeanUtils.toBean(updateReqVO, MechanicalCostDO.class);
 
         List<String> deptIds = updateReqVO.getTeamIds().stream()
-                .map(TeamBizdomainRelDO::getTeamId)
+                .map(TeamBizdomainRelVo::getTeamId)
                 .collect(Collectors.toList());
         updateObj.setDeptId(deptIds);
 
--
libgit2 0.21.4