|
|
@@ -15,6 +15,7 @@ import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.List; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
@@ -106,9 +107,14 @@ public class GenerateReportService { |
|
|
|
report.setInspectionName(inspection.getName()); |
|
|
|
report.setCreateUser(userId); |
|
|
|
report.setCreateTime(DateUtils.now()); |
|
|
|
|
|
|
|
List<Integer> statusList = new ArrayList<>(); |
|
|
|
statusList.add(InspectionFileStatusEnum.CONFIRMED.getCode()); |
|
|
|
statusList.add(InspectionFileStatusEnum.GENERATE_ORDER.getCode()); |
|
|
|
statusList.add(InspectionFileStatusEnum.PROCESSED.getCode()); |
|
|
|
List<InspectionFile> inspectionFileList = inspectionFileMapper.selectList(Wrappers.<InspectionFile>lambdaQuery() |
|
|
|
.eq(InspectionFile::getInspectionId, inspection.getId()) |
|
|
|
.eq(InspectionFile::getStatus, InspectionFileStatusEnum.CONFIRMED.getCode()) |
|
|
|
.in(InspectionFile::getStatus, statusList) |
|
|
|
.eq(InspectionFile::getMark, 1)); |
|
|
|
List<String> inspectionFileIdList = null; |
|
|
|
if (!CollectionUtil.isEmpty(inspectionFileList)) { |