From df91bd7881b01d50a482d0dfada0cb833941cf23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com>
Date: Fri, 9 Sep 2022 15:04:44 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=A6=85=E9=81=93bug5943?=
 =?UTF-8?q?5=20=E3=80=81=2059407?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/evaluationResultsWhole.vue       | 17 +++++++++++------
 .../components/documentDataComparison.vue       | 17 ++++++++---------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
index 7c54837f7..5666202f0 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
@@ -25,7 +25,7 @@
             <!--              {{$t('engineerFeedbackResults')}}-->
             <!--            </div>-->
             <a-card :bordered="false" class="box-clause" style="margin-top: 20px" v-for="(item,index) in dataSource">
-              <div class="table-operator">
+              <div class="table-operator" v-if="item.id">
                 <div class="operator-text" style="float: left;font-size: 16px">
                   {{$t('engineer')+item.createBy+$t('feedbackResults')}}
                 </div>
@@ -110,7 +110,7 @@
       }
     },
     mounted() {
-      document.title = this.$route.query.serialNumber +' '+this.$t('regulatoryTechnicalEvaluationResults')
+      document.title = this.$route.query.serialNumber + ' ' + this.$t('regulatoryTechnicalEvaluationResults')
       this.getList()
     },
     methods: {
@@ -118,10 +118,10 @@
         let query = {
           firstInitiation: '2',
           whetherTobring: '2',
-          processBackground:this.$route.query.processBackground || '',
-          remark:this.$route.query.remark || '',
-          standId:this.$route.query.standId,
-          lawsTechnologyEvaluationId:this.$route.query.lawsTechnologyEvaluationId
+          processBackground: this.$route.query.processBackground || '',
+          remark: this.$route.query.remark || '',
+          standId: this.$route.query.standId,
+          lawsTechnologyEvaluationId: this.$route.query.lawsTechnologyEvaluationId
         }
         let newUrl = this.$router.resolve({
           path: '/evaluationInitiationProcess',
@@ -146,6 +146,11 @@
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
             this.dataSource = res.result || []
+            if (this.dataSource.length == 0) {
+              this.dataSource.push({
+                name: ''
+              })
+            }
             this.loading = false
           } else {
             this.dataSource = []
diff --git a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue
index 6ee645982..89a8b60b6 100644
--- a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue
+++ b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue
@@ -118,9 +118,9 @@
       @cancel="visible = false"
     >
       <template slot="footer">
-        <a-button type="primary" @click="fullTextCommentsEdit">
-          {{$t('edit')}}
-        </a-button>
+<!--        <a-button type="primary" @click="fullTextCommentsEdit">-->
+<!--          {{$t('edit')}}-->
+<!--        </a-button>-->
         <a-button type="primary" :loading="confirmLoading" @click="fullTextCommentsSubmit">
           {{$t('submit')}}
         </a-button>
@@ -133,7 +133,6 @@
           <a-form-model-item class="itemModel" style="width: calc(100% - 113px)" prop="comment">
             <a-textarea :placeholder="$t('pleaseEnter')+$t('fullTextComments')"
                         v-model.trim="formInlineText.comment"
-                        :disabled="fullTextDisabled"
                         :rows="4"/>
           </a-form-model-item>
         </div>
@@ -256,11 +255,11 @@
       },
       addFullTextCommentClick() {
         this.visible = true
-        if (this.formInlineText.comment) {
-          this.fullTextDisabled = true
-        } else {
-          this.fullTextDisabled = false
-        }
+        // if (this.formInlineText.comment) {
+        //   this.fullTextDisabled = true
+        // } else {
+        //   this.fullTextDisabled = false
+        // }
       },
       turnOffAutomaticMatchingClick() {
         this.isMatching = !this.isMatching

From e2024da38d62193009fc6e1944b9742f06d6fd49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com>
Date: Fri, 9 Sep 2022 15:09:07 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E5=AF=B9=E6=AF=94=E5=85=A8=E6=96=87=E5=AF=B9=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/documentDataComparison.vue     | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue
index 89a8b60b6..3446e276d 100644
--- a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue
+++ b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue
@@ -118,9 +118,9 @@
       @cancel="visible = false"
     >
       <template slot="footer">
-<!--        <a-button type="primary" @click="fullTextCommentsEdit">-->
-<!--          {{$t('edit')}}-->
-<!--        </a-button>-->
+        <!--        <a-button type="primary" @click="fullTextCommentsEdit">-->
+        <!--          {{$t('edit')}}-->
+        <!--        </a-button>-->
         <a-button type="primary" :loading="confirmLoading" @click="fullTextCommentsSubmit">
           {{$t('submit')}}
         </a-button>
@@ -137,6 +137,7 @@
           </a-form-model-item>
         </div>
       </a-form-model>
+      <JLoading :loading="textDataLoading">{{$t('dataLoading')}}</JLoading>
     </a-modal>
     <JLoading :loading="loading">{{dataLoadingText}}</JLoading>
   </div>
@@ -152,7 +153,7 @@
         formInline: {},
         formInlineText: {},
         dataLoadingText: '',
-        loadingText:false,
+        loadingText: false,
         rules: {
           comment: [
             {
@@ -172,6 +173,7 @@
           ]
         },
         loading: false,
+        textDataLoading: false,
         visible: false,
         confirmLoading: false,
         fullTextDisabled: false,
@@ -255,6 +257,19 @@
       },
       addFullTextCommentClick() {
         this.visible = true
+        let query = {
+          id: this.$route.query.id
+        }
+        this.textDataLoading = true
+        postAction('/compare/sarFileCompareInfo/getComparisonDetail', query).then((res) => {
+          if (res.success) {
+            this.formInlineText.comment = res.result.comments || ''
+            this.formInlineText = { ...this.formInlineText }
+            this.textDataLoading = false
+          } else {
+            this.textDataLoading = false
+          }
+        })
         // if (this.formInlineText.comment) {
         //   this.fullTextDisabled = true
         // } else {
@@ -387,7 +402,7 @@
             this.loadingText = false
             this.resultData.textLeft[this.dataLeft.numIndex].itemsText = res.result[0]
             this.resultData.textRight[this.dataRight.numIndex].itemsText = res.result[1]
-          }else{
+          } else {
             this.loadingText = false
           }
         })

From bd152116cd19968d0ea641f2f142283cf202a8b6 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Fri, 9 Sep 2022 16:52:15 +0800
Subject: [PATCH 3/4] =?UTF-8?q?59392=20=E4=B8=8A=E4=BC=A0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=EF=BC=8C=E6=9C=80=E5=A4=9A70=E4=BD=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/controller/CommonController.java   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java
index d369bb8fc..6e92fa0dd 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java
@@ -170,6 +170,13 @@ public class CommonController {
 //                bizPath = "";
 //            }
         }
+        if(file.getOriginalFilename().length()>70){
+            if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+                throw new JeroBootException("文件名长度不能超过70位，请检查！");
+            }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+                throw new JeroBootException("File name length cannot exceed 70 characters, please check!");
+            }
+        }
 //        OSSFile oSSFile = ossFileService.uploadLocal(file, bizPath,state,cut);
         OSSFile oSSFile = ossFileService.uploadLocalOfCos(file, bizPath,state,cut); // 切换cos
         if (oConvertUtils.isNotEmpty(oSSFile)) {
@@ -186,6 +193,10 @@ public class CommonController {
         return result;
     }
 
+    public static void main(String[] args) {
+
+    }
+
     /**
      * 查看已上传的文件
      * @param id

From 38aba3cf8aa0d791d480af41d2b8c516df0ae5d6 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Fri, 9 Sep 2022 17:54:41 +0800
Subject: [PATCH 4/4] =?UTF-8?q?59439=20=E4=BF=AE=E6=94=B9=20=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E7=BF=BB=E8=AF=91=EF=BC=8C=E8=AE=A1=E7=AE=97=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91=E6=96=87=E6=9C=AC=E6=96=B9=E6=B3=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../docTranslation/utils/TranslationDocumentUtils.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/utils/TranslationDocumentUtils.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/utils/TranslationDocumentUtils.java
index 4ea483db6..8e4aa43a5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/utils/TranslationDocumentUtils.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/utils/TranslationDocumentUtils.java
@@ -88,11 +88,15 @@ public class TranslationDocumentUtils {
                     if(i == 0){
                         translateFrontTextSplit = translateFrontText.substring(0,splitLength);
                     }else {
+                        //每一次截取开始的下标
+                        int startSplitLength = i*(splitLength) + 1;
                         //如果长度不够根据splitLength再截取一次。
-                        if(translateFrontText.length() < i*splitLength+(splitLength+1)){
-                            translateFrontTextSplit = translateFrontText.substring(i*(splitLength + 1),translateFrontText.length());
+                        if(translateFrontText.length() < i*splitLength+(splitLength)){
+                            if(startSplitLength < translateFrontText.length()){
+                                translateFrontTextSplit = translateFrontText.substring(startSplitLength,translateFrontText.length());
+                            }
                         }else {
-                            translateFrontTextSplit = translateFrontText.substring(i*(splitLength + 1),i*splitLength+(splitLength+1));
+                            translateFrontTextSplit = translateFrontText.substring(startSplitLength,i*splitLength+(splitLength));
                         }
                     }