From 66990e9be43f71b89aa42065d696b682d803afa6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 25 三月 2025 10:07:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java b/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
index 62a181b..d539429 100644
--- a/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
+++ b/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
@@ -1,7 +1,6 @@
package com.yuanchu.mom.utils;
import com.yuanchu.mom.mapper.SystemLogMapper;
-import lombok.Builder;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -14,14 +13,26 @@
@Resource
private SystemLogMapper systemLogMapper;
- public String giveCode(String code, String tableName, String symbol, String patten){
+ public String giveCode(String code, String tableName, String symbol, String patten) {
String date = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
String date2 = LocalDate.now().format(DateTimeFormatter.ofPattern(patten));
- int num = systemLogMapper.countRowsByNow(tableName, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + 1;
+ int num;
+ num = systemLogMapper.countRowsByNow(tableName, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + 1;
String nums = num + "";
- if(nums.length() == 1) nums = "00" + num;
- else if(nums.length() == 2) nums = "0" + num;
- return code + (date2==null?date:date2) + symbol + nums;
+ if (nums.length() == 1) nums = "00" + num;
+ else if (nums.length() == 2) nums = "0" + num;
+ return code + (date2 == null ? date : date2) + symbol + nums;
}
+ //妫�楠屽崟濮旀墭鍗曞彿鐨勭敓鎴愯鍒�
+ public String giveCode2(String code, String tableName, String symbol, String patten) {
+ String date = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+ String date2 = LocalDate.now().format(DateTimeFormatter.ofPattern(patten));
+ int num;
+ num = systemLogMapper.countRowsByNow2(tableName, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + 1;
+ String nums = num + "";
+ if (nums.length() == 1) nums = "00" + num;
+ else if (nums.length() == 2) nums = "0" + num;
+ return code + (date2 == null ? date : date2) + symbol + nums;
+ }
}
--
Gitblit v1.9.3