From 7e39aba8980b95fac3b347689aac66da41079d18 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 01 九月 2024 22:41:38 +0800
Subject: [PATCH] 报备功能优化
---
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 36 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..759fd9c 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.getEndCreateTime()));
// 璇诲彇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(form.getId());
+ reportAuditingRecord.setDeleted(0);
+ reportAuditingRecord.setCreateTime(now);
+ reportAuditingRecord.setResultRemark(form.getAuditOpinion());
+ reportAuditingRecord.setResult(form.getAuditingResult());
+ reportAuditingRecordService.save(reportAuditingRecord);
+ }
return Result.ok("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.8.0