diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java index 766562154..6f81ec1c5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java @@ -220,7 +220,7 @@ public class BussDocumentLibraryEOController extends JeroController addInfo(Map map) { + public Result addInfo(@RequestBody Map map) { try { bussDocumentLibraryEOService.addInfo(map); } catch (Exception e) { 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 2f442baab..08f4aff02 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 @@ -335,6 +335,22 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldFile = fieldFileList.stream().filter(e -> entry.getKey().equals(e.getDbFieldName())).collect(Collectors.toList()); + if (fieldFile.size() != 0 && ObjectUtils.isNotEmpty(value)) { + + String valueTemp = UUID.randomUUID().toString().replace("-", ""); + 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); + } + iOSSFileService.updateFileInfo(oSSFileList); + } valuesBuilder.append("'" + value + "'" + ","); } fieldsBuilder.append(key + ","); @@ -352,6 +368,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl parameter) { - //过滤查询条件字段类型使用 - List> mapList = queryCondition("1"); + //需要查询的字段 @@ -380,18 +398,26 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldListTemp = fieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); List fieldListNew = new ArrayList<>(); fieldListNew.add("id"); - //转时间格式 + //转时间格式 case when region is null then "" else region end region for (String field : fieldListTemp) { + String fieldTemp = null; if ("issue_time".equals(field) || "implement_time".equals(field)) { - fieldListNew.add("date_format(" + field + ", '%Y-%m-%d %H:%i:%s')"); + String fieldNew = "date_format(" + field + ", '%Y-%m-%d %H:%i:%s')"; + fieldTemp = "case when "+fieldNew+" is null then \"\" else "+fieldNew+" end "+ field; + fieldListNew.add(fieldTemp); } else { - fieldListNew.add(field); + fieldTemp = "case when "+field+" is null then \"\" else "+field+" end "+ field; + fieldListNew.add(fieldTemp); } } //查询条件 StringBuilder conditionSb = new StringBuilder("where 1 = 1"); + //过滤查询条件字段类型使用 + List> mapList = queryCondition("1"); + + //查询条件处理 if (ObjectUtils.isNotEmpty(parameter)) { for (Map.Entry entry : parameter.entrySet()) { String key = entry.getKey(); @@ -418,7 +444,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl= '" + value.split(",")[0] + "'"