From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 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 dfe6ed7..a4e0441 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
@@ -68,10 +68,11 @@
if (Objects.isNull(form.getPointId())) {
throw new RuntimeException("鐐逛綅涓嶈兘涓虹┖");
}
- Long userId = SecurityUtils.getUserId();
- YwPeople people = new LambdaQueryChainWrapper<>(peopleMapper).eq(YwPeople::getUserId, userId).one();
- form.setPeopleId(people.getId());
- form.setUnitId(people.getBelongUnit());
+ Integer unitId = SecurityUtils.getUnitId();
+ if (Objects.isNull(unitId)) {
+ throw new RuntimeException("闈炶繍缁村崟浣嶆殏鏃舵棤娉曟姤澶�");
+ }
+ form.setUnitId(unitId);
if ("浜嬪墠鎶ュ".equals(form.getReportType())) {
// 濡傛灉鏄簨鍓嶆姤澶囬渶瑕佹楠屾槸鍚﹀凡缁忕敓鎴愪笅鍙戝伐鍗�
YwPointVO point = ywpointMapper.countNotFinishedWorkOrderByGb(form.getPointId());
@@ -88,10 +89,10 @@
Report entity = ReportForm.getEntityByForm(form, null);
entity.setSerialNumber(point.getSerialNumber());
entity.setStatus(0);
- entity.setIdentify(IdUtils.randomNO());
Date now = new Date();
entity.setCreateTime(now);
entity.setUpdateTime(now);
+ entity.setIdentify(IdUtils.randomNO(now));
baseMapper.insert(entity);
List<ReportErrorType> errorTypeList = form.getErrorTypeList().stream().map(item -> {
ReportErrorType reportErrorType = new ReportErrorType();
@@ -116,17 +117,19 @@
@SneakyThrows
@Transactional
public Result importData(ReportForm form) {
- Long userId = SecurityUtils.getUserId();
- YwPeople people = new LambdaQueryChainWrapper<>(peopleMapper).eq(YwPeople::getUserId, userId).one();
- form.setPeopleId(people.getId());
- form.setUnitId(people.getBelongUnit());
+ Integer unitId = SecurityUtils.getUnitId();
+ if (Objects.isNull(unitId)) {
+ throw new RuntimeException("闈炶繍缁村崟浣嶆殏鏃舵棤娉曟姤澶�");
+ }
+ form.setUnitId(unitId);
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());
+ Date now = DateUtils.getNowDate();
// 鎵归噺鎻掑叆
- String pid = IdUtils.randomNO();
+ String pid = IdUtils.randomNO(now);
Integer success = 0;
for (ReportImportDTO item : list) {
if ("浜嬪墠鎶ュ".equals(form.getReportType())) {
@@ -146,8 +149,7 @@
entity.setImportBatchNumber(pid);
entity.setSerialNumber(item.getSerialNumber());
entity.setStatus(0);
- entity.setIdentify(IdUtils.randomNO());
- Date now = DateUtils.getNowDate();
+ entity.setIdentify(IdUtils.randomNO(now));
entity.setCreateTime(now);
entity.setUpdateTime(now);
baseMapper.insert(entity);
@@ -252,6 +254,7 @@
@Override
public Result page(ReportQuery query) {
IPage<ReportVO> page = PageUtil.getPage(query, ReportVO.class);
+ query.setUnitId(SecurityUtils.getUnitId());
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));
@@ -310,6 +313,7 @@
public List<ReportVO> export(ReportQuery query) {
IPage<ReportVO> page = PageUtil.getPage(query, ReportVO.class);
page.setSize(-1);
+ query.setUnitId(SecurityUtils.getUnitId());
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));
--
Gitblit v1.8.0