| | |
|---|
| | | form.setPeopleId(people.getId()); |
|---|
| | | form.setUnitId(people.getBelongUnit()); |
|---|
| | | form.setBeginCreateTime(DateUtils.parseDate(form.getBeginCreateTimeStr())); |
|---|
| | | form.setEndCreateTime(DateUtils.parseDate(form.getEndCreateTime())); |
|---|
| | | form.setEndCreateTime(DateUtils.parseDate(form.getEndCreateTimeStr())); |
|---|
| | | // 读取excel数据 |
|---|
| | | ExcelUtil<ReportImportDTO> excelUtil = new ExcelUtil<>(ReportImportDTO.class); |
|---|
| | | List<ReportImportDTO> list = excelUtil.importExcel(form.getImportPointId().getInputStream()); |
|---|
| | |
|---|
| | | IPage<ReportVO> page = PageUtil.getPage(query, ReportVO.class); |
|---|
| | | page.setSize(-1); |
|---|
| | | 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)); |
|---|
| | | page.getRecords().forEach(item -> { |
|---|
| | | if (StringUtils.hasText(item.getErrorType())) { |
|---|
| | | item.setErrorTypeList(List.of(item.getErrorType().split(","))); |
|---|
| | | StringBuilder sb = new StringBuilder(); |
|---|
| | | item.getErrorTypeList().stream().forEach(err -> { |
|---|
| | | String s = dictMap.get(err); |
|---|
| | | if (org.springframework.util.StringUtils.hasText(s)) { |
|---|
| | | sb.append(s).append("、"); |
|---|
| | | } |
|---|
| | | }); |
|---|
| | | item.setErrorType(sb.substring(0, sb.length() - 1)); |
|---|
| | | } |
|---|
| | | // 审核结果 |
|---|
| | | List<ReportAuditingRecord> records = new LambdaQueryChainWrapper<>(reportAuditingRecordService.getBaseMapper()) |
|---|
| | | .eq(ReportAuditingRecord::getReportId, item.getId()) |
|---|
| | | .orderByDesc(ReportAuditingRecord::getCreateTime) |
|---|
| | | .last("limit 1") |
|---|
| | | .list(); |
|---|
| | | if (! CollectionUtils.isEmpty(records)) { |
|---|
| | | item.setResultStr(records.get(0).getResult() ? "通过" : "未通过"); |
|---|
| | | item.setResultRemark(records.get(0).getResultRemark()); |
|---|
| | | item.setAuditingTime(records.get(0).getCreateTime()); |
|---|
| | | } else { |
|---|
| | | item.setResultStr("审核中"); |
|---|
| | | } |
|---|
| | | item.setReportContent(EscapeUtil.clean(item.getReportContent())); |
|---|
| | | }); |
|---|
| | | return page.getRecords(); |
|---|
| | |
|---|
| | | |
|---|
| | | // 添加一条审核记录 |
|---|
| | | ReportAuditingRecord reportAuditingRecord = new ReportAuditingRecord(); |
|---|
| | | reportAuditingRecord.setReportId(form.getId()); |
|---|
| | | reportAuditingRecord.setReportId(id); |
|---|
| | | reportAuditingRecord.setDeleted(0); |
|---|
| | | reportAuditingRecord.setCreateTime(now); |
|---|
| | | reportAuditingRecord.setResultRemark(form.getAuditOpinion()); |
|---|
