From 364adbc9a93a396b74e154f910c2a0a72bfb1a0f Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 29 十一月 2025 22:10:41 +0800
Subject: [PATCH] feat: 更新车辆里程统计
---
ruoyi-system/src/main/java/com/ruoyi/system/utils/TaskCodeGenerator.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/utils/TaskCodeGenerator.java b/ruoyi-system/src/main/java/com/ruoyi/system/utils/TaskCodeGenerator.java
index 22c5c72..46b9d27 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/utils/TaskCodeGenerator.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/utils/TaskCodeGenerator.java
@@ -19,36 +19,55 @@
private SysTaskMapper sysTaskMapper;
/**
- * 鐢熸垚浠诲姟缂栧彿
- * 鏍煎紡锛歍ASK + YYYYMMDD + 4浣嶅簭鍙�
+ * 鐢熸垚浠诲姟缂栧彿锛堜娇鐢ㄩ粯璁ゅ墠缂�锛�
+ * 鏍煎紡锛歍 + YYYYMMDD + 4浣嶅簭鍙�
*
* @return 浠诲姟缂栧彿
+ * @deprecated 寤鸿浣跨敤 {@link #generateTaskCode(String)} 鎸囧畾鍗曟嵁绫诲瀷鍓嶇紑
*/
+ @Deprecated
public String generateTaskCode() {
+ return generateTaskCode("T");
+ }
+
+ /**
+ * 鐢熸垚浠诲姟缂栧彿
+ * 鏍煎紡锛氬崟鎹被鍨嬪墠缂� + YYYYMMDD + 4浣嶅簭鍙�
+ *
+ * @param serviceOrdClass 鍗曟嵁绫诲瀷锛堝锛欱F銆丣Z绛夛級
+ * @return 浠诲姟缂栧彿
+ */
+ public String generateTaskCode(String serviceOrdClass) {
String dateStr = DateUtils.dateTimeNow("yyyyMMdd");
- return generateTaskCode(dateStr);
+ return generateTaskCode(serviceOrdClass, dateStr);
}
/**
* 鏍规嵁鏃ユ湡鐢熸垚浠诲姟缂栧彿
*
+ * @param serviceOrdClass 鍗曟嵁绫诲瀷锛堝锛欱F銆丣Z绛夛級
* @param date 鏃ユ湡
* @return 浠诲姟缂栧彿
*/
- public String generateTaskCode(Date date) {
+ public String generateTaskCode(String serviceOrdClass, Date date) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
String dateStr = sdf.format(date);
- return generateTaskCode(dateStr);
+ return generateTaskCode(serviceOrdClass, dateStr);
}
/**
* 鏍规嵁鏃ユ湡瀛楃涓茬敓鎴愪换鍔＄紪鍙�
*
+ * @param serviceOrdClass 鍗曟嵁绫诲瀷锛堝锛欱F銆丣Z绛夛級
* @param dateStr 鏃ユ湡瀛楃涓诧紙鏍煎紡锛歽yyyMMdd锛�
* @return 浠诲姟缂栧彿
*/
- private String generateTaskCode(String dateStr) {
- String datePrefix = "TASK" + dateStr;
+ private String generateTaskCode(String serviceOrdClass, String dateStr) {
+ // 纭繚鍗曟嵁绫诲瀷鍓嶇紑涓嶄负绌猴紝榛樿浣跨敤"T"
+ String prefix = (serviceOrdClass != null && !serviceOrdClass.trim().isEmpty())
+ ? serviceOrdClass.trim() : "T";
+
+ String datePrefix = prefix + dateStr;
// 鏌ヨ褰撴棩鏈�澶х紪鍙�
String maxTaskCode = sysTaskMapper.selectMaxTaskCodeByDatePrefix(datePrefix);
--
Gitblit v1.9.1