diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java index 7b60304f..f1b27396 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.ImportExcelDatas.service.impl; import com.adc.da.att.service.IAttFileEOService; import com.adc.da.att.vo.AttFileVo; +import com.adc.da.http.Result; import com.adc.da.slrs.ImportExcelDatas.dao.ImportExcelDao; import com.adc.da.slrs.ImportExcelDatas.entity.ImportDto; import com.adc.da.slrs.ImportExcelDatas.service.ImportExcelService; @@ -9,6 +10,10 @@ import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; +import com.adc.da.sys.dao.DicTypeEODao; +import com.adc.da.sys.entity.DicTypeEO; +import com.adc.da.sys.entity.DictionaryEO; +import com.adc.da.sys.service.impl.DicTypeEOServiceImpl; import com.adc.da.util.UUIDUtils; import com.adc.da.utils.util.InitStandAttrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -269,11 +274,16 @@ public class ImportExcelServiceImpl extends ServiceImpl storageExclData(Map> importListMap) { + + error = importListMap.get("error"); /** * 初始化国内外标准属性字段 @@ -292,8 +302,8 @@ public class ImportExcelServiceImpl extends ServiceImpl mapFilter = standAttrMap; - SarStandardsInfo ForeignEO = parseImportDtoToStandardsInfo(item,mapFilter, standID); + Map mapField = standAttrMap; + SarStandardsInfo ForeignEO = parseImportDtoToStandardsInfo(item,mapField, standID); if (ForeignEO != null) { ForeignEO.setValidFlag("0"); @@ -347,8 +357,8 @@ public class ImportExcelServiceImpl extends ServiceImpl { String standID = UUIDUtils.randomUUID20(); //使用初始化的属性字段映射 获得key值,value为"" - Map mapStandFiled = standAttrMap; - SarStandardsInfo InlandEO = parseImportDtoToStandardsInfo(item, mapStandFiled,standID); + Map mapStandField = standAttrMap; + SarStandardsInfo InlandEO = parseImportDtoToStandardsInfo(item, mapStandField,standID); if (InlandEO != null) { @@ -450,11 +460,11 @@ public class ImportExcelServiceImpl extends ServiceImpl filedMap, String standId) { + public SarStandardsInfo parseImportDtoToStandardsInfo(ImportDto importDto,Map fieldMap, String standId) { HashMap analysis = analysisStandId(importDto); @@ -488,8 +498,8 @@ public class ImportExcelServiceImpl extends ServiceImpl mapFiled, String standId) { + public SarBussionessStand parseImportDtoToSarBussionessStand(ImportDto importDto,Map fieldMap, String standId) { HashMap analysis = analysisStandId(importDto); @@ -592,10 +602,10 @@ public class ImportExcelServiceImpl extends ServiceImpl analysisStandId(ImportDto importDto) { HashMap result = new HashMap<>(); if (importDto.getStandId() == null) { @@ -645,6 +659,7 @@ public class ImportExcelServiceImpl extends ServiceImpl isExist = dicTypeEOService.getTypeIdByDicIdAndTypeName("JKSADFH564S", null, sort, null); + if (isExist == null || isExist.isEmpty() || isExist.size()==0){ + + DicTypeEO dicTypeVO = new DicTypeEO(); + dicTypeVO.setId(null); + dicTypeVO.setDicId("JKSADFH564S"); + dicTypeVO.setDicTypeCode(sort); + dicTypeVO.setDicTypeName(sort); + dicTypeVO.setShowIndex(1); + Integer dicTypeEO = dicTypeEOService.saveDictype(dicTypeVO); + if (dicTypeEO>0){ + importDto.setErrorStr("标准类别不存在,已新增"); + }else { + importDto.setErrorStr("标准类别不存在,新增失败"); + } + error.add(importDto); + } + + + + + return result; } } + + + }