diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index b51d8e4c3..eec94df0b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -16,6 +16,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.DateUtils; import com.jero.common.util.oss.CosBootUtil; @@ -69,6 +70,7 @@ import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysRole; import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.enums.ProjectRoleEnum; import com.jero.modules.system.enums.SysCategoryValueTypeEnum; import com.jero.modules.system.mapper.SysCategoryMapper; @@ -78,8 +80,10 @@ import com.jero.modules.system.mapper.SysUserMapper; import com.jero.modules.system.service.IProjectUserDutyTerritoryService; import com.jero.modules.system.service.ISysCategoryService; import com.jero.modules.system.service.ISysDictItemService; +import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; +import com.jero.modules.system.util.DictItemUtil; import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; import com.jero.modules.todoCenter.entity.ProcessInfoEO; import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService; @@ -203,6 +207,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl pageList = this.page(page, queryWrapper); //平台件数据处理 - platformDispose(projectCertificationInventoryEO, pageList.getRecords()); + platformDispose(cut,projectCertificationInventoryEO, pageList.getRecords()); @@ -1937,9 +1943,10 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl result) { + private void platformDispose(String cut,ProjectCertificationInventoryEO projectCertificationInventoryEO, List result) { List lawsInventoryPlatformEOList = new ArrayList<>(); List projectCertificationInventoryEOS = new ArrayList<>(); + List targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); if(!result.isEmpty()){ //认证清单ID @@ -1989,7 +1996,11 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl libraryBaseList = projectLibraryBaseList.stream() .filter(e -> certificationInventoryEOS.get(0).getProjectLibraryId().equals(e.getId())).collect(Collectors.toList()); if(ObjectUtils.isNotEmpty(libraryBaseList)){ - certificationInventoryEO.setConfigItem(libraryBaseList.get(0).getProjectNameId()); + String dictItemText = DictItemUtil.getDictItemText(cut, libraryBaseList.get(0).getTargetMarket(), targetMarketList); + String configItem = libraryBaseList.get(0).getPower()+"-"+libraryBaseList.get(0).getProducer()+"-"+dictItemText; + + certificationInventoryEO.setConfigItem(configItem); +// certificationInventoryEO.setConfigItem(libraryBaseList.get(0).getProjectNameId()); } if(!certificationInventoryEOS.isEmpty()){ @@ -7156,6 +7167,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); //认证清单数据 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -7204,7 +7216,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl