提交

src/main/java/com/gz/rvo/system/LogRVO.java

@@ -30,7 +30,7 @@ public class LogRVO {
     private String execIp;
 
     // 操作人
-    private Integer execBy;
+    private String execBy;
 
     // 操作时间
     private String execTime;

src/main/resources/application-test.yml

@@ -16,7 +16,7 @@ spring:
     druid:
       # 初始化大小，最小，最大
       initial-size: 5
-      min-idle: 51
+      min-idle: 5
       max-active: 20
       # 配置获取连接等待超时的时间
       max-wait: 60000

src/main/resources/mapper/archiveBorrowMapper.xml

@@ -7,11 +7,11 @@
                a.dh,
                a.tm,
                a.ml,
-               ab.create_time,
+               date_format(ab.create_time,'%Y-%m-%d') create_time,
                ab.borrow_type,
-               ab.return_time,
+               date_format(ab.return_time,'%Y-%m-%d') return_time,
                ab.return_status,
-               ab.estimate_return_time,
+               date_format(ab.estimate_return_time,'%Y-%m-%d') estimate_return_time,
                ab.audit_status,
                ab.name admin_name
         FROM tab_archive_borrow ab

src/main/resources/static/index.html

@@ -52,7 +52,7 @@
             padding: 0 !important;
             margin: 0 !important;
             height: auto !important;
-            left: -40px;
+            left: -10px;
         }
 
 

src/main/resources/static/page/archive/list.html

@@ -462,7 +462,7 @@
 
         let importExcel = function (){
             var index = layer.open({
-                title: '高级检索',
+                title: '文档导入',
                 type: 2,
                 shade: 0.2,
                 maxmin: true,

src/main/resources/static/page/myBorrow/list.html

@@ -119,14 +119,10 @@
                         {field: 'dh', title: '档号', width: 240},
                         {field: 'tm', title: '题名'},
                         {
-                            field: 'createTime', title: '申请试卷', width: 110, templet(rv) {
-                                return rv.createTime.substring(0, 11)
-                            }
+                            field: 'createTime', title: '申请时间', width: 110
                         },
                         {
-                            field: 'estimateReturnTime', title: '归还时间', width: 110, templet(rv) {
-                                return rv.estimateReturnTime.substring(0, 11)
-                            }
+                            field: 'estimateReturnTime', title: '归还时间', width: 110
                         },
                         // {field: 'mjText', title: '密级'}1,
                         {field: 'adminName', title: '借阅人', width: 110},