From 1f15333b0a97a327865f7aab8f1e3f9ba8fc16f8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 18 十月 2024 12:45:59 +0800
Subject: [PATCH] 电路站点报告调试+总报告ing

---
 framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java |   11 +++--------
 1 files changed, 3 insertions(+), 8 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 c5ee8ce..d539429 100644
--- a/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
+++ b/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
@@ -17,11 +17,7 @@
         String date = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
         String date2 = LocalDate.now().format(DateTimeFormatter.ofPattern(patten));
         int num;
-        if (tableName.equals("ins_order")) {
-            num = systemLogMapper.countRowsByNow2(tableName, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + 1;
-        } else {
-            num = systemLogMapper.countRowsByNow(tableName, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + 1;
-        }
+        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;
@@ -29,15 +25,14 @@
     }
 
     //妫�楠屽崟濮旀墭鍗曞彿鐨勭敓鎴愯鍒�
-    public String giveCode2(String code, Long companyId, String laboratory, String tableName, String symbol, String patten) {
+    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.countRowsByNow3(tableName, companyId, laboratory, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"))) + 1;
+        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