From 22d3a8dc4185c5461bee9e42a9f4a2775ff448e6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 10 九月 2024 17:28:17 +0800
Subject: [PATCH] 报告更改+再次试验
---
framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 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 4f60117..cc724a9 100644
--- a/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
+++ b/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
@@ -13,14 +13,45 @@
@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;
+ 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;
+ }
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, Long companyId, String laboratory, 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-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;
+ }
+
+ //妫�楠屽崟鐢熸垚澶栭儴濮旀墭缂栧彿鐨勮鍒�
+ public String giveCode3(String code, Long companyId, String laboratory, 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.countRowsByNow4(tableName, companyId, laboratory, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"))) + 1;
+ String nums = num + "";
+ if (nums.length() == 1) nums = "0000" + num;
+ else if (nums.length() == 2) nums = "000" + num;
+ else if (nums.length() == 3) nums = "00" + num;
+ else if (nums.length() == 4) nums = "0" + num;
+ return code + (date2 == null ? date : date2) + symbol + nums;
}
}
--
Gitblit v1.9.3