diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java index 736b86a3d..43412755c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaManageApplyEOController.java @@ -167,16 +167,16 @@ public class OtaManageApplyEOController extends JeroController getProjectVersionList(String carMarket) { - List result = otaManageApplyEOService.getProjectVersionList(carMarket); + public Result getProjectVersionList(String carMarket,String cut) { + List result = otaManageApplyEOService.getProjectVersionList(carMarket,cut); return Result.OK(result); } @AutoLog(value = "全车型和分车型详情") @ApiOperation(value="分车型详情", notes="分车型详情") @GetMapping(value = "/getVersionInfo") - public Result getVersionInfo(String vdr) { - List result = otaManageApplyEOService.getVersionInfo(vdr); + public Result getVersionInfo(String vdr,String car) { + List result = otaManageApplyEOService.getVersionInfo(vdr,car); return Result.OK(result); } @@ -292,8 +292,12 @@ public class OtaManageApplyEOController extends JeroController getStatisticalStatus(String projectId, String plannedBpLaunchBatch, String cut) { - Map res = otaManageApplyEOService.getStatisticalStatus(projectId, plannedBpLaunchBatch, cut); - return Result.OK("操作成功！", res); + List> res = otaManageApplyEOService.getStatisticalStatus(projectId, plannedBpLaunchBatch, cut); + if(!res.isEmpty()){ + return Result.OK("操作成功！", res.get(0)); + }else{ + return Result.OK("操作成功！", new HashMap<>()); + } } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml index 55b5b8a81..e0a10e97d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml @@ -61,7 +61,7 @@ omr.homologation_impact,omr.homologation, omr.impact_cn_homo,omr.impact_eu_homo, omr.master_domain,omr.applied_vehicle_project, - oma.id,oma.project_version,oma.attestation_schedule,oma.match_status,oma.remark + oma.id,oma.project_version,oma.attestation_schedule,oma.match_status,oma.remark,oma.vehicle_type from ota_manage_receive omr left join ota_manage_apply oma on oma.vdr = omr.id @@ -134,7 +134,7 @@ ptp.certification_submission, oma.attestation_schedule, oma.project_version, - pni.project_name, + pni.project_name car, pyni.year_name FROM project_library_base plb diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java index e26df0208..b7a820528 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java @@ -102,14 +102,14 @@ public interface IOtaManageApplyEOService extends IService { * @param carMarket * @return */ - List getProjectVersionList(String carMarket); + List getProjectVersionList(String carMarket,String cut); /** * 全车型和分车型详情 * @param vdr * @return */ - List getVersionInfo(String vdr); + List getVersionInfo(String vdr,String car); void issueNotice(String id); @@ -127,7 +127,7 @@ public interface IOtaManageApplyEOService extends IService { List getVdrListByProject(String projectId, String cut); - Map getStatisticalStatus(String projectId, String plannedBpLaunchBatch, String cut); + List> getStatisticalStatus(String projectId, String plannedBpLaunchBatch, String cut); ModelAndView otaExportXls(HttpServletRequest request, OtaManageApplyEO otaManageApplyEO); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java index efc59c887..33ca223e3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.CutEnum; +import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.DateUtils; import com.jero.common.util.oConvertUtils; @@ -31,13 +32,16 @@ import com.jero.modules.ota.vo.VersionVO; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectTaskPlanning; import com.jero.modules.project.enums.CertificationProgressEnum; +import com.jero.modules.project.enums.ComplianceFlowStatusEnum; import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.project.service.impl.ProjectTaskPlanningServiceImpl; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.entity.SysUserRole; +import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.enums.RoleEnum; import com.jero.modules.system.mapper.SysUserRoleMapper; +import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysBaseApiImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; @@ -102,6 +106,8 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl dataList = new ArrayList<>(); //去跟manager和studio权限 - if(otaManager){ + if (otaManager) { dataList = otaManageApplyEOList; - }else{ + } else { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(OtaManagePermission::getUserId,currentUser.getId()); + wrapper.eq(OtaManagePermission::getUserId, currentUser.getId()); List managePermissionList = otaManagePermissionService.list(wrapper); - if(!managePermissionList.isEmpty()){ + if (!managePermissionList.isEmpty()) { List applyIdList = managePermissionList.stream().map(OtaManagePermission::getApplyId).distinct().collect(Collectors.toList()); List collect = otaManageApplyEOList.stream().filter(e -> applyIdList.contains(e.getPlannedBpLaunchBatch())).collect(Collectors.toList()); dataList = collect; @@ -223,21 +229,21 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl otaManageApplyEOS = dataList.stream() .filter(e -> plannedBpLaunchBatch.equals(e.getPlannedBpLaunchBatch())).collect(Collectors.toList()); - if(!otaManageApplyEOS.isEmpty()){ + if (!otaManageApplyEOS.isEmpty()) { //发布时间 manageApplyEO.setReleaseDate(otaManageApplyEOS.get(0).getReleaseDate()); List appliedVehicleProjectList = otaManageApplyEOS.stream() - .filter(e->StringUtils.isNotBlank(e.getAppliedVehicleProject())) + .filter(e -> StringUtils.isNotBlank(e.getAppliedVehicleProject())) .map(OtaManageApplyEO::getAppliedVehicleProject).collect(Collectors.toList()); List carList = new ArrayList<>(); for (String appliedVehicleProject : appliedVehicleProjectList) { carList.addAll(Arrays.asList(appliedVehicleProject.split(","))); } - if(!carList.isEmpty()){ + if (!carList.isEmpty()) { //适用车型 carList = carList.stream().distinct().collect(Collectors.toList()); - manageApplyEO.setAppliedVehicleProject(StringUtils.join(carList,",")); + manageApplyEO.setAppliedVehicleProject(StringUtils.join(carList, ",")); //市场 for (String appliedVehicleProject : carList) { Set marketSet = new HashSet<>(); @@ -280,6 +286,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl vprojectVersionList = getProjectVersionList(otaManageApplyEO.getAppliedVehicleProject()); + List vprojectVersionList = getProjectVersionList(otaManageApplyEO.getAppliedVehicleProject(), null); //项目版本id List projectVersionList = list.stream() .map(OtaManageApplyEO::getProjectVersion).distinct().collect(Collectors.toList()); @@ -680,6 +690,14 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl projectTaskPlanningList = projectTaskPlanningService.queryList(StringUtils.join(projectVersionList, ",")); boolean isDisabled = isDisabled(); for (OtaManageApplyEO manageApplyEO : list) { + if (StringUtils.isBlank(manageApplyEO.getVehicleType())) { + manageApplyEO.setVehicleType(otaManageApplyEO.getAppliedVehicleProject()); + manageApplyEO.setId(UUID.randomUUID().toString().replace("-", "")); + manageApplyEO.setProjectVersion(null); + manageApplyEO.setAttestationSchedule(null); + manageApplyEO.setMatchStatus(null); + manageApplyEO.setRemark("--"); + } if (StringUtils.isNotBlank(manageApplyEO.getProjectVersion())) { List taskPlanningList = projectTaskPlanningList.stream() .filter(e -> manageApplyEO.getProjectVersion().equals(e.getProjectId())).collect(Collectors.toList()); @@ -693,12 +711,22 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl { @@ -717,9 +745,9 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl getCarList(String cut,String plannedBpLaunchBatch) { + public List getCarList(String cut, String plannedBpLaunchBatch) { List otaManageApplyEOS = this.getBaseMapper().getOtaCarList(plannedBpLaunchBatch); List result = new LinkedList<>(); if (CutEnum.CN.getValue().equals(cut)) { @@ -838,7 +866,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl getProjectVersionList(String carMarket) { + public List getProjectVersionList(String carMarket, String cut) { List result = new LinkedList<>(); if (StringUtils.isNotBlank(carMarket)) { @@ -874,9 +902,36 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); for (VersionVO versionVO : result) { - versionVO.setVersionName(versionVO.getCar() + "-" + versionVO.getYearName() + "-" + versionVO.getMarket() + "-" + versionVO.getVersionNumber()); + List dictModelList = new ArrayList<>(); + for (String s : versionVO.getMarket().split(",")) { + List dictModelListTemp = targetMarketList.stream() + .filter(e -> s.equals(e.getValue())).collect(Collectors.toList()); + dictModelList.addAll(dictModelListTemp); + } + String targetMarket = ""; + if(dictModelList.size() != 0){ + StringBuilder sb = new StringBuilder(); + for (DictModel dictModel : dictModelList) { + sb.append(dictModel.getTextEn()+","); + } + if(StringUtils.isNotBlank(sb)){ + targetMarket = sb.substring(0,sb.length()-1); + } + } + versionVO.setVersionName(versionVO.getCar() + "-" + versionVO.getYearName() + "-" + targetMarket + "-" + versionVO.getVersionNumber()); } + + //ComplianceFlowStatusEnum + VersionVO versionVO = new VersionVO(); + versionVO.setProjectId("busheji"); + if (CutEnum.CN.getValue().equals(cut)) { + versionVO.setVersionName("不涉及"); + } else { + versionVO.setVersionName(ComplianceFlowStatusEnum.UNINVOLVED.getEnName()); + } + result.add(versionVO); } return result; } @@ -889,7 +944,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl getVersionInfo(String vdr) { + public List getVersionInfo(String vdr, String car) { //认证进度数据字典 certification_progress List regionDictList = sysDictItemServiceImpl.selectItemsByDictCode("certification_progress"); @@ -924,6 +979,11 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl queryProjectName(List list) { + Map res = new HashMap<>(); + List idList = list.stream() + .filter(e -> StringUtils.isNotBlank(e.getProjectVersion())) + .map(OtaManageApplyEO::getProjectVersion).distinct().collect(Collectors.toList()); + List proList = projectLibraryBaseService.getListByIds(idList); + for (ProjectLibraryBase plb : proList) { + res.put(plb.getId(), plb.getShowName()); + } + return res; + } + @Override public void temporarySave(List list, String cut) { LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - List idList = list.stream() - .filter(e -> StringUtils.isNotBlank(e.getId())) - .map(OtaManageApplyEO::getId).distinct().collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(list)) { + List idList = list.stream() + .filter(e -> StringUtils.isNotBlank(e.getId())) + .map(OtaManageApplyEO::getId).distinct().collect(Collectors.toList()); - //已存在的数据 - List omaOldList = this.getBaseMapper().selectBatchIds(idList); - //历史记录 - List hisList = new ArrayList<>(); + //已存在的数据 + List omaOldList = this.getBaseMapper().selectBatchIds(idList); + List queryProNameList = new ArrayList<>(); + queryProNameList.addAll(omaOldList); + queryProNameList.addAll(list); + Map proNameMap = queryProjectName(queryProNameList); + //历史记录 + List hisList = new ArrayList<>(); + List saveList = new ArrayList<>(); - for (OtaManageApplyEO oma : list) { - boolean flag = false; - for (OtaManageApplyEO omaOld : omaOldList) { - flag = true; - if (StringUtils.equals(oma.getProjectVersionText(), omaOld.getProjectVersionText()) - || StringUtils.equals(oma.getAttestationSchedule(), omaOld.getAttestationSchedule()) - || StringUtils.equals(oma.getRemark(), omaOld.getRemark())) { - OtaManageHistory his = new OtaManageHistory(); - his.setApplyId(oma.getId()); - StringBuilder conSb = new StringBuilder(); - StringBuilder conSbEn = new StringBuilder(); - conSb.append(user.getUsername()).append("编辑了 VDR:").append(oma.getVdr()); - conSbEn.append(user.getUsername()).append("edited VDR:").append(oma.getVdr()); - if (StringUtils.equals(oma.getProjectVersionText(), omaOld.getProjectVersionText())) { - conSb.append(" 修改了 ").append("项目版本 由 ").append(omaOld.getProjectVersionText()).append(" 改为 ").append(oma.getProjectVersionText()); - conSbEn.append(" modified ").append("Project Version from ").append(omaOld.getProjectVersionText()).append(" to ").append(oma.getProjectVersionText()); - } - if (StringUtils.equals(oma.getAttestationSchedule(), omaOld.getAttestationSchedule())) { - conSb.append(" 修改了 ").append("认证进度 由 ").append(CertificationProgressEnum.getByValue(omaOld.getAttestationSchedule()).getName()).append(" 改为 ").append(CertificationProgressEnum.getByValue(oma.getAttestationSchedule()).getName()); - conSbEn.append(" modified ").append("Homologation Progress from ").append(CertificationProgressEnum.getByValue(omaOld.getAttestationSchedule()).getValue()).append(" to ").append(CertificationProgressEnum.getByValue(oma.getAttestationSchedule()).getValue()); - } - if (StringUtils.equals(oma.getRemark(), omaOld.getRemark())) { - conSb.append(" 修改了 ").append("备注 由 ").append(omaOld.getRemark()).append(" 改为 ").append(oma.getRemark()); - conSbEn.append(" modified ").append("Remark from ").append(omaOld.getRemark()).append(" to ").append(oma.getRemark()); - } - his.setContentCn(conSb.toString()); - his.setContentEn(conSbEn.toString()); - hisList.add(his); + for (OtaManageApplyEO oma : list) { + if (oma.getId().length() < 20) { + continue; } - break; + boolean flag = false; + for (OtaManageApplyEO omaOld : omaOldList) { + if (omaOld.getId().equals(oma.getId())) { + flag = true; + if (!paramsEquals(oma.getProjectVersion(), omaOld.getProjectVersion()) + || !paramsEquals(oma.getAttestationSchedule(), omaOld.getAttestationSchedule()) + || !paramsEquals(oma.getRemark(), omaOld.getRemark())) { + OtaManageHistory his = new OtaManageHistory(); + his.setApplyId(oma.getId()); + StringBuilder conSb = new StringBuilder(); + StringBuilder conSbEn = new StringBuilder(); + conSb.append(user.getUsername()).append(" : "); + conSbEn.append(user.getUsername()).append(" : "); + if (!paramsEquals(oma.getProjectVersion(), omaOld.getProjectVersion())) { + oma.setMatchStatus(OtaStatusEnum.TO_BE_MATCHED.getKey()); + conSb.append("‘项目版本’ 由 ‘").append(proNameMap.get(omaOld.getProjectVersion())).append("’ 改为 ‘").append(proNameMap.get(oma.getProjectVersion())).append("‘."); + conSbEn.append("‘Project Version‘ change from ‘").append(omaOld.getProjectVersionText()).append("‘ to ‘").append(oma.getProjectVersionText()).append("‘."); + } + if (!paramsEquals(oma.getAttestationSchedule(), omaOld.getAttestationSchedule())) { + oma.setMatchStatus(OtaStatusEnum.TO_BE_MATCHED.getKey()); + conSb.append("’认证进度’ 由 ’").append(CertificationProgressEnum.getByValue(omaOld.getAttestationSchedule()).getName()) + .append("’ 改为 ’").append(CertificationProgressEnum.getByValue(oma.getAttestationSchedule()).getName()).append("‘."); + conSbEn.append("’Homologation Progress’ change from ’").append(CertificationProgressEnum.getByValue(omaOld.getAttestationSchedule()).getValue()) + .append("’ to ’").append(CertificationProgressEnum.getByValue(oma.getAttestationSchedule()).getValue()).append("‘."); + } + if (!paramsEquals(oma.getRemark(), omaOld.getRemark()) && (StringUtils.isNotEmpty(oma.getRemark()) && !oma.getRemark().equals("--"))) { + conSb.append("’备注’ 由 ’").append(omaOld.getRemark()).append("’ 改为 ’").append(oma.getRemark()).append("‘."); + conSbEn.append("’Remark’ change from ’").append(omaOld.getRemark()).append("’ to ’").append(oma.getRemark()).append("‘."); + } + his.setContentCn(conSb.toString()); + his.setContentEn(conSbEn.toString()); + hisList.add(his); + } + break; + } + } + if (!flag) { + if (StringUtils.isNotEmpty(oma.getProjectVersion()) + || StringUtils.isNotEmpty(oma.getAttestationSchedule()) + || (StringUtils.isNotEmpty(oma.getRemark()) && !oma.getRemark().equals("--"))) { + OtaManageHistory his = new OtaManageHistory(); + his.setApplyId(oma.getId()); + StringBuilder conSb = new StringBuilder(); + StringBuilder conSbEn = new StringBuilder(); + conSb.append(user.getUsername()).append(" : "); + conSbEn.append(user.getUsername()).append(" : "); + if (StringUtils.isNotEmpty(oma.getProjectVersion())) { + conSb.append("‘项目版本‘ 由 ‘null‘").append(" 改为 ‘").append(proNameMap.get(oma.getProjectVersion())).append("‘."); + conSbEn.append("‘Project Version‘ change from ‘null‘").append(" to ‘").append(proNameMap.get(oma.getProjectVersion())).append("‘."); + } + if (StringUtils.isNotEmpty(oma.getAttestationSchedule())) { + conSb.append("‘认证进度‘ 由 ‘null‘").append(" 改为 ‘").append(CertificationProgressEnum.getByValue(oma.getAttestationSchedule()).getName()).append("‘."); + conSbEn.append("‘Homologation Progress‘ change from ‘null‘").append(" to ‘").append(CertificationProgressEnum.getByValue(oma.getAttestationSchedule()).getValue()).append("‘."); + } + if (StringUtils.isNotEmpty(oma.getRemark()) && !oma.getRemark().equals("--")) { + conSb.append("‘备注‘ 由 ‘null‘").append(" 改为 ‘").append(oma.getRemark()).append("‘."); + conSbEn.append("‘Remark‘ change from ‘null‘").append(" to ‘").append(oma.getRemark()).append("‘."); + } + his.setContentCn(conSb.toString()); + his.setContentEn(conSbEn.toString()); + hisList.add(his); + } + } + saveList.add(oma); } - if (!flag) { - if (StringUtils.isNotEmpty(oma.getProjectVersionText()) - || StringUtils.isNotEmpty(oma.getAttestationSchedule()) - || StringUtils.isNotEmpty(oma.getRemark())) { - OtaManageHistory his = new OtaManageHistory(); - his.setApplyId(oma.getId()); - StringBuilder conSb = new StringBuilder(); - StringBuilder conSbEn = new StringBuilder(); - conSb.append(user.getUsername()).append("编辑了 VDR:").append(oma.getVdr()); - conSbEn.append(user.getUsername()).append("edited VDR:").append(oma.getVdr()); - if (StringUtils.isNotEmpty(oma.getProjectVersionText())) { - conSb.append(" 修改了 ").append("项目版本 由 空").append(" 改为 ").append(oma.getProjectVersionText()); - conSbEn.append(" modified ").append("Project Version from null").append(" to ").append(oma.getProjectVersionText()); - } - if (StringUtils.isNotEmpty(oma.getAttestationSchedule())) { - conSb.append(" 修改了 ").append("认证进度 由 空").append(" 改为 ").append(CertificationProgressEnum.getByValue(oma.getAttestationSchedule()).getName()); - conSbEn.append(" modified ").append("Homologation Progress from null").append(" to ").append(CertificationProgressEnum.getByValue(oma.getAttestationSchedule()).getValue()); - } - if (StringUtils.isNotEmpty(oma.getRemark())) { - conSb.append(" 修改了 ").append("备注 由 空").append(" 改为 ").append(oma.getRemark()); - conSbEn.append(" modified ").append("Remark from null").append(" to ").append(oma.getRemark()); - } - his.setContentCn(conSb.toString()); - his.setContentEn(conSbEn.toString()); - hisList.add(his); - } + if (saveList.size() > 0) { + List delList = saveList.stream() + .filter(e -> StringUtils.isNotBlank(e.getId())) + .map(OtaManageApplyEO::getId).distinct().collect(Collectors.toList()); + this.deleteByIds(delList); + this.saveOrUpdateBatch(saveList); + otaManageHistoryService.saveBatch(hisList); } } - this.saveOrUpdateBatch(list); - otaManageHistoryService.saveBatch(hisList); } @Override @@ -1172,48 +1274,67 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl updateVdrBatch(List list, String projectVersion, String attestationSchedule, String remark, String cut) { ProjectLibraryBase plb = projectLibraryBaseService.selectById(projectVersion); - LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - //历史记录 - List hisList = new ArrayList<>(); List msgList = new ArrayList<>(); + List changeList = new ArrayList<>(); + boolean isStudio = isStudio(); + boolean isOtaManager = isOtaManager(); for (OtaManageApplyEO oma : list) { - StringBuilder conOtaCn = new StringBuilder(); - StringBuilder conOtaEn = new StringBuilder(); - conOtaCn.append(user.getUsername() + " 批量编辑了 VDR: ").append(oma.getVdr()); - conOtaEn.append(user.getUsername() + " edited VDR: ").append(oma.getVdr()); boolean isChanged = false; - if (isStudio() && (StringUtils.isEmpty(oma.getMatchStatus()) || oma.getMatchStatus().equals(OtaStatusEnum.TO_BE_MATCHED.getKey()))) { - if (StringUtils.isNotEmpty(projectVersion)) { - isChanged = true; - oma.setProjectVersion(projectVersion); - conOtaCn.append(" 修改了 ").append("项目版本 ").append(" 改为 ").append(plb.getShowName()); - conOtaEn.append(" modified ").append("Project Version change to ").append(plb.getShowName()); - } - if (StringUtils.isNotEmpty(attestationSchedule)) { - isChanged = true; - oma.setAttestationSchedule(attestationSchedule); - conOtaCn.append(" 修改了 ").append("认证进度 ").append(" 改为 ").append(CertificationProgressEnum.getByValue(attestationSchedule).getName()); - conOtaEn.append(" modified ").append("Homologation Progress change to ").append(CertificationProgressEnum.getByValue(attestationSchedule).getValue()); + if (StringUtils.isNotEmpty(projectVersion)) { + if (isStudio) { + if (StringUtils.isEmpty(oma.getMatchStatus()) + || oma.getMatchStatus().equals(OtaStatusEnum.TO_BE_MATCHED.getKey()) + || oma.getMatchStatus().equals(OtaStatusEnum.REJECTED.getKey())) { + isChanged = true; + oma.setProjectVersion(projectVersion); + } else { + if (CutEnum.CN.getValue().equals(cut)) { + msgList.add("VDR:" + oma.getVdr() + " 状态必须为" + OtaStatusEnum.TO_BE_MATCHED.getNameCN() + " 或 " + OtaStatusEnum.REJECTED.getNameCN() + "！"); + } else { + msgList.add("VDR:" + oma.getVdr() + " The state must be" + OtaStatusEnum.TO_BE_MATCHED.getNameEN() + " or " + OtaStatusEnum.REJECTED.getNameEN() + "！"); + } + } + } else { + if (CutEnum.CN.getValue().equals(cut)) { + msgList.add("VDR:" + oma.getVdr() + " 只有Studio角色可以编辑项目版本！"); + } else { + msgList.add("VDR:" + oma.getVdr() + " Only Studio roles can edit Project Version！"); + } } } - if (isStudio() || isOtaManager()) { - if (StringUtils.isNotEmpty(remark)) { - isChanged = true; - oma.setRemark(remark); - conOtaCn.append(" 修改了 ").append("备注 ").append(" 改为 ").append(remark); - conOtaEn.append(" modified ").append("Remark change to ").append(remark); + if (StringUtils.isNotEmpty(attestationSchedule)) { + if (isStudio) { + if (StringUtils.isEmpty(oma.getMatchStatus()) + || oma.getMatchStatus().equals(OtaStatusEnum.TO_BE_MATCHED.getKey()) + || oma.getMatchStatus().equals(OtaStatusEnum.REJECTED.getKey())) { + isChanged = true; + oma.setAttestationSchedule(attestationSchedule); + } else { + if (CutEnum.CN.getValue().equals(cut)) { + msgList.add("VDR:" + oma.getVdr() + " 状态必须为" + OtaStatusEnum.TO_BE_MATCHED.getNameCN() + " 或 " + OtaStatusEnum.REJECTED.getNameCN() + "！"); + } else { + msgList.add("VDR:" + oma.getVdr() + " The state must be" + OtaStatusEnum.TO_BE_MATCHED.getNameEN() + " or " + OtaStatusEnum.REJECTED.getNameEN() + "！"); + } + } + } else { + if (CutEnum.CN.getValue().equals(cut)) { + msgList.add("VDR:" + oma.getVdr() + " 只有Studio角色可以编辑认证进度！"); + } else { + msgList.add("VDR:" + oma.getVdr() + " Only Studio roles can edit Homologation Progress！"); + } } } + if (StringUtils.isNotEmpty(remark) && !remark.equals("--")) { + isChanged = true; + oma.setRemark(remark); + } if (isChanged) { - OtaManageHistory his = new OtaManageHistory(); - his.setApplyId(oma.getId()); - his.setContentCn(conOtaCn.toString()); - his.setContentEn(conOtaEn.toString()); - hisList.add(his); + changeList.add(oma); } } - this.saveOrUpdateBatch(list); - otaManageHistoryService.saveBatch(hisList); + if (CollectionUtils.isNotEmpty(changeList)) { + this.temporarySave(changeList, cut); + } return msgList; } @@ -1321,103 +1442,132 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl new TreeSet<>(Comparator.comparing(o -> o.getPlannedBpLaunchBatch()))), ArrayList::new)); - for (OtaManageApplyEO rec : receiveList) { - if (CutEnum.CN.getValue().equals(cut)) { - rec.setAppliedVehicleProject("全部"); + String name = ""; + String market = ""; + ProjectLibraryBase plb = projectLibraryBaseService.selectById(projectId); + if (ObjectUtils.isNotEmpty(plb)) { + if (StringUtils.isNotEmpty(plb.getProjectName()) && plb.getProjectName().equals("FORCE")) { + name = "Force"; } else { - rec.setAppliedVehicleProject("All"); + name = plb.getProjectName(); } + if (StringUtils.isNotEmpty(plb.getTargetMarket())) { + String[] marketStrs = plb.getTargetMarket().split(","); + if (marketStrs[0].equals("china")) { + market = "CN"; + } else if (marketStrs[0].equals("UK")) { + market = "RHD"; + } else { + market = marketStrs[0]; + } + } + } + for (OtaManageApplyEO rec : receiveList) { + rec.setAppliedVehicleProject(name + " " + market); } } return receiveList; } @Override - public Map getStatisticalStatus(String projectId, String plannedBpLaunchBatch, String cut) { + public List> getStatisticalStatus(String projectId, String plannedBpLaunchBatch, String cut) { List receiveList = this.getBaseMapper().getListByProjectId(projectId, plannedBpLaunchBatch); - int total = receiveList.size(); - //匹配状态 - int toBeMatched = 0;//待匹配 - int toBeApproved = 0;//待审批 - int locked = 0;//锁定 - int rejected = 0;//退回 - //认证进度 - int notStart = 0;//未开始 - int inProgress = 0;//进行中 - int testPassed = 0;//实验通过 - int testFailed = 0;//实验失败 - int notSubmitted = 0;//部件报告未提交 - int submitted = 0;//部件报告已提交 - int stored = 0;//部件报告已入库 + List> result = new ArrayList<>(); + if (!receiveList.isEmpty()) { + List plannedBpLaunchBatchList = receiveList.stream() + .filter(e -> StringUtils.isNotBlank(e.getPlannedBpLaunchBatch())) + .map(OtaManageApplyEO::getPlannedBpLaunchBatch).distinct().collect(Collectors.toList()); - for (OtaManageApplyEO oma : receiveList) { - if (StringUtils.isBlank(oma.getMatchStatus()) || oma.getMatchStatus().equals(OtaStatusEnum.TO_BE_MATCHED.getKey())) { - toBeMatched++; - } else if (oma.getMatchStatus().equals(OtaStatusEnum.TO_BE_APPROVED.getKey())) { - toBeApproved++; - } else if (oma.getMatchStatus().equals(OtaStatusEnum.LOCKED.getKey())) { - locked++; - } else if (oma.getMatchStatus().equals(OtaStatusEnum.REJECTED.getKey())) { - rejected++; - } else { - toBeMatched++; - } - if (StringUtils.isBlank(oma.getAttestationSchedule()) || oma.getAttestationSchedule().equals(CertificationProgressEnum.NOT_START.getValue())) { - notStart++; - } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.IN_PROGRESS.getValue())) { - inProgress++; - } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.TEST_PASSED.getValue())) { - testPassed++; - } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.TEST_FAILED.getValue())) { - testFailed++; - } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue())) { - notSubmitted++; - } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue())) { - submitted++; - } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue())) { - stored++; - } else { - notStart++; + for (String s : plannedBpLaunchBatchList) { + List otaManageApplyEOList = receiveList.stream() + .filter(e -> s.equals(e.getPlannedBpLaunchBatch())).collect(Collectors.toList()); + + int total = otaManageApplyEOList.size(); + //匹配状态 + int toBeMatched = 0;//待匹配 + int toBeApproved = 0;//待审批 + int locked = 0;//锁定 + int rejected = 0;//退回 + //认证进度 + int notStart = 0;//未开始 + int inProgress = 0;//进行中 + int testPassed = 0;//实验通过 + int testFailed = 0;//实验失败 + int notSubmitted = 0;//部件报告未提交 + int submitted = 0;//部件报告已提交 + int stored = 0;//部件报告已入库 + + for (OtaManageApplyEO oma : otaManageApplyEOList) { + if (StringUtils.isBlank(oma.getMatchStatus()) || oma.getMatchStatus().equals(OtaStatusEnum.TO_BE_MATCHED.getKey())) { + toBeMatched++; + } else if (oma.getMatchStatus().equals(OtaStatusEnum.TO_BE_APPROVED.getKey())) { + toBeApproved++; + } else if (oma.getMatchStatus().equals(OtaStatusEnum.LOCKED.getKey())) { + locked++; + } else if (oma.getMatchStatus().equals(OtaStatusEnum.REJECTED.getKey())) { + rejected++; + } else { + toBeMatched++; + } + if (StringUtils.isBlank(oma.getAttestationSchedule()) || oma.getAttestationSchedule().equals(CertificationProgressEnum.NOT_START.getValue())) { + notStart++; + } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.IN_PROGRESS.getValue())) { + inProgress++; + } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.TEST_PASSED.getValue())) { + testPassed++; + } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.TEST_FAILED.getValue())) { + testFailed++; + } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue())) { + notSubmitted++; + } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue())) { + submitted++; + } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue())) { + stored++; + } else { + notStart++; + } + } + + Map statisticalMap = new HashMap<>(); + statisticalMap.put("plannedBpLaunchBatch", s); + statisticalMap.put("allCount", total); + List> matchStatusMapList = new ArrayList<>(); + matchStatusMapList.add(wrapStatMap("matchStatus", "matchStatusCount", OtaStatusEnum.TO_BE_MATCHED.getKey(), toBeMatched)); + matchStatusMapList.add(wrapStatMap("matchStatus", "matchStatusCount", OtaStatusEnum.TO_BE_APPROVED.getKey(), toBeApproved)); + matchStatusMapList.add(wrapStatMap("matchStatus", "matchStatusCount", OtaStatusEnum.LOCKED.getKey(), locked)); + matchStatusMapList.add(wrapStatMap("matchStatus", "matchStatusCount", OtaStatusEnum.REJECTED.getKey(), rejected)); + statisticalMap.put("matchStatusMapList", matchStatusMapList); + + Map matchStatusMap = new HashMap<>(); + matchStatusMap.put(OtaStatusEnum.TO_BE_MATCHED.getKey(), toBeMatched); + matchStatusMap.put(OtaStatusEnum.TO_BE_APPROVED.getKey(), toBeApproved); + matchStatusMap.put(OtaStatusEnum.LOCKED.getKey(), locked); + matchStatusMap.put(OtaStatusEnum.REJECTED.getKey(), rejected); + statisticalMap.put("matchStatusMap", matchStatusMap); + + List> attestationScheduleMapList = new ArrayList<>(); + attestationScheduleMapList.add(wrapStatMap("attestationSchedule", "attestationScheduleCount", CertificationProgressEnum.NOT_START.getValue(), notStart)); + attestationScheduleMapList.add(wrapStatMap("attestationSchedule", "attestationScheduleCount", CertificationProgressEnum.IN_PROGRESS.getValue(), inProgress)); + attestationScheduleMapList.add(wrapStatMap("attestationSchedule", "attestationScheduleCount", CertificationProgressEnum.TEST_PASSED.getValue(), testPassed)); + attestationScheduleMapList.add(wrapStatMap("attestationSchedule", "attestationScheduleCount", CertificationProgressEnum.TEST_FAILED.getValue(), testFailed)); + attestationScheduleMapList.add(wrapStatMap("attestationSchedule", "attestationScheduleCount", CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue(), notSubmitted)); + attestationScheduleMapList.add(wrapStatMap("attestationSchedule", "attestationScheduleCount", CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue(), submitted)); + attestationScheduleMapList.add(wrapStatMap("attestationSchedule", "attestationScheduleCount", CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue(), stored)); + statisticalMap.put("attestationScheduleMapList", attestationScheduleMapList); + + Map attestationScheduleMap = new HashMap<>(); + attestationScheduleMap.put(CertificationProgressEnum.NOT_START.getValue().replace(" ", "_"), notStart); + attestationScheduleMap.put(CertificationProgressEnum.IN_PROGRESS.getValue().replace(" ", "_"), inProgress); + attestationScheduleMap.put(CertificationProgressEnum.TEST_PASSED.getValue().replace(" ", "_"), testPassed); + attestationScheduleMap.put(CertificationProgressEnum.TEST_FAILED.getValue().replace(" ", "_"), testFailed); + attestationScheduleMap.put(CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue().replace(" ", "_"), notSubmitted); + attestationScheduleMap.put(CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue().replace(" ", "_"), submitted); + attestationScheduleMap.put(CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue().replace(" ", "_"), stored); + statisticalMap.put("attestationScheduleMap", attestationScheduleMap); + result.add(statisticalMap); } } - - Map statisticalMap = new HashMap<>(); - statisticalMap.put("allCount", total); - List> matchStatusMapList = new ArrayList<>(); - matchStatusMapList.add(wrapStatMap("matchStatus", "matchStatusCount", OtaStatusEnum.TO_BE_MATCHED.getKey(), toBeMatched)); - matchStatusMapList.add(wrapStatMap("matchStatus", "matchStatusCount", OtaStatusEnum.TO_BE_APPROVED.getKey(), toBeApproved)); - matchStatusMapList.add(wrapStatMap("matchStatus", "matchStatusCount", OtaStatusEnum.LOCKED.getKey(), locked)); - matchStatusMapList.add(wrapStatMap("matchStatus", "matchStatusCount", OtaStatusEnum.REJECTED.getKey(), rejected)); - statisticalMap.put("matchStatusMapList", matchStatusMapList); - - Map matchStatusMap = new HashMap<>(); - matchStatusMap.put(OtaStatusEnum.TO_BE_MATCHED.getKey(), toBeMatched); - matchStatusMap.put(OtaStatusEnum.TO_BE_APPROVED.getKey(), toBeApproved); - matchStatusMap.put(OtaStatusEnum.LOCKED.getKey(), locked); - matchStatusMap.put(OtaStatusEnum.REJECTED.getKey(), rejected); - statisticalMap.put("matchStatusMap", matchStatusMap); - - List> attestationScheduleMapList = new ArrayList<>(); - attestationScheduleMapList.add(wrapStatMap("attestationSchedule", "attestationScheduleCount", CertificationProgressEnum.NOT_START.getValue(), notStart)); - attestationScheduleMapList.add(wrapStatMap("attestationSchedule", "attestationScheduleCount", CertificationProgressEnum.IN_PROGRESS.getValue(), inProgress)); - attestationScheduleMapList.add(wrapStatMap("attestationSchedule", "attestationScheduleCount", CertificationProgressEnum.TEST_PASSED.getValue(), testPassed)); - attestationScheduleMapList.add(wrapStatMap("attestationSchedule", "attestationScheduleCount", CertificationProgressEnum.TEST_FAILED.getValue(), testFailed)); - attestationScheduleMapList.add(wrapStatMap("attestationSchedule", "attestationScheduleCount", CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue(), notSubmitted)); - attestationScheduleMapList.add(wrapStatMap("attestationSchedule", "attestationScheduleCount", CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue(), submitted)); - attestationScheduleMapList.add(wrapStatMap("attestationSchedule", "attestationScheduleCount", CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue(), stored)); - statisticalMap.put("attestationScheduleMapList", attestationScheduleMapList); - - Map attestationScheduleMap = new HashMap<>(); - attestationScheduleMap.put(CertificationProgressEnum.NOT_START.getValue().replace(" ", "_"), notStart); - attestationScheduleMap.put(CertificationProgressEnum.IN_PROGRESS.getValue().replace(" ", "_"), inProgress); - attestationScheduleMap.put(CertificationProgressEnum.TEST_PASSED.getValue().replace(" ", "_"), testPassed); - attestationScheduleMap.put(CertificationProgressEnum.TEST_FAILED.getValue().replace(" ", "_"), testFailed); - attestationScheduleMap.put(CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue().replace(" ", "_"), notSubmitted); - attestationScheduleMap.put(CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue().replace(" ", "_"), submitted); - attestationScheduleMap.put(CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue().replace(" ", "_"), stored); - statisticalMap.put("attestationScheduleMap", attestationScheduleMap); - - return statisticalMap; + return result; } private Map wrapStatMap(String key, String val, String keyStr, Object valObj) { @@ -1479,7 +1629,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl pageList = getOtaPage(otaManageApplyEO); + List pageList = getAllCarPage(otaManageApplyEO); List exportList = null; // 过滤选中数据 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java index bf11fb26c..177df9c1b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java @@ -26,4 +26,8 @@ public interface ProjectLibraryBaseMapper extends BaseMapper List queryById(String id); ProjectLibraryBase selectProjectName(@Param("projectLibraryId") String projectLibraryId); + + List getListByIds(@Param("idList") List idList); + + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml index 72c19665d..0a9425628 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml @@ -290,4 +290,14 @@ WHERE plb.id = #{projectLibraryId} + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java index 679177683..887732bec 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java @@ -186,4 +186,6 @@ public interface IProjectLibraryBaseService extends IService Result overallReplacementUser(JSONObject json); List queryList(List projectIdList); + + List getListByIds(List projectIdList); } 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 c311feb4c..c479e138b 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 @@ -22,6 +22,8 @@ import com.jero.modules.cert.template.enums.ControlTypeEnum; import com.jero.modules.dummy.enums.OrderEnum; import com.jero.modules.enums.DictCodeEnum; import com.jero.modules.feishu.enums.TemplateInfoEnum2; +import com.jero.modules.ota.entity.OtaManageApplyEO; +import com.jero.modules.ota.service.impl.OtaManageApplyEOServiceImpl; import com.jero.modules.project.entity.*; import com.jero.modules.project.enums.*; import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; @@ -48,6 +50,7 @@ import com.jero.modules.todoCenter.service.IProcessInfoDetailEOService; import com.jero.modules.top.entity.TopProjectEO; import com.jero.modules.top.service.ITopProjectEOService; import com.jero.modules.wkflow.enums.FlowTypeEnum; +import javafx.beans.binding.ObjectBinding; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.poi.hssf.usermodel.HSSFSheet; @@ -173,6 +176,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl> mapList = otaManageApplyEOService.getStatisticalStatus(projectLibraryId, null, cut); + + if(ObjectUtils.isNotEmpty(mapList)){ + int dataIndex = 2; + for (Map map : mapList) { + String plannedBpLaunchBatch = (String) map.get("plannedBpLaunchBatch"); + Map matchStatusMap = (Map)map.get("matchStatusMap"); + Map attestationScheduleMap = (Map)map.get("attestationScheduleMap"); + + String.valueOf(matchStatusMap.get("locked")); + String locked = String.valueOf(matchStatusMap.get("locked")); + String rejected = String.valueOf(matchStatusMap.get("rejected")); + String to_be_approved = String.valueOf(matchStatusMap.get("to_be_approved")); + String to_be_matched = String.valueOf(matchStatusMap.get("to_be_matched")); + String Component_report_has_been_stored = String.valueOf(attestationScheduleMap.get("Component_report_has_been_stored")); + String Component_report_not_submitted = String.valueOf(attestationScheduleMap.get("Component_report_not_submitted")); + String Component_report_submitted = String.valueOf(attestationScheduleMap.get("Component_report_submitted")); + String In_progress = String.valueOf(attestationScheduleMap.get("In_progress")); + String Not_start =String.valueOf(attestationScheduleMap.get("Not_start")); + String Test_failed = String.valueOf(attestationScheduleMap.get("Test_failed")); + String Test_passed = String.valueOf(attestationScheduleMap.get("Test_passed")); + Row dataRow = sheet.createRow(dataIndex); + dataRow.createCell(0).setCellValue(plannedBpLaunchBatch); + dataRow.createCell(1).setCellValue(to_be_matched); + dataRow.createCell(2).setCellValue(to_be_approved); + dataRow.createCell(3).setCellValue(locked); + dataRow.createCell(4).setCellValue(rejected); + dataRow.createCell(5).setCellValue(Not_start); + dataRow.createCell(6).setCellValue(In_progress); + dataRow.createCell(7).setCellValue(Test_passed); + dataRow.createCell(8).setCellValue(Test_failed); + dataRow.createCell(9).setCellValue(Component_report_not_submitted); + dataRow.createCell(10).setCellValue(Component_report_submitted); + dataRow.createCell(11).setCellValue(Component_report_has_been_stored); + dataIndex ++; + } + } + } /** * 导出认证参数收集-设置数据 @@ -3432,6 +3525,15 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl res = this.list(queryWrapper); return res; } + + @Override + public List getListByIds(List projectIdList) { + List res = new ArrayList<>(); + if(CollectionUtils.isNotEmpty(projectIdList)){ + res = this.getBaseMapper().getListByIds(projectIdList); + } + return res; + } } diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/vdrDetial.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/vdrDetial.vue index 8e04ddc59..961c2afe5 100644 --- a/jero-web/src/views/otamanagement/otaAuthentication/components/vdrDetial.vue +++ b/jero-web/src/views/otamanagement/otaAuthentication/components/vdrDetial.vue @@ -66,7 +66,7 @@
- {{item.versionName}} + {{item.versionName}}