From 633b96bb1ced95e60df5e28249ce51b6ffe82d27 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 24 八月 2024 17:37:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 8 ++++----
1 files changed, 4 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 1f80460..2ccf8e2 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
@@ -69,7 +69,7 @@
entity.setSerialNumber(form.getPointId());
entity.setErrorType(String.join(",", form.getErrorType()));
entity.setStatus(0);
- entity.setIdentify(IdUtils.timeAddRandomNO(3));
+ entity.setIdentify(IdUtils.randomNO());
Date now = new Date();
entity.setCreateTime(now);
entity.setUpdateTime(now);
@@ -108,15 +108,15 @@
entity.setImportBatchNumber(String.valueOf(l));
entity.setSerialNumber(item.getSerialNumber());
entity.setStatus(0);
- entity.setIdentify(IdUtils.timeAddRandomNO(3));
+ entity.setIdentify(IdUtils.randomNO());
entity.setCreateTime(DateUtils.getNowDate());
entity.setUpdateTime(DateUtils.getNowDate());
reports.add(entity);
});
if (saveBatch(reports)) {
- return Result.ok("瀵煎叆鎴愬姛");
+ return Result.ok("鎴愬姛瀵煎叆" + list.size() + "鏉℃暟鎹�");
}
- return Result.error("娣诲姞澶辫触");
+ return Result.error("瀵煎叆澶辫触");
}
/**
--
Gitblit v1.8.0