From 17f4789e33b3b3666873fb39a76bebc9e08bebf3 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Wed, 16 Nov 2022 14:59:22 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/extend/bo/ExtendInfoBO.java          | 17 +++++++++++++++++
 .../mapper/personnelcard/CardAccessMapper.xml   |  4 ----
 .../mapper/personnelcard/CardButtonMapper.xml   |  4 ----
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java
index f226dd56..f1d21517 100644
--- a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java
+++ b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java
@@ -217,6 +217,23 @@ public class ExtendInfoBO {
                 List<SearchConditionOption> searchConditionOptions = SelectOptionParam.convertJsonToListOption(customValue);
                 fieldItem.setOptions(searchConditionOptions);
                 break;
+            case FILEUPLOAD:
+                fieldItem.setUploadUrl("/api/doc/upload/uploadFile");
+                fieldItem.setCategory("category");
+                fieldItem.setMaxFilesNumber(10);
+                fieldItem.setMultiSelection(true);
+                Map<String, Object> otherParamsMap = new HashMap<>();
+                otherParamsMap.put("showClearAll", false);
+                otherParamsMap.put("showOrder", true);
+                fieldItem.setOtherParams(otherParamsMap);
+                break;
+            case DATEPICKER:
+                if ("402".equals(extendInfoPO.getBrowserType())) {
+                    fieldItem.setFormat("YYYY");
+                } else if ("403".equals(extendInfoPO.getBrowserType())) {
+                    fieldItem.setFormat("YYYY-MM");
+                }
+                break;
             default:
                 break;
         }
diff --git a/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.xml b/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.xml
index 5488d10e..a87b3fc8 100644
--- a/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.xml
+++ b/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.xml
@@ -12,8 +12,6 @@
         <result column="custom" property="custom"/>
         <result column="creator" property="creator"/>
         <result column="delete_type" property="deleteType"/>
-        <result column="create_time" property="createTime"/>
-        <result column="update_time" property="updateTime"/>
     </resultMap>
 
 
@@ -29,8 +27,6 @@
         , t.custom
         , t.creator
         , t.delete_type
-        , t.create_time
-        , t.update_time
     </sql>
 
 
diff --git a/src/com/engine/organization/mapper/personnelcard/CardButtonMapper.xml b/src/com/engine/organization/mapper/personnelcard/CardButtonMapper.xml
index 6adfa494..b6128db7 100644
--- a/src/com/engine/organization/mapper/personnelcard/CardButtonMapper.xml
+++ b/src/com/engine/organization/mapper/personnelcard/CardButtonMapper.xml
@@ -12,8 +12,6 @@
         <result column="open_type" property="openType"/>
         <result column="creator" property="creator"/>
         <result column="delete_type" property="deleteType"/>
-        <result column="create_time" property="createTime"/>
-        <result column="update_time" property="updateTime"/>
     </resultMap>
 
 
@@ -31,8 +29,6 @@
         , t.open_type
         , t.creator
         , t.delete_type
-        , t.create_time
-        , t.update_time
     </sql>
     <delete id="deleteByIds">
         delete from jcl_org_cardbutton where id in