From fa3428b4bb32179a42d5618357c22fe2695716ae Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 22 四月 2026 13:58:23 +0800
Subject: [PATCH] 修改全局的注入方式
---
src/main/java/com/ruoyi/common/utils/OrderUtils.java | 103 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 90 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/OrderUtils.java b/src/main/java/com/ruoyi/common/utils/OrderUtils.java
index 42c154d..a110ec9 100644
--- a/src/main/java/com/ruoyi/common/utils/OrderUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/OrderUtils.java
@@ -2,8 +2,6 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.poi.ss.formula.functions.T;
-import org.springframework.stereotype.Component;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -11,7 +9,7 @@
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.Date;
-import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -20,6 +18,90 @@
*/
public class OrderUtils {
+ /**
+ * List<Integer> 杞崲涓� Long[] 鏁扮粍
+ * @param ids ids
+ * @return Long[]
+ */
+ public static Long[] listIntegerToLongArray(List<Integer> ids) {
+ return ids.stream()
+ .map(id -> id != null ? id.longValue() : -1L)
+ .toArray(Long[]::new);
+ }
+
+ /**
+ * 鍒ゆ柇鐩爣id鏄惁鍦ㄩ�楀彿鍒嗛殧鐨勫瓧绗︿覆涓�
+ * @param targetId targetId
+ * @param str source
+ * @return boolean
+ */
+ public boolean isStaffIdExist(Object targetId,String str) {
+ if (str == null || str.trim().isEmpty() || targetId == null) {
+ return false;
+ }
+ String[] idArray = str.split(",");
+ for (String id : idArray) {
+ String cleanId = id.trim();
+ try {
+ if (cleanId.equals(String.valueOf(targetId))) {
+ return true;
+ }
+ } catch (NumberFormatException e) {
+ return false;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 鏌ヨ褰撳ぉ鍩轰簬 create_time 鐨勬渶鏂扮紪鍙凤紝骞剁敓鎴愪笅涓�涓紪鍙�
+ * @param mapper mapper
+ * @param preFix 缂栧彿鍓嶇紑
+ * @param code 缂栧彿瀛楁
+ * @param <T> 瀹炰綋绫诲瀷
+ * @return 璁㈠崟缂栧彿
+ */
+ public static <T> String countTodayByCreateTime(BaseMapper<T> mapper,String preFix,String code) {
+ LocalDate today = LocalDate.now();
+ LocalDateTime todayStart = today.atStartOfDay();
+ LocalDateTime tomorrowStart = today.plusDays(1).atStartOfDay();
+ String dateStr = today.format(DateTimeFormatter.BASIC_ISO_DATE);
+ String codePrefix = preFix + dateStr;
+
+ QueryWrapper<T> wrapper = new QueryWrapper<>();
+ wrapper.select(code)
+ .ge("create_time", todayStart)
+ .lt("create_time", tomorrowStart)
+ .likeRight(code, codePrefix)
+ .orderByDesc(code)
+ .last("LIMIT 1");
+
+ long nextSeq = 1;
+ List<Map<String, Object>> records = mapper.selectMaps(wrapper);
+ if (!records.isEmpty()) {
+ Object lastCode = records.get(0).get(code);
+ if (lastCode != null) {
+ nextSeq = extractSequence(lastCode.toString(), codePrefix) + 1;
+ }
+ }
+
+ return preFix + dateStr + String.format("%03d", nextSeq);
+ }
+
+ private static long extractSequence(String fullCode, String codePrefix) {
+ if (!fullCode.startsWith(codePrefix)) {
+ return 0;
+ }
+ String seqStr = fullCode.substring(codePrefix.length()).trim();
+ if (seqStr.isEmpty()) {
+ return 0;
+ }
+ try {
+ return Long.parseLong(seqStr);
+ } catch (NumberFormatException e) {
+ return 0;
+ }
+ }
/**
* 鏌ヨ褰撳ぉ锛堝熀浜巆reateTime瀛楁锛夌殑璁板綍鏁伴噺
@@ -27,29 +109,24 @@
* @param <T> 瀹炰綋绫绘硾鍨�
* @return 褰撳ぉ璁板綍鏁伴噺
*/
- public static <T> String countTodayByCreateTime(BaseMapper<T> mapper,String preFix) {
- // 鑾峰彇褰撳ぉ寮�濮嬫椂闂达紙00:00:00锛�
+ public static <T> String countAfterServiceTodayByCreateTime(BaseMapper<T> mapper,String preFix) {
LocalDateTime todayStart = LocalDateTime.of(
LocalDateTime.now().toLocalDate(),
LocalTime.MIN
);
- // 鑾峰彇褰撳ぉ缁撴潫鏃堕棿锛�23:59:59.999锛�
LocalDateTime todayEnd = LocalDateTime.of(
LocalDateTime.now().toLocalDate(),
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); // 灏忎簬褰撳ぉ缁撴潫锛堥伩鍏嶆绉掔簿搴﹂棶棰橈級
+ queryWrapper.ge("create_time", startDate)
+ .lt("create_time", endDate);
- // 鎵ц鏌ヨ
Long aLong = mapper.selectCount(queryWrapper);
- // 鎷兼帴璁㈠崟缂栧彿 preFix + 鏃堕棿锛坹yyyMMdd锛� + 璁㈠崟鏁伴噺(001)
- return preFix + LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE).replaceAll("-", "") + String.format("%03d", (aLong + 1));}
+ return preFix + LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE).replaceAll("-", "") + String.format("%03d", (aLong + 1));
+ }
}
--
Gitblit v1.9.3