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 | 86 +++++++++++++++++++++++++++++++------------
1 files changed, 62 insertions(+), 24 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 7ad031e..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
@@ -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);
}
/**
@@ -305,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();
@@ -321,27 +353,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("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.8.0