From 087991c76f078defe5eb55d84223021b4199fb3d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 17 二月 2025 11:22:50 +0800
Subject: [PATCH] 设备模块修改bug

---
 framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 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 42448d5..d539429 100644
--- a/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
+++ b/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
@@ -13,13 +13,26 @@
     @Resource
     private SystemLogMapper systemLogMapper;
 
-    public String giveCode(String code, String tableName){
+    public String giveCode(String code, String tableName, String symbol, String patten) {
         String date = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
-        int num = systemLogMapper.countRowsByNow(tableName, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + 1;
+        String date2 = LocalDate.now().format(DateTimeFormatter.ofPattern(patten));
+        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 + date + "-" + 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