BJ_FS / urbanops

Commit b99550afdb79042a6d5975bd9b45829b7ec587c9

Authored by wangqian
1 parent 0f66e518

派单及人机材功能迁移

Inline Side-by-side
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
  View file @b99550a
1 1 package com.zteits.urbanops.module.garden.controller.admin.mechanicalcost.vo;
2 2  
3 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 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 10 import java.math.BigDecimal;
  11 +import java.time.LocalDate;
  12 +import java.util.List;
12 13  
13 14 @Schema(description = "管理后台 - 自有机械费用录入新增/修改 Request VO")
14 15 @Data
... ... @@ -74,6 +75,6 @@ public class MechanicalCostSaveReqVO {
74 75 private String remark;
75 76  
76 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
  View file @b99550a
... ... @@ -4,12 +4,10 @@ import com.zteits.urbanops.framework.common.pojo.PageResult;
4 4 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
5 5 import com.zteits.urbanops.module.garden.controller.admin.mechanicalcost.vo.MechanicalCostPageReqVO;
6 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 8 import com.zteits.urbanops.module.garden.dal.dataobject.mechanicalcost.MechanicalCostDO;
8   -import com.zteits.urbanops.module.garden.dal.dataobject.teambizdomainrel.TeamBizdomainRelDO;
9 9 import com.zteits.urbanops.module.garden.dal.mysql.mechanicalcost.MechanicalCostMapper;
10   -import com.zteits.urbanops.module.garden.enums.CostFeeConstants;
11 10 import com.zteits.urbanops.module.garden.service.mechanicaldepreciation.MechanicalDepreciationService;
12   -import com.zteits.urbanops.module.garden.service.teambizdomainrel.TeamBizdomainRelService;
13 11 import jakarta.annotation.Resource;
14 12 import org.apache.commons.collections4.CollectionUtils;
15 13 import org.springframework.stereotype.Service;
... ... @@ -43,7 +41,7 @@ public class MechanicalCostServiceImpl implements MechanicalCostService {
43 41 MechanicalCostDO mechanicalCost = BeanUtils.toBean(createReqVO, MechanicalCostDO.class);
44 42  
45 43 List<String> deptIds = createReqVO.getTeamIds().stream()
46   - .map(TeamBizdomainRelDO::getTeamId)
  44 + .map(TeamBizdomainRelVo::getTeamId)
47 45 .collect(Collectors.toList());
48 46 mechanicalCost.setDeptId(deptIds);
49 47  
... ... @@ -60,7 +58,7 @@ public class MechanicalCostServiceImpl implements MechanicalCostService {
60 58 MechanicalCostDO updateObj = BeanUtils.toBean(updateReqVO, MechanicalCostDO.class);
61 59  
62 60 List<String> deptIds = updateReqVO.getTeamIds().stream()
63   - .map(TeamBizdomainRelDO::getTeamId)
  61 + .map(TeamBizdomainRelVo::getTeamId)
64 62 .collect(Collectors.toList());
65 63 updateObj.setDeptId(deptIds);
66 64  
... ...