|
@@ -3,6 +3,7 @@ package com.example.resourceplatform.service.impl;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.example.resourceplatform.common.BusinessException;
|
|
import com.example.resourceplatform.common.BusinessException;
|
|
|
|
|
+import com.example.resourceplatform.common.PurchaseDuration;
|
|
|
import com.example.resourceplatform.common.ResourceStatus;
|
|
import com.example.resourceplatform.common.ResourceStatus;
|
|
|
import com.example.resourceplatform.dto.*;
|
|
import com.example.resourceplatform.dto.*;
|
|
|
import com.example.resourceplatform.entity.*;
|
|
import com.example.resourceplatform.entity.*;
|
|
@@ -148,6 +149,8 @@ public class ResourceServiceImpl implements ResourceService {
|
|
|
vo.setStatus(r.getStatus());
|
|
vo.setStatus(r.getStatus());
|
|
|
vo.setStatusText(statusText(r.getStatus()));
|
|
vo.setStatusText(statusText(r.getStatus()));
|
|
|
vo.setRemark(r.getRemark());
|
|
vo.setRemark(r.getRemark());
|
|
|
|
|
+ vo.setPurchaseDuration(r.getPurchaseDuration());
|
|
|
|
|
+ vo.setPurchaseDurationText(PurchaseDuration.getTextByCode(r.getPurchaseDuration()));
|
|
|
|
|
|
|
|
List<Long> projectIds = resourceProjectIdsMap.getOrDefault(r.getId(), List.of());
|
|
List<Long> projectIds = resourceProjectIdsMap.getOrDefault(r.getId(), List.of());
|
|
|
vo.setProjects(projectIds.stream().map(pid -> {
|
|
vo.setProjects(projectIds.stream().map(pid -> {
|
|
@@ -190,6 +193,7 @@ public class ResourceServiceImpl implements ResourceService {
|
|
|
resource.setCostCycle(dto.getCostCycle());
|
|
resource.setCostCycle(dto.getCostCycle());
|
|
|
resource.setOwnerId(dto.getOwnerId());
|
|
resource.setOwnerId(dto.getOwnerId());
|
|
|
resource.setRemark(dto.getRemark());
|
|
resource.setRemark(dto.getRemark());
|
|
|
|
|
+ resource.setPurchaseDuration(dto.getPurchaseDuration());
|
|
|
if (isNew) {
|
|
if (isNew) {
|
|
|
resource.setStatus(ResourceStatus.ACTIVE.getCode());
|
|
resource.setStatus(ResourceStatus.ACTIVE.getCode());
|
|
|
resourceMapper.insert(resource);
|
|
resourceMapper.insert(resource);
|