报备功能优化

xiangpei

2024-09-02 84d1db0005eb9567810e1229636357d2a994d944

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

@@ -35,11 +35,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;

import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -122,6 +120,8 @@
        YwPeople people = new LambdaQueryChainWrapper<>(peopleMapper).eq(YwPeople::getUserId, userId).one();
        form.setPeopleId(people.getId());
        form.setUnitId(people.getBelongUnit());
        form.setBeginCreateTime(DateUtils.parseDate(form.getBeginCreateTimeStr()));
        form.setEndCreateTime(DateUtils.parseDate(form.getEndCreateTimeStr()));
        // 读取excel数据
        ExcelUtil<ReportImportDTO> excelUtil = new ExcelUtil<>(ReportImportDTO.class);
        List<ReportImportDTO> list = excelUtil.importExcel(form.getImportPointId().getInputStream());
@@ -137,7 +137,7 @@
                }
            }
            YwPoint point = new LambdaQueryChainWrapper<>(ywpointMapper)
                    .eq(YwPoint::getSerialNumber, form.getPointId())
                    .eq(YwPoint::getSerialNumber, item.getSerialNumber())
                    .one();
            if (Objects.isNull(point)) {
                continue;
@@ -163,6 +163,12 @@
            success++;
        }
        return Result.ok("报备点位数：" + list.size() + "，导入成功数：" + success);
    }

    @Override
    public Result getTogether(String pid) {
        List<Report> list = baseMapper.getTogether(pid);
        return Result.ok().data(list);
    }

    /**
@@ -321,27 +327,33 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Result auditing(ReportAuditingForm form) {
        Report report = baseMapper.selectById(form.getId());
        if (Objects.isNull(report)) {
            throw new RuntimeException("审核的报备不存在");
        if (CollectionUtils.isEmpty(form.getTogetherList())) {
            form.setTogetherList(new ArrayList<>(2));
        }
        if (form.getAuditingResult()) {
            report.setStatus(1);
        } else {
            report.setStatus(2);
        }
        Date now = new Date();
        report.setUpdateTime(now);
        baseMapper.updateById(report);
        form.getTogetherList().add(form.getId());
        for (Integer id : form.getTogetherList()) {
            Report report = baseMapper.selectById(id);
            if (Objects.isNull(report)) {
                continue;
            }
            if (form.getAuditingResult()) {
                report.setStatus(1);
            } else {
                report.setStatus(2);
            }
            Date now = new Date();
            report.setUpdateTime(now);
            baseMapper.updateById(report);

        // 添加一条审核记录
        ReportAuditingRecord reportAuditingRecord = new ReportAuditingRecord();
        reportAuditingRecord.setReportId(form.getId());
        reportAuditingRecord.setDeleted(0);
        reportAuditingRecord.setCreateTime(now);
        reportAuditingRecord.setResultRemark(form.getAuditOpinion());
        reportAuditingRecord.setResult(form.getAuditingResult());
        reportAuditingRecordService.save(reportAuditingRecord);
            // 添加一条审核记录
            ReportAuditingRecord reportAuditingRecord = new ReportAuditingRecord();
            reportAuditingRecord.setReportId(id);
            reportAuditingRecord.setDeleted(0);
            reportAuditingRecord.setCreateTime(now);
            reportAuditingRecord.setResultRemark(form.getAuditOpinion());
            reportAuditingRecord.setResult(form.getAuditingResult());
            reportAuditingRecordService.save(reportAuditingRecord);
        }
        return Result.ok("操作成功");
    }
}