From 4736dfa7da1be3286e6d2a249bfdbdf870ad476d Mon Sep 17 00:00:00 2001
From: xiong_cl <140612616@qq.com>
Date: Tue, 23 Apr 2024 10:45:00 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=97=B6=E8=AE=BE=E7=BD=AE=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E4=BB=B6=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysFileController.java  | 19 +++++++++++++++++--
 .../view/sys/file/fileEditLayer.html          |  6 +++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java b/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java
index 7259535..1c2f000 100644
--- a/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java
+++ b/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java
@@ -153,6 +153,20 @@ public class SysFileController extends BaseController<SysFileService, SysFile, S
         return mav;
     }
 
+    @PostMapping("/update")
+    public Result<SysFile> save(SysFile sysFile) throws Exception {
+        //自动编号,每天从一开始
+        String curDate = new SimpleDateFormat("yyyyMMdd").format(new Date());
+        if("".equals(LAST_DATE) || curDate.compareTo(LAST_DATE) > 0){
+            LAST_DATE = curDate;
+            counter = new Counter();
+        }
+        SysFile byId = sysFileService.getById(sysFile.getId());
+        sysFile.setFileNumber(byId.getFileNumber());
+        sysFile.setFileCode(createFileCode(sysFile));
+        return sysFileService.updateOrSave(sysFile);
+    }
+
     /**
      * 文件上传
      *
@@ -328,8 +342,8 @@ public class SysFileController extends BaseController<SysFileService, SysFile, S
             sb.append("0").append("+");
         }
         //资料类型,文件后缀大写
-        if(!StringUtils.isEmpty(file.getFileFullName())){
-            String fullName = file.getFileFullName();
+        if(!StringUtils.isEmpty(file.getFileName())){
+            String fullName = file.getFileName();
             sb.append(fullName.substring(fullName.lastIndexOf(".")+1).toUpperCase()).append("+");
         }else{
             sb.append("0").append("+");
@@ -339,6 +353,7 @@ public class SysFileController extends BaseController<SysFileService, SysFile, S
             for(int i=0;i<objects.size();i++){
                 if(file.getFileFullName().equals(objects.getJSONObject(i).getString("name"))){
                     file.setFileNumber(objects.getJSONObject(i).getString("number"));
+                    break;
                 }
             }
         }
diff --git a/shandan-system/src/main/resources/view/sys/file/fileEditLayer.html b/shandan-system/src/main/resources/view/sys/file/fileEditLayer.html
index f673cea..3e8c4a6 100644
--- a/shandan-system/src/main/resources/view/sys/file/fileEditLayer.html
+++ b/shandan-system/src/main/resources/view/sys/file/fileEditLayer.html
@@ -46,7 +46,7 @@
                     <input type="hidden" name="isFirst">
                     <div class="layui-form-item"
                          th:each="field,iterStat : ${allUploadFormConfig.get(file.dataType)}"
-                         th:if="${field.isShow && field.fieldName != 'dataType'}"
+                         th:if="${field.isShow}"
                          th:style="${field.fieldType == 'textarea' ? 'width: calc(100% - 30px);' : ''}"
                          th:with="username=*{userName}">
                         <label th:if="${field.isRequired}" class="layui-form-label">
@@ -86,7 +86,7 @@
                             <!-- 数据字典类型 -->
                             <div dict-component="select"
                                  th:if="${field.fieldType == 'dict'}"
-                                 th:disabled="${field.isDisabled}"
+                                 th:disabled="${field.fieldName == 'dataType' ? true : field.isDisabled}"
                                  th:dict-type="${field.dictType}"
                                  th:dict-name="${field.fieldName}"
                                  th:id="${'dict-'+field.fieldName}"></div>
@@ -167,7 +167,7 @@
 
                 formVal.labels = layui.datalabel.getData(formVal.id, 'file');
                 await $.ajax({
-                    url: `${ctx}/sys/file/save`,
+                    url: `${ctx}/sys/file/update`,
                     type: 'post',
                     data: formVal,
                     async: false,