工程管理
This commit is contained in:
parent
935f8d5823
commit
8f87295d6a
|
|
@ -1,5 +1,6 @@
|
||||||
package com.bonus.material.basic.service.impl;
|
package com.bonus.material.basic.service.impl;
|
||||||
|
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
|
|
@ -7,13 +8,15 @@ import cn.hutool.core.util.PhoneUtil;
|
||||||
import com.alibaba.nacos.common.utils.CollectionUtils;
|
import com.alibaba.nacos.common.utils.CollectionUtils;
|
||||||
import com.bonus.common.biz.constant.MaterialConstants;
|
import com.bonus.common.biz.constant.MaterialConstants;
|
||||||
import com.bonus.common.biz.enums.HttpCodeEnum;
|
import com.bonus.common.biz.enums.HttpCodeEnum;
|
||||||
import com.bonus.common.biz.exception.BusinessException;
|
import com.bonus.common.core.constant.SecurityConstants;
|
||||||
import com.bonus.common.core.utils.DateUtils;
|
import com.bonus.common.core.utils.DateUtils;
|
||||||
import com.bonus.common.core.web.domain.AjaxResult;
|
import com.bonus.common.core.web.domain.AjaxResult;
|
||||||
import com.bonus.common.security.utils.SecurityUtils;
|
import com.bonus.common.security.utils.SecurityUtils;
|
||||||
|
import com.bonus.system.api.RemoteDeptService;
|
||||||
|
import com.bonus.system.api.domain.SysDept;
|
||||||
|
import com.fasterxml.jackson.databind.DeserializationFeature;
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.hibernate.validator.internal.util.StringHelper;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import com.bonus.material.basic.mapper.BmProjectMapper;
|
import com.bonus.material.basic.mapper.BmProjectMapper;
|
||||||
import com.bonus.material.basic.domain.BmProject;
|
import com.bonus.material.basic.domain.BmProject;
|
||||||
|
|
@ -35,6 +38,9 @@ public class BmProjectServiceImpl implements IBmProjectService
|
||||||
@Resource
|
@Resource
|
||||||
private BmProjectMapper bmProjectMapper;
|
private BmProjectMapper bmProjectMapper;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private RemoteDeptService remoteDeptService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询标段工程管理
|
* 查询标段工程管理
|
||||||
*
|
*
|
||||||
|
|
@ -45,10 +51,23 @@ public class BmProjectServiceImpl implements IBmProjectService
|
||||||
public BmProject selectBmProjectByProId(Long proId)
|
public BmProject selectBmProjectByProId(Long proId)
|
||||||
{
|
{
|
||||||
BmProject project = bmProjectMapper.selectBmProjectByProId(proId);
|
BmProject project = bmProjectMapper.selectBmProjectByProId(proId);
|
||||||
|
extractedImpUnit(project);
|
||||||
extracted(project);
|
extracted(project);
|
||||||
return project;
|
return project;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void extractedImpUnit(BmProject project) {
|
||||||
|
AjaxResult ajaxResult = remoteDeptService.getInfo(Long.parseLong(project.getImpUnit()), SecurityConstants.INNER);
|
||||||
|
// ajaxResult.get("data") 返回的是 LinkedHashMap
|
||||||
|
LinkedHashMap rawDataList = (LinkedHashMap) ajaxResult.get("data");
|
||||||
|
ObjectMapper objectMapper = new ObjectMapper();
|
||||||
|
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
|
||||||
|
if (rawDataList != null) {
|
||||||
|
SysDept sysDept = objectMapper.convertValue(rawDataList, SysDept.class);
|
||||||
|
project.setImpUnit(sysDept.getDeptName() == null ? "" : sysDept.getDeptName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询标段工程管理列表
|
* 查询标段工程管理列表
|
||||||
*
|
*
|
||||||
|
|
@ -61,6 +80,7 @@ public class BmProjectServiceImpl implements IBmProjectService
|
||||||
List<BmProject> list = bmProjectMapper.selectBmProjectList(bmProject);
|
List<BmProject> list = bmProjectMapper.selectBmProjectList(bmProject);
|
||||||
if (CollectionUtils.isNotEmpty(list)) {
|
if (CollectionUtils.isNotEmpty(list)) {
|
||||||
list.forEach(item -> {
|
list.forEach(item -> {
|
||||||
|
extractedImpUnit(item);
|
||||||
extracted(item);
|
extracted(item);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue