工单详情：工单信息、报备信息

xiangpei

2024-09-09 f5e0ae6c3e2d4b7367389315bf24596446280430

 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java

@@ -101,7 +101,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Boolean innerAddWorkOrder(List<WorkOrder> workOrderList) {
    public synchronized Boolean innerAddWorkOrder(List<WorkOrder> workOrderList) {
        int total = workOrderList.size();
        workOrderList.stream().filter(item -> {
            return StringUtils.hasText(item.getSerialNumber()) && Objects.nonNull(item.getStatus()) && !CollectionUtils.isEmpty(item.getErrorTypeList());
@@ -763,19 +763,34 @@

        Date now = new Date();
        if (Objects.nonNull(beforeRecord)) {
            if (beforeRecord.getStartCreateTime().after(now)) {
            if (now.before(beforeRecord.getBeginCreateTime())) {
                process.setBeforeReportMsg("事前报备已失效");
            } else if (beforeRecord.getEndCreateTime().before(now)){
            } else if (now.after(beforeRecord.getEndCreateTime())){
                process.setBeforeReportMsg("事前报备未生效");
            } else {
                process.setBeforeReportMsg("已事前报备");
            }
        }
        if (Objects.nonNull(afterRecord)) {
            if (afterRecord.getStartCreateTime().after(now)) {
            if (now.before(afterRecord.getBeginCreateTime())) {
                process.setAfterReportMsg("事后报备已失效");
            } else if (afterRecord.getEndCreateTime().before(now)){
            } else if (now.after(afterRecord.getEndCreateTime())){
                process.setAfterReportMsg("事后报备未生效");
            } else {
                process.setAfterReportMsg("已事后报备");
            }
        }
        return Result.ok().data(process);
    }

    @Override
    public Result detailByNo(String workOrderNo) {
        WorkOrderDetailVO workOrder = baseMapper.detailByNo(workOrderNo);
        // 是否报备
        boolean hasReport = new LambdaQueryChainWrapper<>(reportMapper)
                .eq(Report::getSerialNumber, workOrder.getSerialNumber())
                .exists();
        workOrder.setHasReport(hasReport);
        return Result.ok().data(workOrder);
    }
}