fix 车型项目库详情

This commit is contained in:
lijiarao
2024-02-01 20:26:53 +08:00
parent f5cedd7b40
commit b4e26ddabb
@@ -170,29 +170,33 @@ public class LawsAssessServiceImpl extends ServiceImpl<LawsAssessMapper, LawsAss
if (CommonConstant.STANDARD_SOURCE_1.equals(source)){ if (CommonConstant.STANDARD_SOURCE_1.equals(source)){
//查询国内标准数据,赋值给collection //查询国内标准数据,赋值给collection
LawsDomesticStandard standard = lawsDomesticStandardService.queryById(standardId); LawsDomesticStandard standard = lawsDomesticStandardService.queryById(standardId);
assess.setStandardEnglishName(standard.getStandardEnglishName()); if (standard != null){
assess.setStandardState(standard.getStandardState()); assess.setStandardEnglishName(standard.getStandardEnglishName());
assess.setApplicableVehicle(standard.getApplicableVehicle()); assess.setStandardState(standard.getStandardState());
assess.setOnTheProductionDate(standard.getOnTheProductionDate()); assess.setApplicableVehicle(standard.getApplicableVehicle());
assess.setNewModelImplementationDate(standard.getNewModelImplementationDate()); assess.setOnTheProductionDate(standard.getOnTheProductionDate());
assess.setReleaseDate(standard.getReleaseDate()); assess.setNewModelImplementationDate(standard.getNewModelImplementationDate());
//TODO "这里要用额外方法查询" assess.setReleaseDate(standard.getReleaseDate());
//assess.setAssessResults("-"); //TODO "这里要用额外方法查询"
assess.setResponsibleDepartment(standard.getResponsibleDepartment()); //assess.setAssessResults("-");
assess.setResponsibleDepartment(standard.getResponsibleDepartment());
}
} }
if (CommonConstant.STANDARD_SOURCE_2.equals(source)){ if (CommonConstant.STANDARD_SOURCE_2.equals(source)){
//查询海外标准数据,赋值给collection //查询海外标准数据,赋值给collection
LawsOverseasStandard standard = lawsOverseasStandardService.queryById(standardId); LawsOverseasStandard standard = lawsOverseasStandardService.queryById(standardId);
assess.setStandardEnglishName(standard.getStandardEnglishName()); if (standard != null){
assess.setStandardState(standard.getStandardState()); assess.setStandardEnglishName(standard.getStandardEnglishName());
assess.setApplicableVehicle(standard.getApplicableVehicle()); assess.setStandardState(standard.getStandardState());
assess.setOnTheProductionDate(standard.getOnTheProductionDate()); assess.setApplicableVehicle(standard.getApplicableVehicle());
assess.setNewModelImplementationDate(standard.getNewModelImplementationDate()); assess.setOnTheProductionDate(standard.getOnTheProductionDate());
assess.setReleaseDate(standard.getReleaseDate()); assess.setNewModelImplementationDate(standard.getNewModelImplementationDate());
//TODO "这里要用额外方法查询" assess.setReleaseDate(standard.getReleaseDate());
//assess.setAssessResults("-"); //TODO "这里要用额外方法查询"
assess.setResponsibleDepartment(standard.getResponsibleDepartment()); //assess.setAssessResults("-");
assess.setResponsibleDepartment(standard.getResponsibleDepartment());
}
} }
String assessResults = assess.getAssessResults(); String assessResults = assess.getAssessResults();
if (StringUtils.isBlank(assessResults)){ if (StringUtils.isBlank(assessResults)){