From f4d6d9d7ae1d0f1af6937dd7a2761056e46611c2 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 13 四月 2026 16:14:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/common/utils/OrderUtils.java | 49 +++++++++++++++++++++++++++++--------------------
1 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/OrderUtils.java b/src/main/java/com/ruoyi/common/utils/OrderUtils.java
index 7bb9aba..476e207 100644
--- a/src/main/java/com/ruoyi/common/utils/OrderUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/OrderUtils.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.ruoyi.common.utils.uuid.UUID;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Component;
@@ -72,32 +73,40 @@
* @param mapper 瀹炰綋绫诲搴旂殑BaseMapper
* @param <T> 瀹炰綋绫绘硾鍨�
* @return 褰撳ぉ璁板綍鏁伴噺
+ * code 琛ㄧ紪鐮佸瓧娈�
*/
- public static <T> String countTodayByCreateTime(BaseMapper<T> mapper,String preFix) {
- // 鑾峰彇褰撳ぉ寮�濮嬫椂闂达紙00:00:00锛�
- LocalDateTime todayStart = LocalDateTime.of(
- LocalDateTime.now().toLocalDate(),
- LocalTime.MIN
- );
- // 鑾峰彇褰撳ぉ缁撴潫鏃堕棿锛�23:59:59.999锛�
- LocalDateTime todayEnd = LocalDateTime.of(
- LocalDateTime.now().toLocalDate(),
- LocalTime.MAX
- );
+ public static <T> String countTodayByCreateTime(BaseMapper<T> mapper,String preFix,String code) {
+ // 1. 褰撳ぉ鏃堕棿鑼冨洿
+ LocalDateTime todayStart = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
+ LocalDateTime todayEnd = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
- // 杞崲涓篋ate绫诲瀷锛堝鏋滃疄浣撶被涓璫reateTime鏄疞ocalDateTime鍙洿鎺ヤ娇鐢級
Date startDate = Date.from(todayStart.atZone(ZoneId.systemDefault()).toInstant());
Date endDate = Date.from(todayEnd.atZone(ZoneId.systemDefault()).toInstant());
- // 鏋勫缓鏌ヨ鏉′欢
- QueryWrapper<T> queryWrapper = new QueryWrapper<>();
- queryWrapper.ge("create_time", startDate) // 澶т簬绛変簬褰撳ぉ寮�濮�
- .lt("create_time", endDate); // 灏忎簬褰撳ぉ缁撴潫锛堥伩鍏嶆绉掔簿搴﹂棶棰橈級
+ // 2. 鏃ユ湡瀛楃涓� yyyyMMdd
+ String dateStr = LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE);
- // 鎵ц鏌ヨ
- Long aLong = mapper.selectCount(queryWrapper);
- // 鎷兼帴璁㈠崟缂栧彿 preFix + 鏃堕棿锛坹yyyMMdd锛� + 璁㈠崟鏁伴噺(001)
- return preFix + LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE).replaceAll("-", "") + String.format("%03d", (aLong + 1)) + "-" + new Date().getTime();
+ // 4. 鏌ヨ浠婂ぉ鏈�鍚庝竴鏉＄紪鍙凤紙鎸夋椂闂村�掑簭锛屽彇鏈�鏂颁竴鏉★級
+ QueryWrapper<T> wrapper = new QueryWrapper<>();
+ wrapper.ge("create_time", startDate)
+ .lt("create_time", endDate)
+ .orderByDesc("create_time")
+ .last("LIMIT 1");
+
+ // 杩欓噷蹇呴』鐢� selectMaps 鎴� selectMap锛屼笉瑕佺敤 selectOne锛岄伩鍏嶅疄浣撶被闂
+ Map<String, Object> result = (Map<String, Object>) mapper.selectOne(wrapper);
+
+ long nextSeq = 1;
+ if (result != null && result.get(code) != null) {
+ String fullCode = result.get(code).toString(); // 渚嬪锛欰BC20250122005
+
+ // 鉁� 鍏抽敭锛氭埅鍙栨渶鍚� 3 浣嶅簭鍙�
+ String seqStr = fullCode.substring(fullCode.length() - 3);
+ nextSeq = Long.parseLong(seqStr) + 1;
+ }
+
+ // 5. 鐢熸垚缂栧彿
+ return preFix + dateStr + String.format("%03d", nextSeq);
}
--
Gitblit v1.9.3