From f8f64936d6181c326aa5b899d49e544c74e844ab Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 03:35:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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..62fb564 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
@@ -88,10 +88,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();
@@ -125,8 +125,9 @@
// 璇诲彇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 +147,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 +252,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 +311,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