From 6c8decb9b36e6d6217271f2a47877c82bc7dae55 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 24 Aug 2022 10:58:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?=
=?UTF-8?q?=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/common/lang/en-us.js | 3 ++
jero-web/src/common/lang/zh-cn.js | 4 +-
.../components/listOfRegulationsView.vue | 40 +++++++++++++++++++
3 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 7faa511ce..870cbb6fa 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1272,4 +1272,7 @@ module.exports = {
BatchMaintenanceProgress:'Batch Maintenance Progress',
BatchChangeStatus:'Batch Change Status',
CollectinguthenticationParameters:'Collecting Authentication Parameters',
+ rejectedBy:'Rejected By',
+ rejectionTime:'Rejection Time',
+ rejectReason:'Reject Reason',
}
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 736fedef2..5c3278427 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1374,5 +1374,7 @@ module.exports = {
BatchMaintenanceProgress:'批量维护进度',
BatchChangeStatus:'批量修改状态',
CollectinguthenticationParameters:'认证参数收集',
-
+ rejectedBy:'拒绝人',
+ rejectionTime:'拒绝时间',
+ rejectReason:'拒绝原因',
}
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue
index 8601a76be..89ae8dfa5 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue
@@ -433,6 +433,46 @@
+
+
+
+
+
+ {{$t('rejectedBy')}}
+
+
+ {{formInline.verifyRemark ? formInline.verifyRemark : '--'}}
+
+
+
+ {{$t('rejectionTime')}}
+
+
+ {{formInline.verifyRemark ? formInline.verifyRemark : '--'}}
+
+
+
+ {{$t('rejectReason')}}
+
+
+ {{formInline.verifyRemark ? formInline.verifyRemark : '--'}}
+
+
From 34aa0e1412818ee6b6fbe3ebbd8c2fceb8f3912b Mon Sep 17 00:00:00 2001
From: liyawei
Date: Wed, 24 Aug 2022 11:49:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?=
=?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=A8=A1=E6=9D=BF-=E4=B8=8A=E4=BC=A0?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=E9=99=90=E5=88=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../oss/service/impl/OSSFileServiceImpl.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java
index a602b714c..94c8d84af 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java
@@ -19,11 +19,9 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.FileCopyUtils;
import org.springframework.web.multipart.MultipartFile;
-import sun.misc.BASE64Encoder;
import java.io.File;
import java.io.IOException;
-import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
@@ -230,14 +228,15 @@ public class OSSFileServiceImpl extends ServiceImpl impl
throw new JeroBootException("Only upload pdf,word,excel type of file Please select the file again！");
}
}
- } else if ("2".equals(state)) {
- String fileTypeStrTwo = ".doc,.DOC,.docx,.DOCX,.xls, .XLS,.xlsx,.XLSX";
+ } else if ("2".equals(state)) { // 认证-参数导出模板上传 专用
+ String fileTypeStrTwo = ".docx,.DOCX,.xlsx,.XLSX";
+ List fileTypeStrTwoList = Arrays.asList(fileTypeStrTwo.split(","));
//固定文件
- if (!fileTypeStrTwo.contains(fileType)) {
+ if (!fileTypeStrTwoList.contains(fileType)) {
if (cut.equals(CutEnum.CN.getValue())) {
- throw new JeroBootException("只能够上传word,excel类型的文件。请重新选择文件！");
+ throw new JeroBootException("只能够上传.docx,.DOCX,.xlsx,.XLSX后缀类型的文件。请重新选择文件！");
} else {
- throw new JeroBootException("Only upload word,excel type of file Please select the file again！");
+ throw new JeroBootException("Only upload .docx,.DOCX,.xlsx,.XLSX suffix type of file Please select the file again！");
}
}
} else {