Browse Source

重构代码

tags/v1.0.0^2
wanjing 1 year ago
parent
commit
6ce10a271f
1 changed files with 5 additions and 5 deletions
  1. +5
    -5
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/report/query/QueryInspectionHandleReportService.java

+ 5
- 5
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/report/query/QueryInspectionHandleReportService.java View File

@@ -88,7 +88,7 @@ public class QueryInspectionHandleReportService {
Report report = reportMapper.selectOne(new LambdaQueryWrapper<Report>()
.eq(Report::getTenantId, tenantId)
.eq(Report::getId, id)
.eq(Report::getMark, MarkEnum.VALID.getCode());
.eq(Report::getMark, MarkEnum.VALID.getCode()));
if (null == report) {
return JsonResult.error(QueryInspectionReportCodeEnum.REPORT_IS_NOT_EXIST.getCode(), QueryInspectionReportCodeEnum.REPORT_IS_NOT_EXIST.getMsg());
}
@@ -175,7 +175,7 @@ public class QueryInspectionHandleReportService {
if (!CollectionUtil.isEmpty(inspectionFileIdList)) {
inspectionFileHandleList = inspectionFileHandleMapper.selectList(Wrappers.<InspectionFileHandle>lambdaQuery()
.in(InspectionFileHandle::getInspectionFileId, inspectionFileIdList)
.eq(InspectionFileHandle::getMark, MarkEnum.VALID.getCode());
.eq(InspectionFileHandle::getMark, MarkEnum.VALID.getCode()));

}
if (CollectionUtil.isEmpty(inspectionFileIdList)) {
@@ -208,7 +208,7 @@ public class QueryInspectionHandleReportService {
}
List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>()
.in(User::getId, userIdList)
.eq(User::getMark, MarkEnum.VALID.getCode());
.eq(User::getMark, MarkEnum.VALID.getCode()));
Map<String, User> userMap = userList.stream().collect(Collectors.toMap(User::getId, Function.identity()));
return userMap;
}
@@ -232,7 +232,7 @@ public class QueryInspectionHandleReportService {
private List<InspectionResultVo> buildInspectionResult(Report report) {
List<InspectionResultVo> inspectionResultVoList = new ArrayList<>();
List<QuestionType> questionTypeList = questionTypeMapper.selectList(new LambdaQueryWrapper<QuestionType>()
.eq(QuestionType::getMark, MarkEnum.VALID.getCode());
.eq(QuestionType::getMark, MarkEnum.VALID.getCode()));
QuestionType questionType;
InspectionResultVo inspectionResultVo;
for (int i = 0; i < questionTypeList.size(); i++) {
@@ -251,7 +251,7 @@ public class QueryInspectionHandleReportService {
.eq(InspectionFile::getInspectionId, inspectionId)
.in(InspectionFile::getStatus, GetInspectionFileStatusList.getStatusList())
.eq(InspectionFile::getQuestionCode, questionCode)
.eq(InspectionFile::getMark, MarkEnum.VALID.getCode());
.eq(InspectionFile::getMark, MarkEnum.VALID.getCode()));
return count;
}


Loading…
Cancel
Save