|
|
@ -19,11 +19,15 @@ import jnpf.materialvo.entity.MaterialEntity;
|
|
|
|
import jnpf.materialvo.entity.MaterialVoMobileEntity;
|
|
|
|
import jnpf.materialvo.entity.MaterialVoMobileEntity;
|
|
|
|
import jnpf.materialvo.model.material.*;
|
|
|
|
import jnpf.materialvo.model.material.*;
|
|
|
|
import jnpf.materialvo.service.MaterialService;
|
|
|
|
import jnpf.materialvo.service.MaterialService;
|
|
|
|
|
|
|
|
import jnpf.reservoirarea.entity.ReservoirareaEntity;
|
|
|
|
|
|
|
|
import jnpf.reservoirarea.service.ReservoirareaService;
|
|
|
|
import jnpf.util.*;
|
|
|
|
import jnpf.util.*;
|
|
|
|
import jnpf.util.enums.FileTypeEnum;
|
|
|
|
import jnpf.util.enums.FileTypeEnum;
|
|
|
|
import jnpf.util.file.UploadUtil;
|
|
|
|
import jnpf.util.file.UploadUtil;
|
|
|
|
import lombok.Cleanup;
|
|
|
|
import lombok.Cleanup;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
|
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
|
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
|
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
|
|
import org.apache.poi.ss.usermodel.Workbook;
|
|
|
|
import org.apache.poi.ss.usermodel.Workbook;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@ -64,6 +68,9 @@ public class MaterialController {
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
private MaterialService materialService;
|
|
|
|
private MaterialService materialService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
|
|
|
private ReservoirareaService reservoirareaService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -78,10 +85,22 @@ public class MaterialController {
|
|
|
|
List<MaterialVoMobileEntity> list= materialService.getList(materialPagination);
|
|
|
|
List<MaterialVoMobileEntity> list= materialService.getList(materialPagination);
|
|
|
|
//处理id字段转名称,若无需转或者为空可删除
|
|
|
|
//处理id字段转名称,若无需转或者为空可删除
|
|
|
|
for(MaterialVoMobileEntity entity:list){
|
|
|
|
for(MaterialVoMobileEntity entity:list){
|
|
|
|
Map<String,Object> outAreaMap = new HashMap<>();
|
|
|
|
if(StringUtils.isNotEmpty(entity.getInArea())){
|
|
|
|
entity.setOutArea(generaterSwapUtil.getPopupSelectValue("381404161809350213","id","areaname",entity.getOutArea(),outAreaMap));
|
|
|
|
ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(entity.getInArea());
|
|
|
|
Map<String,Object> inAreaMap = new HashMap<>();
|
|
|
|
if (ObjectUtils.isNotEmpty(reservoirareaEntity) && StringUtils.isNotEmpty(reservoirareaEntity.getAreaname())){
|
|
|
|
entity.setInArea(generaterSwapUtil.getPopupSelectValue("381404161809350213","id","areaname",entity.getInArea(),inAreaMap));
|
|
|
|
entity.setInArea(reservoirareaEntity.getAreaname());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if(StringUtils.isNotEmpty(entity.getOutArea())){
|
|
|
|
|
|
|
|
ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(entity.getOutArea());
|
|
|
|
|
|
|
|
if (ObjectUtils.isNotEmpty(reservoirareaEntity) && StringUtils.isNotEmpty(reservoirareaEntity.getAreaname())){
|
|
|
|
|
|
|
|
entity.setOutArea(reservoirareaEntity.getAreaname());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
// Map<String,Object> outAreaMap = new HashMap<>();
|
|
|
|
|
|
|
|
// entity.setOutArea(generaterSwapUtil.getPopupSelectValue("381404161809350213","id","areaname",entity.getOutArea(),outAreaMap));
|
|
|
|
|
|
|
|
// Map<String,Object> inAreaMap = new HashMap<>();
|
|
|
|
|
|
|
|
// entity.setInArea(generaterSwapUtil.getPopupSelectValue("381404161809350213","id","areaname",entity.getInArea(),inAreaMap));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
List<MaterialListVO> listVO=JsonUtil.getJsonToList(list,MaterialListVO.class);
|
|
|
|
List<MaterialListVO> listVO=JsonUtil.getJsonToList(list,MaterialListVO.class);
|
|
|
|
for(MaterialListVO materialVO:listVO){
|
|
|
|
for(MaterialListVO materialVO:listVO){
|
|
|
@ -95,6 +114,28 @@ public class MaterialController {
|
|
|
|
return ActionResult.success(vo);
|
|
|
|
return ActionResult.success(vo);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* PC列表
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
* @param materialPagination
|
|
|
|
|
|
|
|
* @return
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
@PostMapping("/getListPC")
|
|
|
|
|
|
|
|
public ActionResult listPC(@RequestBody MaterialPagination materialPagination)throws IOException{
|
|
|
|
|
|
|
|
List<MaterialEntity> list= materialService.getList2(materialPagination);
|
|
|
|
|
|
|
|
//处理id字段转名称,若无需转或者为空可删除
|
|
|
|
|
|
|
|
for(MaterialEntity entity:list){
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
List<MaterialListVO> listVO=JsonUtil.getJsonToList(list,MaterialListVO.class);
|
|
|
|
|
|
|
|
for(MaterialListVO materialVO:listVO){
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
PageListVO vo=new PageListVO();
|
|
|
|
|
|
|
|
vo.setList(listVO);
|
|
|
|
|
|
|
|
PaginationVO page=JsonUtil.getJsonToBean(materialPagination,PaginationVO.class);
|
|
|
|
|
|
|
|
vo.setPagination(page);
|
|
|
|
|
|
|
|
return ActionResult.success(vo);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 创建
|
|
|
|
* 创建
|
|
|
|