From 0cf8c9c58fce25f9cbbe4696c66fee0d03a6c6a5 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 9 Jun 2023 09:21:11 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=BD=B1=E5=93=8D?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E9=80=89=E5=90=A6=E6=97=B6=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=90=86=E7=94=B1=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/upgradeimpactassessment.vue    | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
index a64bc49e4..330db7124 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
@@ -159,6 +159,12 @@
                      :title="form.qttext ? form.qttext : $t('PleaseEnter')"
                      :placeholder="$t('PleaseEnter')"></a-input>
           </div>
+          <div v-if='flagly'>
+            <a-input class="box-input2"
+                     v-model="form.ly"
+                     :title="form.ly ? form.ly : $t('PleaseEnter')+ $t('reason')"
+                     :placeholder="$t('PleaseEnter')+ $t('reason')"></a-input>
+          </div>
         </td>
       </tr>
       <tr>
@@ -220,6 +226,7 @@ export default {
       flag:false,
       flagqr:false,
       flagqrqt:false,
+      flagly:false,
       loading: false,
       disable:false,
       columns: [
@@ -420,22 +427,27 @@ this.$forceUpdate()
           }
           if(this.form.yhqr == '1'){
             this.flagqr = true
+            this.flagly = false
             this.qrheight = '100px'
           }else{
             this.flagqr = false
-            this.qrheight = '50px'
+            this.flagly = true
+            this.qrheight = '100px'
           }
           if(this.form.yhqr == '1' && this.form.flagqr == '344a3320beba45afb3718c59b7a7144a'){
             this.qrheight = '150px'
             this.flagqrqt = true
+            this.flagly = false
           }else if(this.form.yhqr == '1' && this.form.flagqr != '344a3320beba45afb3718c59b7a7144a'){
             this.flagqr = true
             this.flagqrqt = false
+            this.flagly = false
             this.qrheight = '100px'
           }else {
             this.flagqrqt = false
             this.flagqr = false
-            this.qrheight = '50px'
+            this.flagly = true
+            this.qrheight = '100px'
           }
         })
     },
@@ -476,12 +488,14 @@ this.$forceUpdate()
       if(val.target.value == '1'){
         this.qrheight = '100px'
         this.flagqr = true
+        this.flagly = false
         if(this.form.flagqr == '344a3320beba45afb3718c59b7a7144a'){
           this.qrheight = '150px'
           this.flagqrqt = true
         }
       }else{
-        this.qrheight = '50px'
+        this.qrheight = '100px'
+        this.flagly = true
         this.flagqr = false
         this.flagqrqt = false
       }
@@ -490,9 +504,11 @@ this.$forceUpdate()
       if(val == '344a3320beba45afb3718c59b7a7144a'){
         this.qrheight = '150px'
         this.flagqrqt = true
+        this.flagly = false
       }else {
         this.qrheight = '100px'
         this.flagqrqt = false
+        this.flagly = false
       }
     },
   }

From 12d84e2d9015b6df6932fc719a95fdbfaf6ffc0e Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 9 Jun 2023 15:19:17 +0800
Subject: [PATCH 2/9] =?UTF-8?q?UAT=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 jero-web/src/components/tools/UserMenu.vue    | 32 +++++++++++++++----
 .../parameter/managementdetails/index.vue     | 32 +++++++++++++++++++
 .../ParameterItemCollectionList.vue           | 24 +++++++-------
 .../components/statistics.vue                 |  1 +
 6 files changed, 73 insertions(+), 18 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 17561d0c1..c50650abd 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1847,4 +1847,5 @@ module.exports = {
   approvalcycle:'Approval cycle(day)',
   transittime:'Transit Time',
   returntime:'Return time',
+  operationguide:'Project operation guide',
 }
\ 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 58eec5d73..a7caae8ad 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1948,4 +1948,5 @@ module.exports = {
   approvalcycle:'审批周期(天)',
   transittime:'通过时间',
   returntime:'退回时间',
+  operationguide:'项目操作指南',
 }
\ No newline at end of file
diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue
index 5b1a81350..8f6eae6a4 100644
--- a/jero-web/src/components/tools/UserMenu.vue
+++ b/jero-web/src/components/tools/UserMenu.vue
@@ -31,13 +31,30 @@
     <!--        <a-icon type="question-circle-o"></a-icon>-->
     <!--      </a>-->
     <!--    </span>-->
-    <div class="action" @click="Jumpflybook">
-      <span  class="header-notice">
-         <a-tooltip placement="bottomRight" :title="$t('userManual')" overlayClassName="tooltipColor">
-          <a-icon style="font-size: 16px; padding: 4px; color: #000000A6" type="question-circle"/>
-           </a-tooltip>
+<!--    <div class="action" @click="Jumpflybook">-->
+<!--      <span  class="header-notice">-->
+<!--         <a-tooltip placement="bottomRight" :title="$t('userManual')" overlayClassName="tooltipColor">-->
+<!--          <a-icon style="font-size: 16px; padding: 4px; color: #000000A6" type="question-circle"/>-->
+<!--           </a-tooltip>-->
+<!--      </span>-->
+<!--    </div>-->
+    <a-dropdown>
+      <span class="action action-full ant-dropdown-link user-dropdown-menu">
+<!--        <a-avatar class="avatar" size="small" :src="getAvatar()"/>-->
+        <!--                <span v-if="isDesktop()">welcome,{{ userInfo().username }}</span>-->
+        <a-icon style="font-size: 16px; padding: 4px; color: #000000A6" type="question-circle"/>
       </span>
-    </div>
+      <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
+        <a-menu-item key="5" @click="Jumpflybook">
+<!--          <a-icon type="logout"/>-->
+          <span>{{$t('userManual')}}</span>
+        </a-menu-item>
+        <a-menu-item key="6" @click="Jumpoperationguide">
+<!--          <a-icon type="logout"/>-->
+          <span>{{$t('operationguide')}}</span>
+        </a-menu-item>
+      </a-menu>
+    </a-dropdown>
     <header-notice class="action"/>
     <div class="action">
       <span v-show="localeval=='zh-cn'">
@@ -217,6 +234,9 @@
       Jumpflybook(){
         window.open('https://eicgyqr5mc.feishu.cn/docx/doxcnY2GbQfMSMqLP0eIFzFlEcd', '_blank');
       },
+      Jumpoperationguide(){
+        window.open('https://eicgyqr5mc.feishu.cn/docx/ZyhWdIz7EoMZ68xhI2bckcWWnMg', '_blank');
+      },
       /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
       ...mapActions(['Logout']),
       ...mapGetters(['username', 'avatar', 'userInfo']),
diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue
index 936066d2b..3f6febdc6 100644
--- a/jero-web/src/views/parameter/managementdetails/index.vue
+++ b/jero-web/src/views/parameter/managementdetails/index.vue
@@ -71,6 +71,38 @@
                   v-model="formInline.sdtName"/>
               </div>
             </a-col>
+              <a-col :md="6" :sm="8">
+                <div class="box-title-text">
+                  <div class="title-text" :title="$t('NareaOfResponsibility')">
+                    <span>{{$t('NareaOfResponsibility')}}</span>
+                  </div>
+                  <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
+                                      :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
+                                      :type="'select'"
+                                      :triggerChange="false" :dictCode="'duty_territory'"/>
+                </div>
+              </a-col>
+              <a-col :md="6" :sm="8">
+                <div class="box-title-text">
+                  <div class="title-text" :title="$t('Required')">
+                    <span>{{$t('Required')}}</span>
+                  </div>
+<!--                  <j-multi-select-tag class="box-input" v-model="formInline.isMust"-->
+<!--                                      :placeholder="$t('PleaseSelect')+$t('Required')"-->
+<!--                                      :type="'select'"-->
+<!--                                      :triggerChange="false" :dictCode="'duty_territory'"/>-->
+<!--                  <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('Required')"-->
+<!--                           v-model="formInline.isMust"></a-input>-->
+                  <a-select class="box-input" v-model="formInline.isMust" :placeholder="$t('PleaseSelect')+$t('Required')">
+                    <a-select-option :value="'0'">
+                      {{$t('yes')}}
+                    </a-select-option>
+                    <a-select-option :value="'1'">
+                      {{$t('notOnlyRz')}}
+                    </a-select-option>
+                  </a-select>
+                </div>
+              </a-col>
             </template>
             <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index e0210dca8..c02eec2f8 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -67,25 +67,25 @@
                   <!--                  </a-col>-->
                   <a-col :md="6" :sm="8">
                     <div class="box-title-text">
-                      <div class="title-text" :title="$t('certificationCategory')">
-                        <span>{{$t('certificationCategory')}}</span>
+                      <div class="title-text" :title="$t('NareaOfResponsibility')">
+                        <span>{{$t('NareaOfResponsibility')}}</span>
                       </div>
-                      <j-dict-select-tag class="box-input" v-model="formInline.certCategory"
-                                         :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
-                                         :type="'select'"
-                                         :triggerChange="false" :dictCode="'cert_category'"/>
+                      <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
+                                          :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
+                                          :type="'select'"
+                                          :triggerChange="false" :dictCode="'duty_territory'"/>
                     </div>
                   </a-col>
                   <template v-if="toggleSearchStatus">
                     <a-col :md="6" :sm="8">
                       <div class="box-title-text">
-                        <div class="title-text" :title="$t('NareaOfResponsibility')">
-                          <span>{{$t('NareaOfResponsibility')}}</span>
+                        <div class="title-text" :title="$t('certificationCategory')">
+                          <span>{{$t('certificationCategory')}}</span>
                         </div>
-                        <j-multi-select-tag class="box-input" v-model="formInline.dutyTerritory"
-                                            :placeholder="$t('PleaseSelect')+$t('NareaOfResponsibility')"
-                                            :type="'select'"
-                                            :triggerChange="false" :dictCode="'duty_territory'"/>
+                        <j-dict-select-tag class="box-input" v-model="formInline.certCategory"
+                                           :placeholder="$t('PleaseSelect')+$t('certificationCategory')"
+                                           :type="'select'"
+                                           :triggerChange="false" :dictCode="'cert_category'"/>
                       </div>
                     </a-col>
                     <a-col :md="6" :sm="8">
diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue
index 5e7b3c5ec..182febd9f 100644
--- a/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue
+++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue
@@ -165,6 +165,7 @@
         this.title = val.name
         this.projectQuery = val
         this.getEchart()
+        console.log(this.projectQuery.name)
         if (this.projectQuery.name == this.$t('certificationSubmission') || this.projectQuery.name == this.$t('certificationEnd')) {
           this.$nextTick(() => {
             this.num = '0'

From 9ba12690a374978295e706d2b2c272bc252d2761 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 9 Jun 2023 15:19:45 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=80=E8=88=AC=E5=AF=BC=E5=87=BA=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/parameter/managementdetails/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue
index 3f6febdc6..211482e7f 100644
--- a/jero-web/src/views/parameter/managementdetails/index.vue
+++ b/jero-web/src/views/parameter/managementdetails/index.vue
@@ -125,10 +125,10 @@
         {{$t('preservation')}}
       </div>
       <!--      导出-->
-      <div @click="handleExport" class="operator-text" v-has="'report:detail:export:normal'">
-        <a-icon type="export"/>
-        {{$t('dataExport')}}
-      </div>
+<!--      <div @click="handleExport" class="operator-text" v-has="'report:detail:export:normal'">-->
+<!--        <a-icon type="export"/>-->
+<!--        {{$t('dataExport')}}-->
+<!--      </div>-->
       <div @click="ConventionalExport" class="operator-text" v-has="'report:detail:export:normal'">
         <a-icon type="export" :rotate="-90"/>
         {{$t('ConventionalExport')}}

From 60f832349e57c1561abdc9f3c6e5fa145fd91786 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 14 Jun 2023 16:45:21 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=B8=A6=E5=85=A5=E6=8E=A5=E5=8F=A3=E4=BA=BA?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ParamsCollectManifestEOServiceImpl.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index c33192062..5472d4ebc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -3520,7 +3520,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
         paramsCollectManifestEO.setParamsManifestId(paramsManifestId);
         List<ParamsCollectManifestEO> list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO);
         // 过滤出 状态为：待发起收集，且工程接口人处为空的参数项
-        list = list.stream().filter(e -> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState()) && StringUtils.isBlank(e.getSdt())).collect(Collectors.toList());
+        list = list.stream().filter(e -> CollectManifestStateEnum.WAIT_COLLECT.getValue().equals(e.getState())).collect(Collectors.toList());
 
         List<ParamsCollectManifestEO> updateCollectManifestEOList = new ArrayList<>();
         if (CollectionUtil.isNotEmpty(list)) {

From fe449a9601ba238ad1c444d5ff7412cf03aa85d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 14 Jun 2023 17:03:58 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=A4=B4?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=AD=E8=8B=B1=E6=96=87=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jero/modules/head/enums/AffirmFlagEnum.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/enums/AffirmFlagEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/enums/AffirmFlagEnum.java
index c7f391a04..f7d8a3485 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/enums/AffirmFlagEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/enums/AffirmFlagEnum.java
@@ -6,9 +6,9 @@ package com.jero.modules.head.enums;
  * @auth zhn
  */
 public enum AffirmFlagEnum {
-    DESIGN_FLAG("设计符合性确认","Design Compliance Check","1"),
+    DESIGN_FLAG("设计符合性确认","Design Compliance Confirmation","1"),
     AFFIRM_FLAG("Pre-Homo确认","Pre-Homo Confirmation","2"),
-    VERIFY_FLAG("验证符合性确认","Validation Compliance Check","3");
+    VERIFY_FLAG("验证符合性确认","Validation Compliance Confirmation","3");
 
 
 

From 44e06497b8f6703e531241eac94e58911a084ffe Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 14 Jun 2023 17:05:07 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E8=BD=AC=E5=8A=9E=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reviewedByThePersonInCharge.vue           | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
index 9a3b17b27..fb4af65a0 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue
@@ -49,12 +49,19 @@
               <a-radio value="Transfer" v-if="query.TaskKey == 'zrrtjjfw' || query.TaskKey == 'zrrqr'">
                 {{$t('turnToDo')}}
               </a-radio>
-              <a-button type="primary" v-if="isPersonnel" @click="PersonnelSelectionClick">
-                {{this.$t('PersonnelSelection')}}
-              </a-button>
-              <span>
-                {{this.formInline.dezrrSubmitUserName}}
-              </span>
+<!--              <a-button type="primary" v-if="isPersonnel" @click="PersonnelSelectionClick">-->
+<!--                {{this.$t('PersonnelSelection')}}-->
+<!--              </a-button>-->
+<!--              <span>-->
+<!--                {{this.formInline.dezrrSubmitUserName}}-->
+<!--              </span>-->
+              <a-form-model-item class="itemModel-per">
+                <PersonnelSelection v-if="isPersonnel" :query="{db_field_name:this.query.TaskKey == 'zrrtjjfw'?'dezrrSubmitUserId':'secondChargePersonUserId',db_field_txt:$t('personnel')}"
+                                    :isSingleChoice="true"
+                                    :personneQuery="formInline"
+                                    @change="PersonnelSelectionChange"
+                                    v-model="formInline.dezrrSubmitUserName"/>
+              </a-form-model-item>
             </a-radio-group>
           </a-form-model-item>
         </a-col>
@@ -125,6 +132,7 @@
 
 <script>
   import { getAction, postAction, putAction, deleteAction } from '@/api/manage'
+  import PersonnelSelection from '@/components/PersonnelSelection/index'
   import uploadFile from '@/components/uploadFile/file'
   import SelectedBy from '@/components/SelectedBy/index'
   import moment from 'moment'
@@ -133,6 +141,7 @@
     name: 'reviewedByThePersonInCharge',
     components: {
       uploadFile,
+      PersonnelSelection,
       SelectedBy
     },
     props: ['queryBy', 'queryPersonInCharge', 'query'],
@@ -210,6 +219,10 @@
       }
     },
     methods: {
+      PersonnelSelectionChange(value, id) {
+        this.formInline[value] = id
+        this.formInline = { ...this.formInline }
+      },
       getData(data) {
         this.formInline.disposeResult = data.operatorResult
         this.formInline.approvalOpinion = data.approvalOpinion
@@ -397,4 +410,10 @@
     border: 1px #00B3BE solid;
     color: #00B3BE;
   }
+  .itemModel-per{
+    width: calc(50% - 130px) !important;
+    display: inline-block !important;
+    margin-top: -6px !important;
+    height: 40px !important;
+  }
 </style>
\ No newline at end of file

From e0d547aa6f11b1a08b684e6ca9cdc5577eeca0c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 14 Jun 2023 17:11:38 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=BB=98=E8=AE=A4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../searchcenter/service/impl/DocumentSearchServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
index 03e90bafc..f8d70596f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java
@@ -221,7 +221,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
                 mapSortTemp.put(orderByField,mapSort);
             }
         }else{
-            mapSortTemp.put("issue_time","desc");
+            mapSortTemp.put("create_time","desc");
         }
         sort.putAll(mapSortTemp);
         jsonArrySort.add(sort);

From fe84e0f853813fc860e187f989fabad5665b6e87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 14 Jun 2023 18:02:56 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=93UAT=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/ParamsReportDetailEOMapper.xml      |  9 +++++++++
 .../cert/report/vo/ParamsReportDetailVO.java       |  5 +++++
 .../project/enums/ProjectTaskPlanningNameEnum.java | 14 +++++++-------
 .../views/parameter/managementdetails/index.vue    |  4 ++--
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
index 3fba744b4..1b9ee69da 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
@@ -100,6 +100,15 @@
                 <if test="paramsReportDetailVO.paramsManifestId !=null and paramsReportDetailVO.paramsManifestId !=''">
                     AND prd.params_manifest_id = #{paramsReportDetailVO.paramsManifestId}
                 </if>
+                <if test="paramsReportDetailVO.isMust !=null and paramsReportDetailVO.isMust !=''">
+                    AND prd.is_must = #{paramsReportDetailVO.isMust}
+                </if>
+                <if test="paramsReportDetailVO.dutyTerritory !=null and paramsReportDetailVO.dutyTerritory !=''">
+                    AND prd.duty_territory in
+                    <foreach collection="paramsReportDetailVO.dutyTerritory.split(',')" index="" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                </if>
 
             </if>
         </where>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java
index 766c7fa43..54ccc6952 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java
@@ -72,4 +72,9 @@ public class ParamsReportDetailVO {
 
     @TableField(exist = false)
     private String orderBySql;
+
+    @TableField(exist = false)
+    private String isMust;
+    @TableField(exist = false)
+    private String dutyTerritory;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java
index 767676d4c..45a01d810 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java
@@ -11,13 +11,13 @@ public enum ProjectTaskPlanningNameEnum {
 //    ATTESTATION_START_TIME("认证试验结束","Homo Completion"),//  name:认证开始   value:Certification begins
     ATTESTATION_END_TIME("认证批准","Homo KO"),//  name:认证结束   value:End of certification
 
-    LIST_CONFIRMATION("清单发布","List Publishing"),
-    LEGAL_TASK_CONFIRMATION("责任确认","Responsibility Confirmation"),
-    DESIGN_DEADLINE("设计核查","Design Verification"),
-    PREHOMO_DEADLINE("摸底开始","Get Started"), // name:Pre-Homo   value:Pre-Homo
-    ATTESTATION_START_TIME("认证开始","Certification Start"),//  name:认证开始   value:Certification begins
-    VERIFY_DEADLINE("验证核查","Verification And Verification"),
-    CERTIFICATION_SUBMISSION("认证提交","Certification Submission"),
+    LIST_CONFIRMATION("清单发布","List Release"),
+    LEGAL_TASK_CONFIRMATION("责任确认","Responsibility Confirm"),
+    DESIGN_DEADLINE("设计核查","Design Check"),
+    PREHOMO_DEADLINE("摸底开始","Pre-Homo Starts"), // name:Pre-Homo   value:Pre-Homo
+    ATTESTATION_START_TIME("认证开始","Homo Starts"),//  name:认证开始   value:Certification begins
+    VERIFY_DEADLINE("验证核查","Validation Check"),
+    CERTIFICATION_SUBMISSION("认证提交","Application Submitted"),
     G_ZERO("G0","G0"),
     G_ONE("G1","G1"),
     G_TWO("G2","G2"),
diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue
index 211482e7f..d2648473c 100644
--- a/jero-web/src/views/parameter/managementdetails/index.vue
+++ b/jero-web/src/views/parameter/managementdetails/index.vue
@@ -94,10 +94,10 @@
 <!--                  <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('Required')"-->
 <!--                           v-model="formInline.isMust"></a-input>-->
                   <a-select class="box-input" v-model="formInline.isMust" :placeholder="$t('PleaseSelect')+$t('Required')">
-                    <a-select-option :value="'0'">
+                    <a-select-option :value="'1'">
                       {{$t('yes')}}
                     </a-select-option>
-                    <a-select-option :value="'1'">
+                    <a-select-option :value="'0'">
                       {{$t('notOnlyRz')}}
                     </a-select-option>
                   </a-select>

From bbb0ccd043f85709e4a853193193d6c32f6708f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 14 Jun 2023 18:29:47 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectLibraryBaseServiceImpl.java   | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index f75e0937c..789ed45b1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -2064,21 +2064,31 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 				if("dutyTerritoryName".equals(orderByField)){
 					param1 = StringUtils.isNotEmpty((String) data1.get("dutyTerritoryName")) ? (String) data1.get("dutyTerritoryName") : "";
 					param2 = StringUtils.isNotEmpty((String) data2.get("dutyTerritoryName")) ? (String) data2.get("dutyTerritoryName") : "";
+					if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+						return comparator.compare(param1,param2);
+					}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+						return comparator.compare(param2,param1);
+					}
 				}
 				// 数量
 				if("amount".equals(orderByField)){
-					param1 = StringUtils.isNotEmpty(String.valueOf(data1.get("amount"))) ? String.valueOf(data1.get("amount")) : "";
-					param2 = StringUtils.isNotEmpty(String.valueOf(data2.get("amount"))) ? String.valueOf(data2.get("amount")) : "";
+					double p1 = data1.get("amount") != null ? (double) data1.get("amount") : 0;
+					double p2 = data2.get("amount") != null ? (double) data2.get("amount") : 0;
+					if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+						return (int)(p1 - p2);
+					}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+						return (int)(p2 - p1);
+					}
 				}
 				// 占比
 				if("percentage".equals(orderByField)){
-					param1 = StringUtils.isNotEmpty((String) data1.get("percentage")) ? (String) data1.get("percentage") : "";
-					param2 = StringUtils.isNotEmpty((String) data2.get("percentage")) ? (String) data2.get("percentage") : "";
-				}
-				if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
-					return comparator.compare(param1,param2);
-				}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
-					return comparator.compare(param2,param1);
+					double p1 = StringUtils.isNotEmpty((String) data1.get("percentage")) ? Double.parseDouble (((String) data1.get("percentage")).replace("%","")) : 0;
+					double p2 = StringUtils.isNotEmpty((String) data2.get("percentage")) ? Double.parseDouble (((String) data2.get("percentage")).replace("%","")) : 0;
+					if(OrderEnum.POSITIVE.getValue().equals(orderBy)){
+						return (int)(p1 - p2);
+					}else if(OrderEnum.REVERSE.getValue().equals(orderBy)){
+						return (int)(p2 - p1);
+					}
 				}
 				return 0;
 			});