From 8ebf5bc4bf1cc2b70b6aa9dc295eaa9d86c95245 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 02 七月 2024 13:17:26 +0800
Subject: [PATCH] 委托编号生成规则修改+用户默认密码更改+温度循环项目新增逻辑+检验任务模版切换
---
framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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 0b4faff..d78b34b 100644
--- a/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
+++ b/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
@@ -13,19 +13,31 @@
@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;
- if (tableName.equals("ins_order")){
+ 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;
+ } 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;
}
}
--
Gitblit v1.9.3