From 1fe60de0b826d028c5798de86ec055be45684220 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 六月 2024 09:48:03 +0800
Subject: [PATCH] 委托编号格式变更+下单查询检验项目+报告的设备日期+检验下单的样品数量不准确+检验的检验进度计算

---
 framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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..4f60117 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,14 @@
     @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"));
+        String date2 = LocalDate.now().format(DateTimeFormatter.ofPattern(patten));
         int 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;
+        return code + (date2==null?date:date2) + symbol + nums;
     }
 
 }

--
Gitblit v1.9.3