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

项目版本下拉-添加不涉及

Browse Source
This commit is contained in:
zhn
2023-08-24 19:27:11 +08:00
parent 87ccec3dfa
commit 1af08d725e
3 changed files with 16 additions and 5 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/controller/OtaManageApplyEOController.java
+2 -2
View File
@@ -167,8 +167,8 @@ public class OtaManageApplyEOController extends JeroController<OtaManageApplyEO,
@AutoLog(value = "项目版本下拉数据")
@ApiOperation(value="项目版本下拉数据", notes="项目版本下拉数据")
@GetMapping(value = "/getProjectVersionList")
public Result<?> getProjectVersionList(String carMarket) {
List<VersionVO> result = otaManageApplyEOService.getProjectVersionList(carMarket);
public Result<?> getProjectVersionList(String carMarket,String cut) {
List<VersionVO> result = otaManageApplyEOService.getProjectVersionList(carMarket,cut);
return Result.OK(result);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaManageApplyEOService.java
+1 -1
View File
@@ -102,7 +102,7 @@ public interface IOtaManageApplyEOService extends IService<OtaManageApplyEO> {
* @param carMarket
* @return
*/
List<VersionVO> getProjectVersionList(String carMarket);
List<VersionVO> getProjectVersionList(String carMarket,String cut);
/**
* 全车型和分车型详情
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+13 -2
View File
@@ -31,6 +31,7 @@ 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;
@@ -672,7 +673,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
}
}
if (!list.isEmpty()) {
List<VersionVO> vprojectVersionList = getProjectVersionList(otaManageApplyEO.getAppliedVehicleProject());
List<VersionVO> vprojectVersionList = getProjectVersionList(otaManageApplyEO.getAppliedVehicleProject(),null);
//项目版本id
List<String> projectVersionList = list.stream()
.map(OtaManageApplyEO::getProjectVersion).distinct().collect(Collectors.toList());
@@ -850,7 +851,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
}
@Override
public List<VersionVO> getProjectVersionList(String carMarket) {
public List<VersionVO> getProjectVersionList(String carMarket,String cut) {
List<VersionVO> result = new LinkedList<>();
if (StringUtils.isNotBlank(carMarket)) {
@@ -889,6 +890,16 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
for (VersionVO versionVO : result) {
versionVO.setVersionName(versionVO.getCar() + "-" + versionVO.getYearName() + "-" + versionVO.getMarket() + "-" + 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;
}