zxl
昨天 d3e36feef46d4b5d381333698977a5a913f18284
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
@@ -74,6 +74,8 @@
            throw new RuntimeException("非运维单位暂时无法报备");
        }
        form.setUnitId(unitId);
        Long userId = SecurityUtils.getLoginUser().getUserId();
        form.setPeopleId(Integer.parseInt(userId+""));
        if ("事前报备".equals(form.getReportType())) {
            // 如果是事前报备需要检验是否已经生成下发工单
            YwPointVO point = ywpointMapper.countNotFinishedWorkOrderByGb(form.getPointId());
@@ -256,6 +258,14 @@
    public Result page(ReportQuery query) {
        IPage<ReportVO> page = PageUtil.getPage(query, ReportVO.class);
        query.setUnitId(SecurityUtils.getUnitId());
        if (query.getReportTimeEnd() != null) {
            query.setReportTimeEnd(DateUtils.getDayEnd(query.getReportTimeEnd()));
        }
        if (query.getEffectTimeEnd() != null) {
            query.setEffectTimeEnd(DateUtils.getDayEnd(query.getEffectTimeEnd()));
        }
        baseMapper.page(page, query);
        List<SysDictData> errorTypeList = dictTypeService.selectDictDataByType("report_error_type");
        Map<String, String> dictMap = errorTypeList.stream().collect(Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel));
@@ -340,6 +350,7 @@
                item.setResultStr(records.get(0).getResult() ? "通过" : "未通过");
                item.setResultRemark(records.get(0).getResultRemark());
                item.setAuditingTime(records.get(0).getCreateTime());
            } else {
                item.setResultStr("审核中");
            }