|
@@ -295,17 +295,17 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
|
|
|
return reportAffair.getDescription();
|
|
|
} else {
|
|
|
Integer affairType = 3;
|
|
|
- LambdaQueryWrapper<ReportAffair> queryWrapper1 = new LambdaQueryWrapper<>();
|
|
|
- queryWrapper1.eq(ReportAffair::getAffairType, affairType)
|
|
|
+ LambdaQueryWrapper<ReportAffair> invalidRecordWrapper = new LambdaQueryWrapper<>();
|
|
|
+ invalidRecordWrapper.eq(ReportAffair::getAffairType, affairType)
|
|
|
.eq(ReportAffair::getProjectId, reportProject.getProjectId())
|
|
|
.orderByDesc(ReportAffair::getCreateTime)
|
|
|
.last("LIMIT 1");
|
|
|
- ReportAffair reportAffair1 = reportAffairService.getOne(queryWrapper, false);
|
|
|
+ ReportAffair reportAffair1 = reportAffairService.getOne(invalidRecordWrapper, false);
|
|
|
if (reportAffair1 != null) {
|
|
|
Integer reportAffairId2 = reportAffair1.getId();
|
|
|
- LambdaQueryWrapper<InvalidDecisionFile> queryWrapper2 = new LambdaQueryWrapper<>();
|
|
|
- queryWrapper2.eq(InvalidDecisionFile::getReportAffairId, reportAffairId2);
|
|
|
- InvalidDecisionFile invalidDecisionFile = invalidDecisionFileService.getOne(queryWrapper2, false);
|
|
|
+ LambdaQueryWrapper<InvalidDecisionFile> invalidDecisionFileWrapper = new LambdaQueryWrapper<>();
|
|
|
+ invalidDecisionFileWrapper.eq(InvalidDecisionFile::getReportAffairId, reportAffairId2);
|
|
|
+ InvalidDecisionFile invalidDecisionFile = invalidDecisionFileService.getOne(invalidDecisionFileWrapper, false);
|
|
|
if (invalidDecisionFile != null) {
|
|
|
return invalidDecisionFile.getDecisionKey();
|
|
|
} else {
|