diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index e47903e09..f5c460d69 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -100,7 +100,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl page = new Page(dummyInventoryInfoEO.getPageNo(), dummyInventoryInfoEO.getPageSize()); IPage pageInfo = this.page(page, queryWrapper); //技术领域处理 -// treeDict(dummyInventoryInfoEO, pageInfo); +// treeDict(dummyInventoryInfoEO, pageInfo); return pageInfo; } @@ -210,7 +210,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl dataList = list(queryWrapper.eq("id", dummyInventoryInfoEO.getId())); List dataListCopy = DeepCopyListUtil.depCopy(dataList); -// saveOrUpdate(dummyInventoryInfoEO); +// saveOrUpdate(dummyInventoryInfoEO); LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.in(DummyInventoryInfoEO::getId,dummyInventoryInfoEO.getId()); @@ -329,7 +329,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO,req.getParameterMap()); -// queryWrapper.in("dummy_inventory_base_id",dummyInventoryInfoEO.getDummyInventoryBaseId()); +// queryWrapper.in("dummy_inventory_base_id",dummyInventoryInfoEO.getDummyInventoryBaseId()); queryWrapper.orderByDesc("create_time","serial_number"); List dummyInventoryInfoEOList = this.list(queryWrapper); @@ -461,7 +461,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.in(DummyInventoryInfoEO::getId,inventoryInfoEO.getId()); @@ -1116,28 +1116,28 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl categoryList = sysCategoryService.list(); //普通数据字典 List dictItemList = sysDictItemServiceImpl.selectItemsAll(); @@ -1488,12 +1488,12 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl nowFileList = FileUnZip.readFileByFilename(zipEntryName, fileName,dummyInventoryInfoEO.getCut(),errorMsg,msgList,nameCn,nameEn); if (nowFileList.size() == 0) { -// if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ -// errorMsg += "压缩包中没有" + fileName + "文件; "; -// }else{ -// errorMsg += " Not in the zip package" + fileName + "file; "; -// } -// msgList.add(errorMsg); +// if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ +// errorMsg += "压缩包中没有" + fileName + "文件; "; +// }else{ +// errorMsg += " Not in the zip package" + fileName + "file; "; +// } +// msgList.add(errorMsg); } else { try { FileInputStream input = new FileInputStream(nowFileList.get(0)); @@ -1712,19 +1712,19 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl collect = sysCategoryList.stream() -// .filter(e -> s.equals(e.getId())).collect(Collectors.toList()); -// if(collect.size() != 0){ -// sb.append(collect.get(0).getEnName()+","); -// } -// } -// if(StringUtils.isNotBlank(sb)){ -// String substring = sb.substring(0, sb.length() - 1); -// dummyInventoryInfoEOEn.setTechnologyTerritory(substring); -// } -// } +// String technologyTerritory = dummyInventoryInfoEOEn.getTechnologyTerritory(); +// if(StringUtils.isNotBlank(technologyTerritory)){ +// StringBuilder sb = new StringBuilder(); +// for (String s : technologyTerritory.split(",")) { +// List collect = sysCategoryList.stream() +// .filter(e -> s.equals(e.getId())).collect(Collectors.toList()); +// if(collect.size() != 0){ +// sb.append(collect.get(0).getEnName()+","); +// } +// } +// if(StringUtils.isNotBlank(sb)){ +// String substring = sb.substring(0, sb.length() - 1); +// dummyInventoryInfoEOEn.setTechnologyTerritory(substring); +// } +// } } }