From 9fafb83c43359263d893f3cefc66d18f76d7c953 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Fri, 1 Apr 2022 15:59:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86=E6=9D=A1?=
 =?UTF-8?q?=E6=AC=BE-=E5=A4=84=E7=90=86=E6=97=B6=E9=97=B4,=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6,=E4=BA=BA=E5=91=98=E9=80=89=E6=8B=A9=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/FileSplitItemsEOServiceImpl.java     | 58 ++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

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 2154362aa..c60d8d219 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
@@ -309,10 +309,66 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
     public int insertInfo(Map<String, Object> parameter, String id){
         StringBuilder fieldsBuilder = new StringBuilder(); // 字段名称
         StringBuilder valuesBuilder = new StringBuilder(); // 字段值
+
+         // 查询全部字段属性
+        List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.FILE_SPLIT_ITEMS.getValue());
+        // 文件类型字段
+        List<OnlCgformField> onlFieldFileList = fieldList.stream().filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
+        List<String> fieldFieldList = onlFieldFileList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
+        // 日期类型字段(单日期选择)
+        List<OnlCgformField> onlFieldDateList = fieldList.stream().filter(e -> FieldTypeEnum.DATE_SINGLE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
+        List<String> fieldDateList = onlFieldDateList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
+        // 人员选择类型
+        List<OnlCgformField> onlFieldPersonList = fieldList.stream().filter(e -> FieldTypeEnum.PERSON.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
+        List<String> fieldPersonList = onlFieldPersonList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
+
+        List<String> fieldPersonIdList = new ArrayList<>();
+        fieldPersonList.forEach(item->{
+            String fieldPersonId = item + "_id";
+            fieldPersonIdList.add(fieldPersonId);
+        });
         for (Map.Entry<String, Object> entry : parameter.entrySet()) {
             String key = entry.getKey();
             Object value = entry.getValue();
-            valuesBuilder.append("," + "'" + value + "'");
+            // 处理日期,文件,人员选择类型的字段
+            //处理日期格式
+            if (fieldDateList.contains(key) && ("creation_time".equals(key) || "modify_time".equals(key))) {
+                if (ObjectUtils.isNotEmpty(value)) {
+                    value = "str_to_date('" + value + "','%Y-%m-%d')";
+                } else {
+                    value = null;
+                }
+                valuesBuilder.append("," + value);
+            } else if (fieldFieldList.contains(key)) {
+                //处理文件类型
+                if (ObjectUtils.isNotEmpty(value)) {
+                    String valueTemp = UUID.randomUUID().toString().replace("-", "");
+                    //                    value = valueTemp;
+                    //修改文件表关联信息connect_id
+                    List<OSSFile> oSSFileList = new ArrayList<>();
+                    for (String fileId : value.toString().split(",")) {
+                        OSSFile ossFile = new OSSFile();
+                        ossFile.setId(fileId);
+                        ossFile.setConnectId(valueTemp);
+                        oSSFileList.add(ossFile);
+                    }
+                    ossFileService.updateFileInfo(oSSFileList);
+                    valuesBuilder.append("," + "'" + valueTemp + "'");
+                } else {
+                    valuesBuilder.append("," + "'" + value + "'");
+                }
+            } else if(fieldPersonList.contains(key)){
+                // 人员选择类型
+                value = parameter.get(key+"_id");
+                valuesBuilder.append("," + "'" + value + "'");
+
+
+            }  else if(fieldPersonIdList.contains(key)){
+                continue;
+            } else {
+                valuesBuilder.append("," + "'" + value + "'");
+            }
+
             fieldsBuilder.append("," + key);
         }
         String mustFields = "id,creation_user,creation_time,modify_user,modify_time,sys_org_code";