ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 车型项目库详情

Browse Source
This commit is contained in:
lijiarao
2024-02-01 20:26:53 +08:00
parent f5cedd7b40
commit b4e26ddabb
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/projectLibrary/service/impl/LawsAssessServiceImpl.java
+22 -18
View File
@@ -170,29 +170,33 @@ public class LawsAssessServiceImpl extends ServiceImpl<LawsAssessMapper, LawsAss
if (CommonConstant.STANDARD_SOURCE_1.equals(source)){
//查询国内标准数据，赋值给collection
LawsDomesticStandard standard = lawsDomesticStandardService.queryById(standardId);
assess.setStandardEnglishName(standard.getStandardEnglishName());
assess.setStandardState(standard.getStandardState());
assess.setApplicableVehicle(standard.getApplicableVehicle());
assess.setOnTheProductionDate(standard.getOnTheProductionDate());
assess.setNewModelImplementationDate(standard.getNewModelImplementationDate());
assess.setReleaseDate(standard.getReleaseDate());
//TODO "这里要用额外方法查询"
//assess.setAssessResults("-");
assess.setResponsibleDepartment(standard.getResponsibleDepartment());
if (standard != null){
assess.setStandardEnglishName(standard.getStandardEnglishName());
assess.setStandardState(standard.getStandardState());
assess.setApplicableVehicle(standard.getApplicableVehicle());
assess.setOnTheProductionDate(standard.getOnTheProductionDate());
assess.setNewModelImplementationDate(standard.getNewModelImplementationDate());
assess.setReleaseDate(standard.getReleaseDate());
//TODO "这里要用额外方法查询"
//assess.setAssessResults("-");
assess.setResponsibleDepartment(standard.getResponsibleDepartment());
}
}
if (CommonConstant.STANDARD_SOURCE_2.equals(source)){
//查询海外标准数据，赋值给collection
LawsOverseasStandard standard = lawsOverseasStandardService.queryById(standardId);
assess.setStandardEnglishName(standard.getStandardEnglishName());
assess.setStandardState(standard.getStandardState());
assess.setApplicableVehicle(standard.getApplicableVehicle());
assess.setOnTheProductionDate(standard.getOnTheProductionDate());
assess.setNewModelImplementationDate(standard.getNewModelImplementationDate());
assess.setReleaseDate(standard.getReleaseDate());
//TODO "这里要用额外方法查询"
//assess.setAssessResults("-");
assess.setResponsibleDepartment(standard.getResponsibleDepartment());
if (standard != null){
assess.setStandardEnglishName(standard.getStandardEnglishName());
assess.setStandardState(standard.getStandardState());
assess.setApplicableVehicle(standard.getApplicableVehicle());
assess.setOnTheProductionDate(standard.getOnTheProductionDate());
assess.setNewModelImplementationDate(standard.getNewModelImplementationDate());
assess.setReleaseDate(standard.getReleaseDate());
//TODO "这里要用额外方法查询"
//assess.setAssessResults("-");
assess.setResponsibleDepartment(standard.getResponsibleDepartment());
}
}
String assessResults = assess.getAssessResults();
if (StringUtils.isBlank(assessResults)){