|
|
@@ -25,6 +25,7 @@ import com.sundot.airport.common.enums.BaseAttachmentSourceTypeEnum;
|
|
25
|
25
|
import com.sundot.airport.common.enums.CheckLevelEnum;
|
|
26
|
26
|
import com.sundot.airport.common.enums.CheckProjectItemTypeEnum;
|
|
27
|
27
|
import com.sundot.airport.common.enums.CheckRecordStatusEnum;
|
|
|
28
|
+import com.sundot.airport.common.enums.CheckResultEnum;
|
|
28
|
29
|
import com.sundot.airport.common.enums.CheckScoreLevelEnum;
|
|
29
|
30
|
import com.sundot.airport.common.enums.CheckUserTypeEnum;
|
|
30
|
31
|
import com.sundot.airport.common.exception.ServiceException;
|
|
|
@@ -367,12 +368,40 @@ public class CheckRecordServiceImpl extends ServiceImpl<CheckRecordMapper, Check
|
|
367
|
368
|
baseAttachment.setId(null);
|
|
368
|
369
|
});
|
|
369
|
370
|
}
|
|
|
371
|
+ List<CheckProjectItem> projectItemList = checkRecord.getCheckProjectItemList();
|
|
|
372
|
+ if (CollUtil.isEmpty(projectItemList)) {
|
|
|
373
|
+ checkRecord.setCheckResult(CheckResultEnum.PASS.getCode());
|
|
|
374
|
+ checkRecord.setCheckResultDesc(CheckResultEnum.PASS.getDesc());
|
|
|
375
|
+ } else {
|
|
|
376
|
+ boolean hasUnqualifiedItem = projectItemList.stream().anyMatch(item -> item != null && !StringUtils.equals(CheckScoreLevelEnum.QUALIFIED.getCode(), item.getScoreLevel()));
|
|
|
377
|
+ if (hasUnqualifiedItem) {
|
|
|
378
|
+ checkRecord.setCheckResult(CheckResultEnum.FAIL.getCode());
|
|
|
379
|
+ checkRecord.setCheckResultDesc(CheckResultEnum.FAIL.getDesc());
|
|
|
380
|
+ } else {
|
|
|
381
|
+ checkRecord.setCheckResult(CheckResultEnum.PASS.getCode());
|
|
|
382
|
+ checkRecord.setCheckResultDesc(CheckResultEnum.PASS.getDesc());
|
|
|
383
|
+ }
|
|
|
384
|
+ }
|
|
370
|
385
|
result = insertCheckRecord(checkRecord);
|
|
371
|
386
|
} else {
|
|
372
|
387
|
CheckRecord record = checkRecordMapper.selectById(checkRecord.getId());
|
|
373
|
388
|
if (ObjUtil.isNull(record)) {
|
|
374
|
389
|
throw new ServiceException("根据id[" + checkRecord.getId() + "]未查询到检查单");
|
|
375
|
390
|
}
|
|
|
391
|
+ List<CheckProjectItem> projectItemList = checkRecord.getCheckProjectItemList();
|
|
|
392
|
+ if (CollUtil.isEmpty(projectItemList)) {
|
|
|
393
|
+ checkRecord.setCheckResult(CheckResultEnum.PASS.getCode());
|
|
|
394
|
+ checkRecord.setCheckResultDesc(CheckResultEnum.PASS.getDesc());
|
|
|
395
|
+ } else {
|
|
|
396
|
+ boolean hasUnqualifiedItem = projectItemList.stream().anyMatch(item -> item != null && !StringUtils.equals(CheckScoreLevelEnum.QUALIFIED.getCode(), item.getScoreLevel()));
|
|
|
397
|
+ if (hasUnqualifiedItem) {
|
|
|
398
|
+ checkRecord.setCheckResult(CheckResultEnum.FAIL.getCode());
|
|
|
399
|
+ checkRecord.setCheckResultDesc(CheckResultEnum.FAIL.getDesc());
|
|
|
400
|
+ } else {
|
|
|
401
|
+ checkRecord.setCheckResult(CheckResultEnum.PASS.getCode());
|
|
|
402
|
+ checkRecord.setCheckResultDesc(CheckResultEnum.PASS.getDesc());
|
|
|
403
|
+ }
|
|
|
404
|
+ }
|
|
376
|
405
|
result = updateCheckRecord(checkRecord);
|
|
377
|
406
|
}
|
|
378
|
407
|
//创建问题整改表单
|