From b4d1d4c8e4f7ef743e6fc7d2969a5e608a8433da Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 4 Apr 2022 20:58:30 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=AF=BC=E5=87=BAbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/BussDocumentLibraryEOMapper.java | 2 +- .../xml/BussDocumentLibraryEOMapper.xml | 7 + .../IBussDocumentLibraryEOService.java | 1 + .../BussDocumentLibraryEOServiceImpl.java | 6 +- .../impl/FileSplitItemsEOServiceImpl.java | 181 ++++++++++++++++-- 5 files changed, 179 insertions(+), 18 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/BussDocumentLibraryEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/BussDocumentLibraryEOMapper.java index 2047cae83..30086c92c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/BussDocumentLibraryEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/BussDocumentLibraryEOMapper.java @@ -90,7 +90,7 @@ public interface BussDocumentLibraryEOMapper extends BaseMapper> queryListByIds(@Param("ids") String ids); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml index 78be81527..7886fc5f2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/mapper/xml/BussDocumentLibraryEOMapper.xml @@ -82,4 +82,11 @@ where id=#{id} + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java index d3a5e37b2..75ca620c7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java @@ -193,4 +193,5 @@ public interface IBussDocumentLibraryEOService extends IService ids); + List> queryListByIds(String ids); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 624498b40..90491e8bc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.google.common.collect.Maps; import com.jero.common.constant.CommonConstant; import com.jero.common.constant.WebsocketConst; import com.jero.common.constant.enums.*; @@ -4105,6 +4104,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> queryListByIds(String ids) { + return bussDocumentLibraryEOMapper.queryListByIds(ids); + } + private void putMapCn(String id,String serialNumber,String moduleType, String content,String title,String fileText, String fileName,String cut,Map stringMap, diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 53325b6b4..c8792c886 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -21,6 +21,7 @@ import com.jero.common.util.DateUtils; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; import com.jero.modules.document.enums.FieldTypeEnum; +import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.ocr.util.UUIDUtils; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; @@ -46,6 +47,8 @@ import com.jero.modules.split.util.POIReadExcelToHtml; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysCategoryTreeVO; import com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.UserUtils; @@ -114,6 +117,11 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl fieldList = onlCgformFieldService.getFieldList(ModuleEnum.FILE_SPLIT_ITEMS.getValue()); -// // 日期类型字段 -// List onlCgformFieldList = fieldList.stream() -// .filter(e -> FieldTypeEnum.DATE_SINGLE.getValue().equals(e.getFieldShowType())) -// .collect(Collectors.toList()); -// List fieldDateList = onlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); + // 日期类型字段 + List onlCgformFieldList = fieldList.stream() + .filter(e -> FieldTypeEnum.DATE_SINGLE.getValue().equals(e.getFieldShowType())) + .collect(Collectors.toList()); + List fieldDateList = onlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); + // 人员选择 + List onlCgformFieldPersonList = fieldList.stream() + .filter(e -> FieldTypeEnum.PERSON.getValue().equals(e.getFieldShowType())) + .collect(Collectors.toList()); + List fieldPersonList = onlCgformFieldPersonList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); + // 标准选择 + List onlCgformFieldStanList = fieldList.stream() + .filter(e -> FieldTypeEnum.STANDARD.getValue().equals(e.getFieldShowType())) + .collect(Collectors.toList()); + List fieldStanList = onlCgformFieldStanList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); + // 文件字段 + List onlCgformFieldFileList = fieldList.stream() + .filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())) + .collect(Collectors.toList()); + List fileList = onlCgformFieldFileList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); + // 列表显示字段 if (fieldList.size() != 0) { // 过滤得到列表字段(is_show_list-->列表是否显示0否 1是) @@ -445,21 +469,68 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl treeFieldList = fieldList.stream() .filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())) .collect(Collectors.toList()); - //数据字典 + + // 数据字典 List sysDictItems = sysDictItemServiceImpl.selectItemsAll(); - //下拉选处理数据字典 + // 下拉选处理数据字典 List records = infoPage.getRecords(); - List idList = new ArrayList<>(); + List fileIdList = new ArrayList<>(); for (Map record : records) { Map record1 = (Map) record; - idList.add((String) record1.get("id")); for (Map.Entry entry : record1.entrySet()) { List collect = fieldList.stream() - .filter(e -> entry.getKey().equals(e.getDictField()) && !FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())) + .filter(e -> entry.getKey().equals(e.getDbFieldName()) && !FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())) .collect(Collectors.toList()); - //下拉选处理数据字典 + // 下拉选处理数据字典 dictItem(sysDictItems, entry, collect, cut); + // 树形结构处理数据字典 treeDictItem(categoryList, entry, treeFieldList, cut); + // 文件类型 获取connectId 用于列表回显文件名 + if(fileList.contains(entry.getKey()) && StringUtils.isNotBlank((String)entry.getValue())){ + fileIdList.add((String)entry.getValue()); + } + // 单日期 + if(fieldDateList.contains(entry.getKey()) && ObjectUtil.isNotEmpty(entry.getValue())){ + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + entry.setValue(dateFormat.format((Date)entry.getValue())); + } + // 人员选择 + if(fieldPersonList.contains(entry.getKey()) && StringUtils.isNotBlank((String)entry.getValue())) { + List sysUserList = sysUserService.listByIds(Arrays.asList(entry.getValue().toString().split(","))); + StringBuilder stringBuilder = new StringBuilder(); + for(SysUser user : sysUserList){ + stringBuilder.append(user.getRealname()).append("(").append(user.getUsername()).append("),"); + } + String value = stringBuilder.substring(0, stringBuilder.lastIndexOf(",")); + entry.setValue(value); + } + // 标准选择 + if(fieldStanList.contains(entry.getKey()) && StringUtils.isNotBlank((String)entry.getValue())) { + List> documentLibraryEOList = documentLibraryEOService.queryListByIds(entry.getValue().toString()); + if(CollectionUtil.isNotEmpty(documentLibraryEOList)){ + String value = StringUtils.join(documentLibraryEOList.stream().map(map->map.get("serial_number")).collect(Collectors.toList()),","); + entry.setValue(value); + } + } + } + } + // 拼接文件名 + if(fileIdList.size() != 0){ + List fileInfos = ossFileService.getFileInfos(StringUtils.join(fileIdList, ",")); + if(fileInfos.size() != 0){ + for (Map record : records) { + Map record1 = (Map) record; + for (Map.Entry entry : record1.entrySet()) { + if(fileList.contains(entry.getKey()) && StringUtils.isNotBlank((String)entry.getValue())){ + String value = (String) entry.getValue(); + List ossFileList = fileInfos.stream().filter(e -> value.equals(e.getConnectId())).collect(Collectors.toList()); + if(ossFileList.size() != 0){ + List fileNameList = ossFileList.stream().map(OSSFile::getFileName).collect(Collectors.toList()); + entry.setValue(StringUtils.join(fileNameList,",")); + } + } + } + } } } return infoPage; @@ -536,7 +607,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl> mapList = queryCondition("4", null); + List> mapList = queryCondition(ModuleEnum.FILE_SPLIT_ITEMS.getValue(), null); //查询条件处理 for (Map.Entry entry : parameter.entrySet()) { @@ -586,6 +657,14 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl= '" + value.split(",")[0] + "'" + + " and " + "date_format(" + key + ",'%Y-%m-%d') <= '" + value.split(",")[1] + "'"); + } else { + conditionSb.append(" and " + "date_format(" + key + ",'%Y-%m-%d') = '" + value + "'"); + } } } } @@ -2146,9 +2225,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl sysDictItems, Map.Entry entry, List collect, String cut) { - Map map = new HashMap<>(); //通过dictField判断字段是否为下拉选(不为空则为下拉选) if (collect.size() != 0 && StringUtils.isNotBlank(collect.get(0).getDictField())) { + String dictCode = collect.get(0).getDictField(); String value = (String) entry.getValue(); //数据字典中文 List dictItemsCh = new ArrayList<>(); @@ -2157,7 +2236,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl dictItemList = sysDictItems.stream() - .filter(e -> StringUtils.isNotBlank(e.getDictCode()) && e.getDictCode().equals(entry.getKey())) + .filter(e -> StringUtils.isNotBlank(e.getDictCode()) && e.getDictCode().equals(dictCode)) .collect(Collectors.toList()); if (dictItemList.size() != 0) { List dictItems = dictItemList.stream() @@ -2315,12 +2394,34 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl> itemsDataForExport = dao.queryByOrdersForExport(field,idList, infoId); // 查询条款表所有字段 List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.FILE_SPLIT_ITEMS.getValue()); + // 日期类型字段 + List onlCgformFieldList = fieldList.stream() + .filter(e -> FieldTypeEnum.DATE_SINGLE.getValue().equals(e.getFieldShowType())) + .collect(Collectors.toList()); + List fieldDateList = onlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); + // 人员选择 + List onlCgformFieldPersonList = fieldList.stream() + .filter(e -> FieldTypeEnum.PERSON.getValue().equals(e.getFieldShowType())) + .collect(Collectors.toList()); + List fieldPersonList = onlCgformFieldPersonList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); + // 标准选择 + List onlCgformFieldStanList = fieldList.stream() + .filter(e -> FieldTypeEnum.STANDARD.getValue().equals(e.getFieldShowType())) + .collect(Collectors.toList()); + List fieldStanList = onlCgformFieldStanList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); + // 文件字段 + List onlCgformFieldFileList = fieldList.stream() + .filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())) + .collect(Collectors.toList()); + List fileList = onlCgformFieldFileList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); + // 过滤导出字段 if (fieldList.size() != 0) { fieldList = fieldList.stream() .filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm())) || "条款内容".equals(e.getDbFieldTxt())) .collect(Collectors.toList()); } + //树形数据字典 List categoryList = sysCategoryService.list(); //过滤出树形字段 @@ -2329,16 +2430,64 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl sysDictItems = sysDictItemServiceImpl.selectItemsAll(); + List fileIdList = new ArrayList<>(); // 处理数据下拉框，树形结构数据及中英文切换 for (Map record : itemsDataForExport) { Map record1 = (Map) record; for (Map.Entry entry : record1.entrySet()) { List collect = fieldList.stream() - .filter(e -> entry.getKey().equals(e.getDictField()) && !FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())) + .filter(e -> entry.getKey().equals(e.getDbFieldName()) && !FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())) .collect(Collectors.toList()); //下拉选处理数据字典 dictItem(sysDictItems, entry, collect, cut); + // 树形结构处理数据字典 treeDictItem(categoryList, entry, treeFieldList, cut); + // 文件类型 获取connectId 用于列表回显文件名 + if(fileList.contains(entry.getKey()) && StringUtils.isNotBlank((String)entry.getValue())){ + fileIdList.add((String)entry.getValue()); + } + // 单日期 + if(fieldDateList.contains(entry.getKey()) && ObjectUtil.isNotEmpty(entry.getValue())){ + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + entry.setValue(dateFormat.format((Date)entry.getValue())); + } + // 人员选择 + if(fieldPersonList.contains(entry.getKey()) && StringUtils.isNotBlank((String)entry.getValue())) { + List sysUserList = sysUserService.listByIds(Arrays.asList(entry.getValue().toString().split(","))); + StringBuilder stringBuilder = new StringBuilder(); + for(SysUser user : sysUserList){ + stringBuilder.append(user.getRealname()).append("(").append(user.getUsername()).append("),"); + } + String value = stringBuilder.substring(0, stringBuilder.lastIndexOf(",")); + entry.setValue(value); + } + // 标准选择 + if(fieldStanList.contains(entry.getKey()) && StringUtils.isNotBlank((String)entry.getValue())) { + List> documentLibraryEOList = documentLibraryEOService.queryListByIds(entry.getValue().toString()); + if(CollectionUtil.isNotEmpty(documentLibraryEOList)){ + String value = StringUtils.join(documentLibraryEOList.stream().map(map->map.get("serial_number")).collect(Collectors.toList()),","); + entry.setValue(value); + } + } + } + } + // 拼接文件名 + if(fileIdList.size() != 0){ + List fileInfos = ossFileService.getFileInfos(StringUtils.join(fileIdList, ",")); + if(fileInfos.size() != 0){ + for (Map record : itemsDataForExport) { + Map record1 = (Map) record; + for (Map.Entry entry : record1.entrySet()) { + if(fileList.contains(entry.getKey()) && StringUtils.isNotBlank((String) entry.getValue())){ + String value = (String) entry.getValue(); + List ossFileList = fileInfos.stream().filter(e -> value.equals(e.getConnectId())).collect(Collectors.toList()); + if(ossFileList.size() != 0){ + List fileNameList = ossFileList.stream().map(OSSFile::getFileName).collect(Collectors.toList()); + entry.setValue(StringUtils.join(fileNameList,",")); + } + } + } + } } } return itemsDataForExport; From fda4e46956ddceaef7891e53915f79e635da1fd2 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Tue, 5 Apr 2022 12:54:09 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E8=A7=84=E8=8C=83=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OnlCgformCollectionController.java | 46 +------------------ .../jero/modules/tag/entity/OnlCgformTag.java | 26 ----------- 2 files changed, 1 insertion(+), 71 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java index bb494e516..d6affe4bb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java @@ -43,60 +43,17 @@ public class OnlCgformCollectionController extends JeroController queryPageList(@RequestBody Map params){ - /* - public Result queryPageList(OnlCgformCollection onlCgformCollection, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(onlCgformCollection, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = onlCgformCollectionService.page(page, queryWrapper); - */ IPage pageList = onlCgformCollectionService.queryPageList(params); return Result.OK(pageList); } - /** - * 表头中英文切换 - * - * @return - */ - /* - @AutoLog(value = "标签管理-表头中英文切换") - @ApiOperation(value="标签管理-表头中英文切换", notes="标签管理-表头中英文切换") - @GetMapping(value = "/getHeader") - public Result>> getHeader(@RequestParam(name = "flag") String flag, - @RequestParam(name = "cut") String cut) { - List> list =onlCgformCollectionService.queryCondition(flag, cut); - return Result.OK(list); - } - */ - - /** - * 查询条件中英文切换 - * - * @return - */ - /* - @AutoLog(value = "OCR识别转换记录表-查询条件中英文切换") - @ApiOperation(value="OCR识别转换记录表-查询条件中英文切换", notes="OCR识别转换记录表-查询条件中英文切换") - @GetMapping(value = "/queryCondition") - public Result>> queryCondition(@RequestParam(name = "flag") String flag, - @RequestParam(name = "cut") String cut) { - List> list = onlCgformCollectionService.queryCondition(flag, cut); - return Result.OK(list); - } - */ /** * 列表查询 * @@ -178,7 +135,6 @@ public class OnlCgformCollectionController extends JeroController Date: Tue, 5 Apr 2022 13:26:06 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=87=E7=AD=BE=E7=BC=96=E8=BE=91=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9A=84Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BussDocumentLibraryEOServiceImpl.java | 2 +- .../tag/controller/OnlCgformTagController.java | 11 ++++++----- .../tag/service/impl/OnlCgformTagServiceImpl.java | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 90491e8bc..d96c213f4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -2412,7 +2412,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl parameter) { String cut = (String) parameter.get("cut");//中英文切换标识 //需要查询的字段 - List fieldList = onlCgformFieldService.getFieldList("1"); + List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); //日期类型字段 List onlCgformFieldList = fieldList.stream().filter(e -> FieldTypeEnum.DATE_SINGLE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); List fieldDateList = onlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java index abb99a851..b1a38c42a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java @@ -111,7 +111,7 @@ public class OnlCgformTagController extends JeroController Date: Tue, 5 Apr 2022 13:43:39 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OnlCgformTagController.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java index b1a38c42a..33646652e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java @@ -112,9 +112,9 @@ public class OnlCgformTagController extends JeroController Date: Tue, 5 Apr 2022 14:28:54 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=A4=84=E7=90=86=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?id=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=97=B6=E7=9A=84=E6=8A=A5?= =?UTF-8?q?=E9=94=99=20=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=96=B0=E5=A2=9E=E6=97=B6=EF=BC=8C=E6=95=B0=E5=AD=97?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E4=B8=8D=E5=A1=AB=E5=86=99=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 82 +++++++++++-------- 1 file changed, 46 insertions(+), 36 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index d96c213f4..eb518706b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -721,13 +721,20 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> getInfoById(String id, String cut) { //通过id查询数据 List> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id); + + List> result = new ArrayList<>(); // 要返回的结果 + if (dataList.isEmpty()){ + // 取不到数据，直接返回空结果 + return result; + } + //查询所有 List> mapList = bussDocumentLibraryEOMapper.selectMapsAll(null); //原始对应标准,代替标准,被代替标准(原始数据存的是iD) String correspondingStandardId = ""; String replaceStandardId = "";//代替标准 - if (dataList.size() != 0) { + if (!dataList.isEmpty()) { correspondingStandardId = (String) dataList.get(0).get("corresponding_standard");//对应标准 replaceStandardId = (String) dataList.get(0).get("replace_standard");//代替标准 } @@ -886,7 +893,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl表单是否显示0否 1是) fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowForm()))).collect(Collectors.toList()); } - List> result = new ArrayList<>(); + for (OnlCgformArea onlCgformAreaTemp : areaList) { String areaName = ""; if (CutEnum.CN.getValue().equals(cut)) { @@ -1138,44 +1145,47 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldFile = null; - try { - fieldFile = fieldFileList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList()); - } catch (Exception e) { - e.printStackTrace(); - } - if (fieldFile.size() != 0 && ObjectUtils.isNotEmpty(value)) { - String valueTemp = UUID.randomUUID().toString().replace("-", ""); - stringObjectMap.put(key,valueTemp); - // value = valueTemp; - //修改文件表关联信息connect_id - List oSSFileList = new ArrayList<>(); - for (String fileId : value.toString().split(",")) { - OSSFile ossFile = new OSSFile(); - ossFile.setId(fileId); - ossFile.setConnectId(valueTemp); - oSSFileList.add(ossFile); + if (ObjectUtils.isNotEmpty(value)) { + //处理日期格式 + if (fieldDateList.contains(key)) { + if (ObjectUtils.isNotEmpty(value)) { + value = "str_to_date('" + value + "','%Y-%m-%d %H:%i:%s')"; + } else { + value = null; } - if (oSSFileList.size() != 0) { - oSSFileAll.addAll(oSSFileList); - } - iOSSFileService.updateFileInfo(oSSFileList); - valuesBuilder.append("," + "'" + valueTemp + "'"); + valuesBuilder.append("," + value); } else { - valuesBuilder.append("," + "'" + value + "'"); + //处理文件类型 + List fieldFile = null; + try { + fieldFile = fieldFileList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList()); + } catch (Exception e) { + e.printStackTrace(); + } + if (fieldFile.size() != 0 && ObjectUtils.isNotEmpty(value)) { + String valueTemp = UUID.randomUUID().toString().replace("-", ""); + stringObjectMap.put(key,valueTemp); + // value = valueTemp; + //修改文件表关联信息connect_id + List oSSFileList = new ArrayList<>(); + for (String fileId : value.toString().split(",")) { + OSSFile ossFile = new OSSFile(); + ossFile.setId(fileId); + ossFile.setConnectId(valueTemp); + oSSFileList.add(ossFile); + } + if (oSSFileList.size() != 0) { + oSSFileAll.addAll(oSSFileList); + } + iOSSFileService.updateFileInfo(oSSFileList); + + valuesBuilder.append("," + "'" + valueTemp + "'"); + } else { + valuesBuilder.append("," + "'" + value + "'"); + } } + fieldsBuilder.append("," + key); } - fieldsBuilder.append("," + key); } } catch (Exception e) { e.printStackTrace(); From 61be7b40777553614d813517640defad590769e7 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Tue, 5 Apr 2022 14:42:02 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83=E7=9A=84=E5=88=86=E9=A1=B5?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/common/es/JeroElasticsearchTemplate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/es/JeroElasticsearchTemplate.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/es/JeroElasticsearchTemplate.java index 0a2124459..1972b7b25 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/es/JeroElasticsearchTemplate.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/es/JeroElasticsearchTemplate.java @@ -442,7 +442,7 @@ public class JeroElasticsearchTemplate { json.put("highlight", highlight); json.put("query", query); json.put("sort", sort); - json.put("from", from); + json.put("from", from * size); json.put("size", size); return json; } From 663ff87b7fa25010b07d778f2bc740f6b223e898 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Tue, 5 Apr 2022 16:10:35 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=A0=87=E7=AD=BE-=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E6=8B=86=E5=88=86=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/tag/controller/OnlCgformTagController.java | 6 ++++-- .../modules/tag/service/impl/OnlCgformTagServiceImpl.java | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java index 33646652e..751c3d287 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java @@ -92,7 +92,8 @@ public class OnlCgformTagController extends JeroController result=new Result<>(); //校验--不能向数据库添加重复数据 QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("db_field_txt",onlCgformTag.getDbFieldTxt()); + //查询同一模块下,同名数据 + queryWrapper.eq("db_field_txt",onlCgformTag.getDbFieldTxt()).eq("is_model",onlCgformTag.getIsModel()); List existCgformTagList = this.onlCgformTagService.list(queryWrapper); if(!existCgformTagList.isEmpty()){ @@ -146,7 +147,8 @@ public class OnlCgformTagController extends JeroController queryWrapper=new QueryWrapper<>(); - queryWrapper.eq("db_Field_txt",onlCgformTag.getDbFieldTxt()); + //查询同一模块下,同名数据 + queryWrapper.eq("db_Field_txt",onlCgformTag.getDbFieldTxt()).eq("is_model",onlCgformTag.getIsModel()); List existCgformTagList=onlCgformTagService.list(queryWrapper); if(!existCgformTagList.isEmpty()){//有同名数据 if(existCgformTagList.get(0).getId().equals(onlCgformTag.getId())){//已存在同名的数据,就是正在编辑的这个 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java index 060fabd09..c893f992d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java @@ -148,7 +148,6 @@ public class OnlCgformTagServiceImpl extends ServiceImpl