From cb814d18b56ac6f6221badd4ecb76fd6419826fe Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 11 Nov 2024 16:06:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E6=8E=A5=E5=8F=A3=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/biz/constant/GlobalConstants.java    |  4 ----
 .../common/biz/constant/MaterialConstants.java  |  3 +++
 .../impl/BmAgreementInfoServiceImpl.java        | 17 ++++++-----------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/GlobalConstants.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/GlobalConstants.java
index 810b4402..f2959eaa 100644
--- a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/GlobalConstants.java
+++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/GlobalConstants.java
@@ -548,8 +548,4 @@ public class GlobalConstants {
      */
     public static final Long LONG_65535 = 65535L;
 
-    public static final int NUM_9 = 9;
-    public static final int NUM_100 = 100;
-    public static final int NUM_99 = 99;
-    public static final int NUM_1000 = 1000;
 }
diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java
index 5b5f56e5..1ef8bd03 100644
--- a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java
+++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/MaterialConstants.java
@@ -49,4 +49,7 @@ public class MaterialConstants {
      */
     public static final Integer TEN_CONSTANT = 10;
 
+    /** 协议号的开头字母 */
+    public static final String AGREEMENT_PREFIX = "XY";
+
 }
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmAgreementInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmAgreementInfoServiceImpl.java
index 45e61c7a..efa603ef 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmAgreementInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmAgreementInfoServiceImpl.java
@@ -3,8 +3,7 @@ package com.bonus.material.basic.service.impl;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
-
-import com.bonus.common.biz.constant.GlobalConstants;
+import com.bonus.common.biz.constant.MaterialConstants;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.core.web.domain.AjaxResult;
@@ -82,17 +81,13 @@ public class BmAgreementInfoServiceImpl implements IBmAgreementInfoService
         String result = format.replace("-", "");
         int num = bmAgreementInfoMapper.selectNumByMonth(nowDate);
         num = num + 1;
-        String code = "";
-        if (num > GlobalConstants.NUM_9 && num < GlobalConstants.NUM_100) {
-            code = "XY" + result + "-00" + num;
-        } else if (num > GlobalConstants.NUM_99 && num < GlobalConstants.NUM_1000) {
-            code = "XY" + result + "-0" + num;
-        } else {
-            code = "XY" + result + "-000" + num;
-        }
-        return code;
+        return MaterialConstants.AGREEMENT_PREFIX + result + String.format("-%05d", num);
     }
 
+//    public static void main(String[] args) {
+//        System.out.println(String.format("-%05d", 555));
+//    }
+
     /**
      * 修改协议管理
      *