From 48c6db93631b1916f9bb0f70f82fda2b50ecdc43 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 25 四月 2026 11:25:09 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/common/utils/OrderUtils.java | 99 +++++++++++++++++++++----------------------------
1 files changed, 43 insertions(+), 56 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/OrderUtils.java b/src/main/java/com/ruoyi/common/utils/OrderUtils.java
index 476e207..a110ec9 100644
--- a/src/main/java/com/ruoyi/common/utils/OrderUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/OrderUtils.java
@@ -2,10 +2,6 @@
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;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -13,7 +9,6 @@
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;
@@ -25,90 +20,88 @@
/**
* List<Integer> 杞崲涓� Long[] 鏁扮粍
- * @param ids
- * @return
+ * @param ids ids
+ * @return Long[]
*/
public static Long[] listIntegerToLongArray(List<Integer> ids) {
return ids.stream()
- // 澶勭悊null鍊硷細濡傛灉鍏冪礌涓簄ull锛岃浆鎹负0L锛堝彲鏍规嵁涓氬姟璋冩暣锛屾瘮濡傛姏寮傚父锛�
.map(id -> id != null ? id.longValue() : -1L)
- // 灏哠tream<Long>杞崲涓篖ong[]鏁扮粍
.toArray(Long[]::new);
}
/**
* 鍒ゆ柇鐩爣id鏄惁鍦ㄩ�楀彿鍒嗛殧鐨勫瓧绗︿覆涓�
- * @param targetId
- * @param str
- * @return
+ * @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(",");
- // 閬嶅巻鏁扮粍鍒ゆ柇鏄惁鍖呭惈鐩爣id
for (String id : idArray) {
- // 鍘婚櫎绌烘牸锛堥槻姝㈠瓧绗︿覆涓湁澶氫綑绌烘牸锛屽"1, 121"锛�
String cleanId = id.trim();
- // 杞崲涓烘暟瀛楀苟姣旇緝
try {
if (cleanId.equals(String.valueOf(targetId))) {
return true;
}
} catch (NumberFormatException e) {
- // 鑻ュ瓨鍦ㄩ潪鏁板瓧ID锛岀洿鎺ヨ繑鍥瀎alse
return false;
}
}
return false;
}
-
-
/**
- * 鏌ヨ褰撳ぉ锛堝熀浜巆reateTime瀛楁锛夌殑璁板綍鏁伴噺
- * @param mapper 瀹炰綋绫诲搴旂殑BaseMapper
- * @param <T> 瀹炰綋绫绘硾鍨�
- * @return 褰撳ぉ璁板綍鏁伴噺
- * code 琛ㄧ紪鐮佸瓧娈�
+ * 鏌ヨ褰撳ぉ鍩轰簬 create_time 鐨勬渶鏂扮紪鍙凤紝骞剁敓鎴愪笅涓�涓紪鍙�
+ * @param mapper mapper
+ * @param preFix 缂栧彿鍓嶇紑
+ * @param code 缂栧彿瀛楁
+ * @param <T> 瀹炰綋绫诲瀷
+ * @return 璁㈠崟缂栧彿
*/
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);
+ 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;
- Date startDate = Date.from(todayStart.atZone(ZoneId.systemDefault()).toInstant());
- Date endDate = Date.from(todayEnd.atZone(ZoneId.systemDefault()).toInstant());
-
- // 2. 鏃ユ湡瀛楃涓� yyyyMMdd
- String dateStr = LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE);
-
- // 4. 鏌ヨ浠婂ぉ鏈�鍚庝竴鏉＄紪鍙凤紙鎸夋椂闂村�掑簭锛屽彇鏈�鏂颁竴鏉★級
QueryWrapper<T> wrapper = new QueryWrapper<>();
- wrapper.ge("create_time", startDate)
- .lt("create_time", endDate)
- .orderByDesc("create_time")
+ wrapper.select(code)
+ .ge("create_time", todayStart)
+ .lt("create_time", tomorrowStart)
+ .likeRight(code, codePrefix)
+ .orderByDesc(code)
.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;
+ 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;
+ }
}
- // 5. 鐢熸垚缂栧彿
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瀛楁锛夌殑璁板綍鏁伴噺
@@ -117,29 +110,23 @@
* @return 褰撳ぉ璁板綍鏁伴噺
*/
public static <T> String countAfterServiceTodayByCreateTime(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
);
- // 杞崲涓篋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));
}
}
--
Gitblit v1.9.3