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();