WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix_20230524' into fix_20230524

Browse Source
This commit is contained in:
zyx.net
2023-06-01 16:01:54 +08:00
parent 4d38e870a2 b56b30a939
commit c490cc009d
6 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java
+3 -3
View File
@@ -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);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+3 -2
View File
@@ -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);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
+6 -4
View File
@@ -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);
jero-web/src/views/otamanagement/upgradeactivity/components/gnxtwh.vue
+4 -4
View File
@@ -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 }
},
jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue
+2 -2
View File
@@ -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>
<!-- 操作列-->
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+1 -1
View File
@@ -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>