From e37b4d5dd266954001dfb82bb1d358e336462034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 31 May 2023 14:57:53 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E5=8F=AF=E4=BB=A5=E5=AF=BC=E5=87=BA=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ParameterItemCollectionList.vue                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index 1d03677eb..e0210dca8 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -247,7 +247,7 @@
               {{$t('Assignedby')}}
             </div>
             <!--      导出-->
-            <div @click="handleExport" class="operator-text" v-if='currentPersonRole == "sdt"'>
+            <div @click="handleExport" class="operator-text" v-if='currentPersonRole == "sdt" || currentPersonRole == "admin"'>
               <a-icon type="export"/>
               {{$t('dataExport')}}
             </div>

From 211e7d34abec523ce8e60980e7dc5f02c176ff4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 31 May 2023 15:07:32 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ota/service/impl/OtaBaSjSjmbclServiceImpl.java        | 6 +++---
 .../otamanagement/upgradeactivity/components/gnxtwh.vue   | 8 ++++----
 .../components/upgradehavechanged.vue                     | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
index 22cdf4d23..e583dc9c3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
@@ -213,8 +213,8 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl<OtaBaSjSjmbclMapper, O
     private OtaBaSjSjmbcl parseFile(File upFile, String otaId, String cut, StringBuilder errMsg) throws Exception {
         OtaBaSjSjmbcl mbcl = new OtaBaSjSjmbcl();
         OtaBaSjSjmbcx mbcx = otaBaSjSjmbcxService.queryByOtaId(otaId, "");
-        if (ObjectUtils.isNotEmpty(mbcx) && StringUtils.isNotEmpty(mbcx.getCpxh())) {
-            String cx = mbcx.getCpxh();
+        if (ObjectUtils.isNotEmpty(mbcx) && StringUtils.isNotEmpty(mbcx.getCpmc())) {
+            String mc = mbcx.getCpmc();
             Workbook wb = ImportFileUtil.readExcel(upFile);
             Sheet s = wb.getSheetAt(0);
 
@@ -227,7 +227,7 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl<OtaBaSjSjmbclMapper, O
                 vinObj.setVin(ImportFileUtil.getCellValue(cell, wb));
                 cell = row.getCell(1);
                 vinObj.setCx(ImportFileUtil.getCellValue(cell, wb));
-                if (!cx.equals(vinObj.getCx())) {
+                if (!mc.equals(vinObj.getCx())) {
                     continue;
                 }
                 cell = row.getCell(2);
diff --git a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
index c7c034892..09031d2a8 100644
--- a/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
@@ -241,10 +241,10 @@ export default {
       })
     },
     addClick(index){
-      if(this.formInline.dataList.length + 1 > 10){
-        this.$message.warning(this.$t('nomorethan'))
-        return
-      }
+      // if(this.formInline.dataList.length + 1 > 10){
+      //   this.$message.warning(this.$t('nomorethan'))
+      //   return
+      // }
       this.formInline.dataList.splice(index + 1, 0, {})
       this.formInline = { ...this.formInline }
     },
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
index 8583fb4b0..397cbf543 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
@@ -60,8 +60,8 @@
         <span slot="differentialupgradeornot" slot-scope="text,record" :max-length="50">
 <!--        <a-input :placeholder="$t('pleaseEnter')"  v-model="record.sfcfsj" :title='record.sfcfsj'></a-input>-->
           <a-radio-group v-model="record.sfcfsj">
-            <a-radio :value="1"> {{ $t('yes') }} </a-radio>
-            <a-radio :value="2"> {{ $t('not') }} </a-radio>
+            <a-radio :value="'1'"> {{ $t('yes') }} </a-radio>
+            <a-radio :value="'2'"> {{ $t('not') }} </a-radio>
           </a-radio-group>
       </span>
       <!--      操作列-->

From b56b30a9391e028721205b15da0c6fa58a3b3063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 31 May 2023 15:33:35 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectLibraryBaseServiceImpl.java    |  5 +++--
 .../service/impl/ProjectStatusBoardServiceImpl.java    | 10 ++++++----
 2 files changed, 9 insertions(+), 6 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 9373a6125..f75e0937c 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
@@ -3010,8 +3010,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 		dataRow.createCell(3).setCellValue(submitAmount);
 		dataRow.createCell(4).setCellValue(syncReporAmount);
 		double parameterCollectingCount = notStartAmount + collectingAmount + submitAmount + syncReporAmount;
-		double parameterCollectingPercentage = (syncReporAmount / parameterCollectingCount) * 100;
-		String parameterCollectingPercentageStr = (parameterCollectingPercentage != 0 && (syncReporAmount !=0 )) ? df.format(parameterCollectingPercentage) : "0";
+		double completionCount = submitAmount + syncReporAmount;
+		double parameterCollectingPercentage = (completionCount / parameterCollectingCount) * 100;
+		String parameterCollectingPercentageStr = (parameterCollectingPercentage != 0 && (completionCount !=0 )) ? df.format(parameterCollectingPercentage) : "0";
 		dataRow.createCell(5).setCellValue(parameterCollectingPercentageStr + percentSign);
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
index bc204e2b7..34514e2a4 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
@@ -984,8 +984,9 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                 syncReporAmount = (double) syncReporMap.get("amount");
 
                 double parameterCollectingCount = notStartAmount + collectingAmount + submitAmount + syncReporAmount;
-                double parameterCollectingPercentage = ((submitAmount + syncReporAmount) / parameterCollectingCount) * 100;
-                parameterCollectingPercentageStr = (parameterCollectingPercentage != 0 && (syncReporAmount !=0 )) ? df.format(parameterCollectingPercentage) : "0";
+                double completionCount = submitAmount + syncReporAmount;
+                double parameterCollectingPercentage = (completionCount / parameterCollectingCount) * 100;
+                parameterCollectingPercentageStr = (parameterCollectingPercentage != 0 && (completionCount !=0 )) ? df.format(parameterCollectingPercentage) : "0";
             }
             dataRow.createCell(51).setCellValue(notStartAmount);
             dataRow.createCell(52).setCellValue(collectingAmount);
@@ -1187,8 +1188,9 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                 double syncReporAmount = (double) syncReporMap.get("amount");
 
                 double parameterCollectingCount = notStartAmount + collectingAmount + submitAmount + syncReporAmount;
-                double parameterCollectingPercentage = (submitAmount + syncReporAmount) / parameterCollectingCount;
-                parameterCollectingPercentageStr = (parameterCollectingPercentage != 0 && (syncReporAmount !=0 )) ? parameterCollectingPercentage : 0;
+                double completionCount = submitAmount + syncReporAmount;
+                double parameterCollectingPercentage = (completionCount) / parameterCollectingCount;
+                parameterCollectingPercentageStr = (parameterCollectingPercentage != 0 && (completionCount !=0 )) ? parameterCollectingPercentage : 0;
             }
 
             Map<String,Object> certificationProgressMap = this.projectCertificationInventoryEOService.groupByCertificationProgress(pciEos);