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 teamIds; + private List 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 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 deptIds = updateReqVO.getTeamIds().stream() - .map(TeamBizdomainRelDO::getTeamId) + .map(TeamBizdomainRelVo::getTeamId) .collect(Collectors.toList()); updateObj.setDeptId(deptIds);