From 5648a998a4bdb6c12672665bb6974920f11ba3e5 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 02 九月 2024 12:09:55 +0800
Subject: [PATCH] 用户表增加unitId字段，新建运维单位账号绑定unitId
---
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
index 759fd9c..dfe6ed7 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
@@ -121,7 +121,7 @@
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());
@@ -311,7 +311,33 @@
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();
@@ -347,7 +373,7 @@
// 娣诲姞涓�鏉″鏍歌褰�
ReportAuditingRecord reportAuditingRecord = new ReportAuditingRecord();
- reportAuditingRecord.setReportId(form.getId());
+ reportAuditingRecord.setReportId(id);
reportAuditingRecord.setDeleted(0);
reportAuditingRecord.setCreateTime(now);
reportAuditingRecord.setResultRemark(form.getAuditOpinion());
--
Gitblit v1.8.0