Commit b99550afdb79042a6d5975bd9b45829b7ec587c9
1 parent
0f66e518
派单及人机材功能迁移
Showing
2 changed files
with
10 additions
and
11 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/mechanicalcost/vo/MechanicalCostSaveReqVO.java
| 1 | package com.zteits.urbanops.module.garden.controller.admin.mechanicalcost.vo; | 1 | package com.zteits.urbanops.module.garden.controller.admin.mechanicalcost.vo; |
| 2 | 2 | ||
| 3 | import cn.idev.excel.annotation.ExcelProperty; | 3 | import cn.idev.excel.annotation.ExcelProperty; |
| 4 | -import com.zteits.urbanops.module.garden.dal.dataobject.teambizdomainrel.TeamBizdomainRelDO; | 4 | +import com.zteits.urbanops.module.garden.controller.admin.costfee.vo.TeamBizdomainRelVo; |
| 5 | import io.swagger.v3.oas.annotations.media.Schema; | 5 | import io.swagger.v3.oas.annotations.media.Schema; |
| 6 | -import lombok.*; | 6 | +import jakarta.validation.constraints.NotEmpty; |
| 7 | +import jakarta.validation.constraints.NotNull; | ||
| 8 | +import lombok.Data; | ||
| 7 | 9 | ||
| 8 | -import java.time.LocalDate; | ||
| 9 | -import java.util.*; | ||
| 10 | -import jakarta.validation.constraints.*; | ||
| 11 | import java.math.BigDecimal; | 10 | import java.math.BigDecimal; |
| 11 | +import java.time.LocalDate; | ||
| 12 | +import java.util.List; | ||
| 12 | 13 | ||
| 13 | @Schema(description = "管理后台 - 自有机械费用录入新增/修改 Request VO") | 14 | @Schema(description = "管理后台 - 自有机械费用录入新增/修改 Request VO") |
| 14 | @Data | 15 | @Data |
| @@ -74,6 +75,6 @@ public class MechanicalCostSaveReqVO { | @@ -74,6 +75,6 @@ public class MechanicalCostSaveReqVO { | ||
| 74 | private String remark; | 75 | private String remark; |
| 75 | 76 | ||
| 76 | @ExcelProperty("班组") | 77 | @ExcelProperty("班组") |
| 77 | - private List<TeamBizdomainRelDO> teamIds; | 78 | + private List<TeamBizdomainRelVo> teamIds; |
| 78 | 79 | ||
| 79 | } | 80 | } |
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; | @@ -4,12 +4,10 @@ import com.zteits.urbanops.framework.common.pojo.PageResult; | ||
| 4 | import com.zteits.urbanops.framework.common.util.object.BeanUtils; | 4 | import com.zteits.urbanops.framework.common.util.object.BeanUtils; |
| 5 | import com.zteits.urbanops.module.garden.controller.admin.mechanicalcost.vo.MechanicalCostPageReqVO; | 5 | import com.zteits.urbanops.module.garden.controller.admin.mechanicalcost.vo.MechanicalCostPageReqVO; |
| 6 | import com.zteits.urbanops.module.garden.controller.admin.mechanicalcost.vo.MechanicalCostSaveReqVO; | 6 | import com.zteits.urbanops.module.garden.controller.admin.mechanicalcost.vo.MechanicalCostSaveReqVO; |
| 7 | +import com.zteits.urbanops.module.garden.controller.admin.costfee.vo.TeamBizdomainRelVo; | ||
| 7 | import com.zteits.urbanops.module.garden.dal.dataobject.mechanicalcost.MechanicalCostDO; | 8 | import com.zteits.urbanops.module.garden.dal.dataobject.mechanicalcost.MechanicalCostDO; |
| 8 | -import com.zteits.urbanops.module.garden.dal.dataobject.teambizdomainrel.TeamBizdomainRelDO; | ||
| 9 | import com.zteits.urbanops.module.garden.dal.mysql.mechanicalcost.MechanicalCostMapper; | 9 | import com.zteits.urbanops.module.garden.dal.mysql.mechanicalcost.MechanicalCostMapper; |
| 10 | -import com.zteits.urbanops.module.garden.enums.CostFeeConstants; | ||
| 11 | import com.zteits.urbanops.module.garden.service.mechanicaldepreciation.MechanicalDepreciationService; | 10 | import com.zteits.urbanops.module.garden.service.mechanicaldepreciation.MechanicalDepreciationService; |
| 12 | -import com.zteits.urbanops.module.garden.service.teambizdomainrel.TeamBizdomainRelService; | ||
| 13 | import jakarta.annotation.Resource; | 11 | import jakarta.annotation.Resource; |
| 14 | import org.apache.commons.collections4.CollectionUtils; | 12 | import org.apache.commons.collections4.CollectionUtils; |
| 15 | import org.springframework.stereotype.Service; | 13 | import org.springframework.stereotype.Service; |
| @@ -43,7 +41,7 @@ public class MechanicalCostServiceImpl implements MechanicalCostService { | @@ -43,7 +41,7 @@ public class MechanicalCostServiceImpl implements MechanicalCostService { | ||
| 43 | MechanicalCostDO mechanicalCost = BeanUtils.toBean(createReqVO, MechanicalCostDO.class); | 41 | MechanicalCostDO mechanicalCost = BeanUtils.toBean(createReqVO, MechanicalCostDO.class); |
| 44 | 42 | ||
| 45 | List<String> deptIds = createReqVO.getTeamIds().stream() | 43 | List<String> deptIds = createReqVO.getTeamIds().stream() |
| 46 | - .map(TeamBizdomainRelDO::getTeamId) | 44 | + .map(TeamBizdomainRelVo::getTeamId) |
| 47 | .collect(Collectors.toList()); | 45 | .collect(Collectors.toList()); |
| 48 | mechanicalCost.setDeptId(deptIds); | 46 | mechanicalCost.setDeptId(deptIds); |
| 49 | 47 | ||
| @@ -60,7 +58,7 @@ public class MechanicalCostServiceImpl implements MechanicalCostService { | @@ -60,7 +58,7 @@ public class MechanicalCostServiceImpl implements MechanicalCostService { | ||
| 60 | MechanicalCostDO updateObj = BeanUtils.toBean(updateReqVO, MechanicalCostDO.class); | 58 | MechanicalCostDO updateObj = BeanUtils.toBean(updateReqVO, MechanicalCostDO.class); |
| 61 | 59 | ||
| 62 | List<String> deptIds = updateReqVO.getTeamIds().stream() | 60 | List<String> deptIds = updateReqVO.getTeamIds().stream() |
| 63 | - .map(TeamBizdomainRelDO::getTeamId) | 61 | + .map(TeamBizdomainRelVo::getTeamId) |
| 64 | .collect(Collectors.toList()); | 62 | .collect(Collectors.toList()); |
| 65 | updateObj.setDeptId(deptIds); | 63 | updateObj.setDeptId(deptIds); |
| 66 | 64 |