Skip to content

V
vehicle-quality-review
Commit e84f2aaf authored by wdy's avatar wdy
Browse files
Options

Merge branch 'wangdingyi' into 'dev' 

设置标准符合不符合

See merge request !173
parents c3174724 3099c0c8
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
quality-review/src/main/java/com/ruoyi/service/impl/StrategyCarReviewTaskPending.java
View file @ e84f2aaf
...@@ -171,9 +171,12 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init ...@@ -171,9 +171,12 @@ public class StrategyCarReviewTaskPending implements StrategyCarReviewTask, Init
for(ReviewDetails details : reviewDetailsList) { for(ReviewDetails details : reviewDetailsList) {
ReviewDetailsResult reviewDetailsResult = resultMap.get(details.getId()); ReviewDetailsResult reviewDetailsResult = resultMap.get(details.getId());
if(reviewDetailsResult == null || Objects.equals(reviewDetailsResult.getPassed(), ReviewStandard.NO_PASSED)) { if(reviewDetailsResult != null && Objects.equals(reviewDetailsResult.getPassed(), ReviewStandard.NO_PASSED)) {
standard.setPassed(ReviewStandard.NO_PASSED); standard.setPassed(ReviewStandard.NO_PASSED);
} }
if(reviewDetailsResult == null) {
standard.setPassed(null);
}
if(reviewDetailsResult != null && reviewDetailsResult.getReviewEnterpriseArchiveId() != null) { if(reviewDetailsResult != null && reviewDetailsResult.getReviewEnterpriseArchiveId() != null) {
ReviewEnterpriseArchive reviewEnterpriseArchive = reviewEnterpriseArchiveMapper.selectById(reviewDetailsResult.getReviewEnterpriseArchiveId()); ReviewEnterpriseArchive reviewEnterpriseArchive = reviewEnterpriseArchiveMapper.selectById(reviewDetailsResult.getReviewEnterpriseArchiveId());
reviewDetailsResult.setFileName(reviewEnterpriseArchive.getFileName()); reviewDetailsResult.setFileName(reviewEnterpriseArchive.getFileName());
......
quality-review/src/main/java/com/ruoyi/service/impl/StrategySystemReviewTaskPending.java
View file @ e84f2aaf
...@@ -170,9 +170,12 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask ...@@ -170,9 +170,12 @@ public class StrategySystemReviewTaskPending implements StrategySystemReviewTask
for(ReviewDetails details : reviewDetailsList) { for(ReviewDetails details : reviewDetailsList) {
ReviewDetailsResult reviewDetailsResult = resultMap.get(details.getId()); ReviewDetailsResult reviewDetailsResult = resultMap.get(details.getId());
if(reviewDetailsResult == null || Objects.equals(reviewDetailsResult.getPassed(), ReviewStandard.NO_PASSED)) { if(reviewDetailsResult != null && Objects.equals(reviewDetailsResult.getPassed(), ReviewStandard.NO_PASSED)) {
standard.setPassed(ReviewStandard.NO_PASSED); standard.setPassed(ReviewStandard.NO_PASSED);
} }
if(reviewDetailsResult == null) {
standard.setPassed(null);
}
if(reviewDetailsResult != null && reviewDetailsResult.getReviewEnterpriseArchiveId() != null) { if(reviewDetailsResult != null && reviewDetailsResult.getReviewEnterpriseArchiveId() != null) {
ReviewEnterpriseArchive reviewEnterpriseArchive = reviewEnterpriseArchiveMapper.selectById(reviewDetailsResult.getReviewEnterpriseArchiveId()); ReviewEnterpriseArchive reviewEnterpriseArchive = reviewEnterpriseArchiveMapper.selectById(reviewDetailsResult.getReviewEnterpriseArchiveId());
reviewDetailsResult.setFileName(reviewEnterpriseArchive.getFileName()); reviewDetailsResult.setFileName(reviewEnterpriseArchive.getFileName());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment