From c85587b70fbc32eea457040630e9d9e0982d74f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EA=B0=95=EC=84=9D?= <cks0504_p@daum.net>
Date: Wed, 6 Sep 2023 12:01:52 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B8=EC=82=AC=EC=8B=9C=EC=8A=A4=ED=85=9C?=
 =?UTF-8?q?=20=EC=A0=95=EB=B3=B4=20=EC=97=B0=EB=8F=99=20=EC=8B=9C=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=83=9D=EC=84=B1=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/codeMgt/service/CodeMgtService.java  | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java b/src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java
index 797c9617..8c884151 100644
--- a/src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java
+++ b/src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java
@@ -99,22 +99,16 @@ public class CodeMgtService{
   public String searchCodeToCategoryAndValue(String categoryCd, String value){
     CodeMgt code = codeMgtRepository.findByCategoryCdAndItemValue(categoryCd, value).orElse(null);
     if(code==null){
-      List<CodeMgt> codeList = codeMgtRepository.findByCategoryCdOrderByItemCdAsc(categoryCd);
-      Integer codeNum = 1;
-      String itemCd="";
-      for(CodeMgt savedCode : codeList){
-        if(!savedCode.getItemValue().equals("기타") && !savedCode.getItemValue().equals("직접입력")){
-          codeNum = Integer.parseInt(savedCode.getItemCd().replace(categoryCd, ""));
-        }
-        if(codeNum==1){
-          itemCd = savedCode.getItemCd().replace(categoryCd, "").replace("1", "");
-        }
+      CodeMgt lastCode = codeMgtRepository.findTop1ByCategoryCdOrderByItemCdDesc(categoryCd).orElse(null);
+      String lastCodeSeq = "1";
+      if(lastCode!=null){
+        lastCodeSeq = lastCode.getItemCd().replace(lastCode.getCategoryCd(), "");
       }
-      codeNum++;
-      itemCd = categoryCd+(itemCd.substring((int)Math.log10((double)codeNum)))+codeNum;
+      String tempItemCd = "000" + (Integer.parseInt(lastCodeSeq)+1);
+
       CodeMgt newCode = new CodeMgt();
       newCode.setCategoryCd(categoryCd);
-      newCode.setItemCd(itemCd);
+      newCode.setItemCd(categoryCd+(tempItemCd.substring(tempItemCd.length() - 3)));
       newCode.setItemValue(value);
       newCode.setUseChk("T");
       codeMgtRepository.save(newCode);