:bug: 修改无法上传文件和新增档案的bug

README.md

@@ -15,7 +15,7 @@ ______
 > 配置：16h32g 500g Centos7.8
 > + ip: `66.1.21.157`
 > + 用户名: `root`
-> + 密码: ` Jda!2t456`
+> + 密码: `Jda!2t456`
 
 #### mysql部署说明：
 
@@ -111,3 +111,10 @@ ______
 > + 关于对建邺区江东中路377号南京金融城一期项目地下室进行确认的复函
 
 > Excel卷内目录档号公式   `=A2&"-"&TEXT(IF(ISNUMBER(FIND("-",G2,1)),LEFT(G2,FIND("-",G2,1) - 1),G2),"0000")`
+
+
+## 6.数据挂接
+* 2019年文书档案
+> 已挂接完成
+* 2020年文书档案
+> 挂接中：

src/main/java/com/gz/job/MountArchiveFileJob.java

@@ -176,4 +176,9 @@ public class MountArchiveFileJob {
         }
         log.info("发送完成");
     }
+
+    public static void main(String[] args) {
+
+        System.out.println(ReUtil.isMatch(MountArchiveFileConfig.ZY_DH_RE, "5179-001-ZY·BH-Y-01802-0037"));
+    }
 }

src/main/java/com/gz/service/archive/impl/ArchiveServiceImpl.java

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
@@ -16,7 +15,6 @@ import com.gz.core.exception.BusinessException;
 import com.gz.core.exception.CustomExceptionEnum;
 import com.gz.dto.archive.ArchiveDTO;
 import com.gz.dto.archive.SecondaryArchiveDTO;
-import com.gz.dto.archive.SecondaryArchiveDTO;
 import com.gz.dto.system.ArchivesTreeDTO;
 import com.gz.dto.system.MenuRoleDTO;
 import com.gz.mapper.archive.ArchiveMapper;

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

@@ -413,7 +413,7 @@
             if (sl) {
                 data.ml = sl
             }
-            http.post(urlParam.id == '' ? 'archive/archive/insert' : 'archive/archive/update', data, true, function (res) {
+            http.post(!urlParam.id ? 'archive/archive/insert' : 'archive/archive/update', data, true, function (res) {
                 if (res.code == 200) {
                     let index = layer.alert('保存成功!', {
                         title: urlParam.id == '' ? '添加' : '修改' + '信息'
@@ -754,11 +754,9 @@
                 maxmin: true,
                 shadeClose: true,
                 area: ['600px', '400px'],
-                content: './upload.html',
+                content: './upload.html?archiveId=' + urlParam.id + '&fileType=' + fileType,
                 success: function (layero, index) {
                     var body = layer.getChildFrame('body', index);
-                    body.find("#archive_id").val(id);
-                    body.find("#fileType").val(fileType);
                 },
                 end: function () {
                     renderTable()

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

@@ -55,12 +55,13 @@
 <script src="../../lib/layui-v2.5.5/layui.js" charset="utf-8"></script>
 <script src="../../js/lay-config.js?v=1.0.4" charset="utf-8"></script>
 <script>
-    layui.use(['form', 'upload', 'http'], () => {
+    layui.use(['form', 'upload', 'http', 'url'], () => {
 
         let layer = layui.layer;
 
-        let archive_id = layui.$("#archive_id").val()
-        let fileType = layui.$("#fileType").val()
+        const urlParam = layui.url()
+        let archive_id = urlParam.archiveId
+        let fileType = urlParam.fileType
         let secondaryArchiveId = ''
         let selectFile = false;