예산편성 수정중.

.gitignore

@@ -36,3 +36,5 @@ out/
 ### VS Code ###
 .vscode/
 .vs/
+src/main/resources/application-cks1.properties
+src/main/resources/application-cks2.properties

src/main/java/com/dbnt/faisp/main/budget/BudgetController.java

@@ -2,7 +2,7 @@ package com.dbnt.faisp.main.budget;
 
 import com.dbnt.faisp.main.budget.common.ResultResponseCode;
 import com.dbnt.faisp.main.budget.model.*;
-import com.dbnt.faisp.main.budget.repository.BudgetRepository.*;
+import com.dbnt.faisp.main.budget.model.result.*;
 import com.dbnt.faisp.main.budget.service.BudgetService;
 import com.dbnt.faisp.main.userInfo.model.UserInfo;
 import com.dbnt.faisp.main.userInfo.service.UserInfoService;
@@ -84,8 +84,7 @@ public class BudgetController {
   //예산편성 - 항목추가
   @PostMapping("/budgeting/code")
   public ResultResponse<?> insertBudgeting(@AuthenticationPrincipal UserInfo loginUser, BudgetDto.BudgetingInsertReqeust requestDto) {
-    budgetService.insertBudgetingList(loginUser, requestDto);
-    return new ResultResponse().successResponse(ResultResponseCode.SUCCESS);
+    return new ResultResponse(budgetService.insertBudgetingList(loginUser, requestDto));
   }
 
   //예산편성 - 항목변경

src/main/java/com/dbnt/faisp/main/budget/mapper/BudgetMapper.java

@@ -1,13 +1,10 @@
 package com.dbnt.faisp.main.budget.mapper;
 
-import com.dbnt.faisp.main.authMgt.model.AccessConfig;
-import com.dbnt.faisp.main.authMgt.model.ApprovalConfig;
 import com.dbnt.faisp.main.budget.model.*;
-import com.dbnt.faisp.main.budget.repository.BudgetRepository;
+import com.dbnt.faisp.main.budget.model.result.*;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
-import java.util.Map;
 
 @Mapper
 public interface BudgetMapper {

src/main/java/com/dbnt/faisp/main/budget/model/BudgetDto.java

@@ -1,6 +1,5 @@
 package com.dbnt.faisp.main.budget.model;
 
-import com.dbnt.faisp.config.BaseModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/dbnt/faisp/main/budget/model/TblBudgetCodeL1.java

@@ -0,0 +1,47 @@
+package com.dbnt.faisp.main.budget.model;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "tbl_budget_code_l1")
+public class TblBudgetCodeL1 {
+
+  @Id
+  @Column(name = "l1_code")
+  private String l1Code;
+  @Column(name = "l1_name")
+  private String l1Name;
+  @Column(name = "l1_year")
+  private String l1Year;
+  @Column(name = "use_tag")
+  private String useTag;
+  @Column(name = "seq_ord")
+  private Integer seqOrd;
+  @Column(name = "remark")
+  private String remark;
+  @Column(name = "modi_date")
+  private LocalDateTime modiDate;
+
+  public void setData(String l1Code, String l1Name, String l1Year, String useTag, Integer seqOrd, String remark, LocalDateTime modiDate){
+    this.l1Code = l1Code;
+    this.l1Name = l1Name;
+    this.l1Year = l1Year;
+    this.useTag = useTag;
+    this.seqOrd = seqOrd;
+    this.remark = remark;
+    this.modiDate = modiDate;
+  }
+
+}

src/main/java/com/dbnt/faisp/main/budget/model/TblBudgetCodeL2.java

@@ -0,0 +1,50 @@
+package com.dbnt.faisp.main.budget.model;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "tbl_budget_code_l2")
+public class TblBudgetCodeL2 {
+
+  @Id
+  @Column(name = "l2_code")
+  private String l2Code;
+  @Column(name = "l2_name")
+  private String l2Name;
+  @Column(name = "l1_code")
+  private String l1Code;
+  @Column(name = "use_tag")
+  private String useTag;
+  @Column(name = "seq_ord")
+  private Integer seqOrd;
+  @Column(name = "remark")
+  private String remark;
+  @Column(name = "modi_date")
+  private LocalDateTime modiDate;
+
+
+  public void setData(String l2Code, String l2Name, String l1Code, String useTag, Integer seqOrd, String remark, LocalDateTime modiDate){
+    this.l2Code = l2Code;
+    this.l2Name = l2Name;
+    this.l1Code = l1Code;
+    this.useTag = useTag;
+    this.seqOrd = seqOrd;
+    this.remark = remark;
+    this.modiDate = modiDate;
+  }
+}

src/main/java/com/dbnt/faisp/main/budget/model/TblBudgetCodeL3.java

@@ -0,0 +1,49 @@
+package com.dbnt.faisp.main.budget.model;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "tbl_budget_code_l3")
+public class TblBudgetCodeL3 {
+
+  @Id
+  @Column(name = "l3_code")
+  private String l3Code;
+  @Column(name = "l3_name")
+  private String l3Name;
+  @Column(name = "l2_code")
+  private String l2Code;
+  @Column(name = "use_tag")
+  private String useTag;
+  @Column(name = "seq_ord")
+  private Integer seqOrd;
+  @Column(name = "remark")
+  private String remark;
+  @Column(name = "modi_date")
+  private LocalDateTime modiDate;
+
+  public void setData(String l3Code, String l3Name, String l2Code, String useTag, Integer seqOrd, String remark, LocalDateTime modiDate){
+    this.l3Code = l3Code;
+    this.l3Name = l3Name;
+    this.l2Code = l2Code;
+    this.useTag = useTag;
+    this.seqOrd = seqOrd;
+    this.remark = remark;
+    this.modiDate = modiDate;
+  }
+}

src/main/java/com/dbnt/faisp/main/budget/model/TblBudgetHistory.java

@@ -0,0 +1,50 @@
+package com.dbnt.faisp.main.budget.model;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "tbl_budget_history")
+public class TblBudgetHistory {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "seq")
+  private Integer seq;
+  @Column(name = "budget_code")
+  private String budgetCode;
+  @Column(name = "org_code")
+  private String orgCode;
+  @Column(name = "update_title")
+  private String updateTitle;
+  @Column(name = "old_amount")
+  private Integer oldAmount;
+  @Column(name = "new_amount")
+  private Integer newAmonut;
+  @Column(name = "modi_id")
+  private String modiId;
+  @Column(name = "modi_date")
+  private LocalDateTime modiDate;
+
+  public void setData(String budgetCode, String orgCode, String updateTitle, Integer oldAmount, Integer newAmonut, String modiId, LocalDateTime modiDate){
+    this.budgetCode = budgetCode;
+    this.orgCode = orgCode;
+    this.updateTitle = updateTitle;
+    this.oldAmount = oldAmount;
+    this.newAmonut = newAmonut;
+    this.modiId = modiId;
+    this.modiDate = modiDate;
+  }
+
+}

src/main/java/com/dbnt/faisp/main/budget/model/TblBudgetPlan.java

@@ -0,0 +1,47 @@
+package com.dbnt.faisp.main.budget.model;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "tbl_budget_plan")
+public class TblBudgetPlan {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "seq")
+  private Integer seq;
+  @Column(name = "budget_code")
+  private String budgetCode;
+  @Column(name = "org_code")
+  private String orgCode;
+  @Column(name = "amount")
+  private Integer amount;
+  @Column(name = "remark")
+  private String remark;
+  @Column(name = "modi_id")
+  private String modiId;
+  @Column(name = "modi_date")
+  private LocalDateTime modiDate;
+
+  public void setData(String budgetCode, String orgCode, Integer amount, String remark, String modiId, LocalDateTime modiDate){
+    this.budgetCode = budgetCode;
+    this.orgCode = orgCode;
+    this.amount = amount;
+    this.remark = remark;
+    this.modiId = modiId;
+    this.modiDate = modiDate;
+  }
+
+}

src/main/java/com/dbnt/faisp/main/budget/model/result/AssignResult.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.main.budget.model;
+package com.dbnt.faisp.main.budget.model.result;
 
 import lombok.Getter;
 

src/main/java/com/dbnt/faisp/main/budget/model/result/CodeResult.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.main.budget.model;
+package com.dbnt.faisp.main.budget.model.result;
 
 import lombok.Getter;
 

src/main/java/com/dbnt/faisp/main/budget/model/result/ExpenseInfoResult.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.main.budget.model;
+package com.dbnt.faisp.main.budget.model.result;
 
 import lombok.Getter;
 

src/main/java/com/dbnt/faisp/main/budget/model/result/ExpenseResult.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.main.budget.model;
+package com.dbnt.faisp.main.budget.model.result;
 
 import lombok.Getter;
 

src/main/java/com/dbnt/faisp/main/budget/model/result/L3CodeResult.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.main.budget.model;
+package com.dbnt.faisp.main.budget.model.result;
 
 import lombok.Getter;
 

src/main/java/com/dbnt/faisp/main/budget/model/result/ResultResponse.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.main.budget.model;
+package com.dbnt.faisp.main.budget.model.result;
 
 import com.dbnt.faisp.main.budget.common.ResultResponseCode;
 import lombok.AllArgsConstructor;

src/main/java/com/dbnt/faisp/main/budget/model/result/StatsItemResult.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.main.budget.model;
+package com.dbnt.faisp.main.budget.model.result;
 
 import lombok.Getter;
 

src/main/java/com/dbnt/faisp/main/budget/model/result/UpdateResult.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.main.budget.model;
+package com.dbnt.faisp.main.budget.model.result;
 
 import lombok.Getter;
 

src/main/java/com/dbnt/faisp/main/budget/model/result/YearResult.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.main.budget.model;
+package com.dbnt.faisp.main.budget.model.result;
 
 import lombok.Getter;
 

src/main/java/com/dbnt/faisp/main/budget/repository/BudgetRepository.java

@@ -1,6 +1,7 @@
 package com.dbnt.faisp.main.budget.repository;
 
 import com.dbnt.faisp.main.budget.model.*;
+import com.dbnt.faisp.main.budget.model.result.*;
 import com.dbnt.faisp.main.codeMgt.model.CodeCatg;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;

src/main/java/com/dbnt/faisp/main/budget/repository/TblBudgetCodeL1Repository.java

@@ -0,0 +1,11 @@
+package com.dbnt.faisp.main.budget.repository;
+
+import com.dbnt.faisp.main.budget.model.TblBudgetCodeL1;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+
+public interface TblBudgetCodeL1Repository extends JpaRepository<TblBudgetCodeL1, String> {
+  Optional<TblBudgetCodeL1> findByL1NameAndL1YearAndUseTag(String l1Name, String l1Year, String useTag);
+  Optional<TblBudgetCodeL1> findTop1ByL1YearAndUseTagOrderByL1CodeDesc(String l1Year, String useTag);
+}

src/main/java/com/dbnt/faisp/main/budget/repository/TblBudgetCodeL2Repository.java

@@ -0,0 +1,12 @@
+package com.dbnt.faisp.main.budget.repository;
+
+import com.dbnt.faisp.main.budget.model.TblBudgetCodeL2;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+
+public interface TblBudgetCodeL2Repository extends JpaRepository<TblBudgetCodeL2, String> {
+  Optional<TblBudgetCodeL2> findByL2NameAndL1CodeAndUseTag(String codeL2Name, String l1Code, String y);
+
+  Optional<TblBudgetCodeL2> findTop1ByL1CodeAndUseTagOrderByL2CodeDesc(String l1Code, String useTag);
+}

src/main/java/com/dbnt/faisp/main/budget/repository/TblBudgetCodeL3Repository.java

@@ -0,0 +1,12 @@
+package com.dbnt.faisp.main.budget.repository;
+
+import com.dbnt.faisp.main.budget.model.TblBudgetCodeL3;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+
+public interface TblBudgetCodeL3Repository extends JpaRepository<TblBudgetCodeL3, String> {
+  Optional<TblBudgetCodeL3> findByL3NameAndL2CodeAndUseTag(String codeL3Name, String l2Code, String y);
+
+  Optional<TblBudgetCodeL3> findTop1ByL2CodeAndUseTagOrderByL3CodeDesc(String l2Code, String y);
+}

src/main/java/com/dbnt/faisp/main/budget/repository/TblBudgetHistoryRepository.java

@@ -0,0 +1,8 @@
+package com.dbnt.faisp.main.budget.repository;
+
+import com.dbnt.faisp.main.budget.model.TblBudgetHistory;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface TblBudgetHistoryRepository extends JpaRepository<TblBudgetHistory, Integer> {
+
+}

src/main/java/com/dbnt/faisp/main/budget/repository/TblBudgetPlanRepository.java

@@ -0,0 +1,9 @@
+package com.dbnt.faisp.main.budget.repository;
+
+import com.dbnt.faisp.main.budget.model.TblBudgetHistory;
+import com.dbnt.faisp.main.budget.model.TblBudgetPlan;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface TblBudgetPlanRepository extends JpaRepository<TblBudgetPlan, Integer> {
+
+}

src/main/java/com/dbnt/faisp/main/budget/service/BudgetService.java

@@ -5,9 +5,8 @@ import com.dbnt.faisp.main.budget.common.BaseException;
 import com.dbnt.faisp.main.budget.common.ResultResponseCode;
 import com.dbnt.faisp.main.budget.mapper.BudgetMapper;
 import com.dbnt.faisp.main.budget.model.*;
-import com.dbnt.faisp.main.budget.repository.BudgetRepository;
-import com.dbnt.faisp.main.budget.repository.BudgetRepository.*;
-import com.dbnt.faisp.main.equip.model.Equip;
+import com.dbnt.faisp.main.budget.model.result.*;
+import com.dbnt.faisp.main.budget.repository.*;
 import com.dbnt.faisp.main.userInfo.model.UserInfo;
 
 import lombok.RequiredArgsConstructor;
@@ -15,6 +14,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 
@@ -24,342 +24,392 @@ import java.util.*;
 @RequiredArgsConstructor
 public class BudgetService {
 
-    private final BudgetRepository budgetRepository;
-    private final BudgetMapper budgetMapper;
+  private final TblBudgetCodeL1Repository codeL1Repository;
+  private final TblBudgetCodeL2Repository codeL2Repository;
+  private final TblBudgetCodeL3Repository codeL3Repository;
+  private final TblBudgetHistoryRepository historyRepository;
+  private final TblBudgetPlanRepository planRepository;
+  private final BudgetRepository budgetRepository;
+  private final BudgetMapper budgetMapper;
 
-    public List<BudgetingList> selectBudgetingList(UserInfo loginUser, BudgetDto.BudgetingSearchReqeust requestDto){
+  public List<BudgetingList> selectBudgetingList(UserInfo loginUser, BudgetDto.BudgetingSearchReqeust requestDto){
 
-        /*return budgetRepository.callSpGetBudgetPlanInfo(requestDto.getYear(), "OG001", "admin");*/
-        BudgetParams param = new BudgetParams();
-        param.setCode1(requestDto.getYear());
-        param.setCode2("OG001");
-        param.setCode3("admin");
-        return budgetMapper.callSpGetBudgetPlanInfo(param);
-    }
+    /*return budgetRepository.callSpGetBudgetPlanInfo(requestDto.getYear(), "OG001", "admin");*/
+    BudgetParams param = new BudgetParams();
+    param.setCode1(requestDto.getYear());
+    param.setCode2("OG001");
+    param.setCode3("admin");
+    return budgetMapper.callSpGetBudgetPlanInfo(param);
+  }
 
-    public List<YearResult> selectBudgetingYearList(UserInfo loginUser){
+  public List<YearResult> selectBudgetingYearList(UserInfo loginUser){
 //        return  budgetRepository.callSpGetBudgetCodeYearList();
-        return budgetMapper.callSpGetBudgetCodeYearList();
-    }
+    return budgetMapper.callSpGetBudgetCodeYearList();
+  }
 
-    // 예산편성 - 연도추가(버튼)
-    @Transactional
-    public void copyYearBudgeting(UserInfo loginUser,  BudgetDto.BudgetingCopyReqeust requestDto){
+  // 예산편성 - 연도추가(버튼)
+  @Transactional
+  public void copyYearBudgeting(UserInfo loginUser,  BudgetDto.BudgetingCopyReqeust requestDto){
 //        System.out.println(requestDto.getYear());
 //        System.out.println(requestDto.getCopyYear());
 //        UpdateResult result = budgetRepository.callSpCopyBudgetItem(requestDto.getYear(), requestDto.getCopyYear(), loginUser.getUserId());
-        BudgetParams params = new BudgetParams();
-        params.setYear(requestDto.getYear());
-        params.setCopyYear(requestDto.getCopyYear());
-        params.setId(loginUser.getUserId());
-        UpdateResult result = budgetMapper.callSpCopyBudgetItem(params);
+    BudgetParams params = new BudgetParams();
+    params.setYear(requestDto.getYear());
+    params.setCopyYear(requestDto.getCopyYear());
+    params.setId(loginUser.getUserId());
+    UpdateResult result = budgetMapper.callSpCopyBudgetItem(params);
 
-        if(result.getResultCode().equals("100")) {
-            return;
-        } else {
+    if(result.getResultCode().equals("100")) {
+      return;
+    } else {
 //            System.out.println(result.getErrorMessage());
 //            System.out.println(result.getResultCode());
 //            System.out.println(result.getResultCount());
-            throw new BaseException(ResultResponseCode.FOUND_YEAR);
-        }
-
+      throw new BaseException(ResultResponseCode.FOUND_YEAR);
     }
 
-    //예산편성 - 연도삭제(버튼)
-    @Transactional
-    public void deleteBudgetingYear(UserInfo loginUser,  BudgetDto.BudgetingCopyReqeust requestDto){
+  }
+
+  //예산편성 - 연도삭제(버튼)
+  @Transactional
+  public void deleteBudgetingYear(UserInfo loginUser,  BudgetDto.BudgetingCopyReqeust requestDto){
 //		System.out.println(requestDto.getYear());
 //		System.out.println(requestDto.getCopyYear());
 //        UpdateResult result = budgetRepository.callBruteForceDeleteBudgetItem(requestDto.getYear(), "admin");
-        BudgetParams params = new BudgetParams();
-        params.setYear(requestDto.getYear());
-        params.setId("admin");
-        UpdateResult result = budgetMapper.callBruteForceDeleteBudgetItem(params);
+    BudgetParams params = new BudgetParams();
+    params.setYear(requestDto.getYear());
+    params.setId("admin");
+    UpdateResult result = budgetMapper.callBruteForceDeleteBudgetItem(params);
 
-        if(result.getResultCode().equals("100")) {
-            return;
-        }else if( result.getResultCode().equals("93")){
+    if(result.getResultCode().equals("100")) {
+      return;
+    }else if( result.getResultCode().equals("93")){
 //            System.out.println(result.getErrorMessage());
 //            System.out.println(result.getResultCode());
 //            System.out.println(result.getResultCount());
-            throw new BaseException(ResultResponseCode.NOT_FOUND_YEAR);
-        } else {
+      throw new BaseException(ResultResponseCode.NOT_FOUND_YEAR);
+    } else {
 //            System.out.println(result.getErrorMessage());
 //            System.out.println(result.getResultCode());
 //            System.out.println(result.getResultCount());
-            throw new BaseException(ResultResponseCode.DELETE_FOUND_VALUE);
-        }
+      throw new BaseException(ResultResponseCode.DELETE_FOUND_VALUE);
+    }
+  }
+
+  //예산편성 - 항목추가
+  @Transactional
+  public ResultResponseCode insertBudgetingList(UserInfo loginUser,  BudgetDto.BudgetingInsertReqeust requestDto){
+//    UpdateResult result = budgetRepository.callSpAddBudgetPlanCodeName(requestDto.getYear(),requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), "OG001", "admin");
+//    BudgetParams params = new BudgetParams();
+//    params.setYear(requestDto.getYear());
+//    params.setCode1(requestDto.getNameL1());
+//    params.setCode2(requestDto.getNameL2());
+//    params.setCode3(requestDto.getNameL3());
+//    params.setOrg("OG001");
+//    params.setId("admin");
+//    UpdateResult result = budgetMapper.callSpAddBudgetPlanCodeName(params);
+
+    LocalDateTime modiDate = LocalDateTime.now();
+    String year = requestDto.getYear();
+    String codeL1Name = requestDto.getNameL1();
+    String codeL2Name = requestDto.getNameL2();
+    String codeL3Name = requestDto.getNameL3();
+
+    TblBudgetCodeL1 codeL1 = codeL1Repository.findByL1NameAndL1YearAndUseTag(codeL1Name, year, "Y").orElse(new TblBudgetCodeL1());
+    if(codeL1.getL1Code() == null){
+      TblBudgetCodeL1 lastL1Code = codeL1Repository.findTop1ByL1YearAndUseTagOrderByL1CodeDesc(year, "Y").orElse(null);
+      String l1Code = makeCode(year.substring(2), lastL1Code==null?null:lastL1Code.getL1Code());
+      Integer seqOrd = lastL1Code==null?1:(lastL1Code.getSeqOrd()+1);
+      codeL1.setData(l1Code, codeL1Name, year, "Y", seqOrd, "항목추가", modiDate);
+      codeL1Repository.save(codeL1);
     }
 
-    //예산편성 - 항목추가
-    @Transactional
-    public void insertBudgetingList(UserInfo loginUser,  BudgetDto.BudgetingInsertReqeust requestDto){
-        UpdateResult result = budgetRepository.callSpAddBudgetPlanCodeName(requestDto.getYear(),requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), "OG001", "admin");
-//        BudgetParams params = new BudgetParams();
-//        params.setYear(requestDto.getYear());
-//        params.setCode1(requestDto.getNameL1());
-//        params.setCode2(requestDto.getNameL2());
-//        params.setCode3(requestDto.getNameL3());
-//        params.setOrg("OG001");
-//        params.setId("admin");
-//        UpdateResult result = budgetMapper.callSpAddBudgetPlanCodeName(params);
-
-        if(result.getResultCode().equals("100")) {
-            return;
-        } else {
-            throw new BaseException(ResultResponseCode.DUPLICATE_CODE);
-        }
-
+    String l1Code = codeL1.getL1Code();
+    TblBudgetCodeL2 codeL2 = codeL2Repository.findByL2NameAndL1CodeAndUseTag(codeL2Name, l1Code, "Y").orElse(new TblBudgetCodeL2());;
+    if(codeL2.getL1Code() == null){
+      TblBudgetCodeL2 lastL2Code = codeL2Repository.findTop1ByL1CodeAndUseTagOrderByL2CodeDesc(l1Code, "Y").orElse(null);
+      String l2Code = makeCode(l1Code, lastL2Code==null?null: lastL2Code.getL2Code());
+      Integer seqOrd = lastL2Code==null?1:(lastL2Code.getSeqOrd()+1);
+      codeL2.setData(l2Code, codeL1Name, l1Code, "Y", seqOrd, "항목추가", modiDate);
+      codeL2Repository.save(codeL2);
     }
 
-    //예산편성 - 항목변경
-    public void updateBudgetingList(UserInfo loginUser,  BudgetDto.BudgetingUpdateReqeust requestDto){
-//        System.out.println(requestDto.getYear()+","+ requestDto.getPrevNameL1()+","+requestDto.getPrevNameL2()+","+requestDto.getPrevNameL3()+","+requestDto.getNameL1()+","+requestDto.getNameL2()+","+requestDto.getNameL3());
-//        UpdateResult result = budgetRepository.callSpUpdateBudgetPlanCodeName( requestDto.getYear(), requestDto.getPrevNameL1(), requestDto.getPrevNameL2(), requestDto.getPrevNameL3(),requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), "OG001", "admin");
-        BudgetParams params = new BudgetParams();
-        params.setYear(requestDto.getYear());
-        params.setCode1(requestDto.getNameL1());
-        params.setCode2(requestDto.getNameL2());
-        params.setCode3(requestDto.getNameL3());
-        params.setNewCode1(requestDto.getPrevNameL1());
-        params.setNewCode2(requestDto.getPrevNameL2());
-        params.setNewCode3(requestDto.getPrevNameL3());
-        params.setOrg("OG001");
-        params.setId("admin");
-        UpdateResult result = budgetMapper.callSpUpdateBudgetPlanCodeName(params);
-//        System.out.println(result.getErrorMessage());
-//        System.out.println(result.getResultCode());
-//        System.out.println(result.getResultCount());
-//        System.out.println(result);
-        if(result.getResultCode().equals("100")) {
-            return;
-        } else if (result.getResultCode().equals("91")) {
-            throw new BaseException(ResultResponseCode.DUPLICATE_CODE);
-        }
+    String l2Code = codeL2.getL2Code();
+    TblBudgetCodeL3 codeL3 = codeL3Repository.findByL3NameAndL2CodeAndUseTag(codeL3Name, l2Code, "Y").orElse(new TblBudgetCodeL3());;
+    if(codeL3.getL3Code() == null){
+      TblBudgetCodeL3 lastL3Code = codeL3Repository.findTop1ByL2CodeAndUseTagOrderByL3CodeDesc(l2Code, "Y").orElse(null);
+      String l3Code = makeCode(l2Code, lastL3Code==null?null: lastL3Code.getL3Code());
+      Integer seqOrd = lastL3Code==null?1:(lastL3Code.getSeqOrd()+1);
+      codeL3.setData(l3Code, codeL3Name, l2Code, "Y", seqOrd, "항목추가", modiDate);
+      codeL3Repository.save(codeL3);
+    }else{
+//      throw new BaseException(ResultResponseCode.DUPLICATE_CODE);
+      return ResultResponseCode.DUPLICATE_CODE;
     }
+    String l3Code = codeL3.getL3Code();
+    TblBudgetHistory history = new TblBudgetHistory();
+    history.setData(l3Code, loginUser.getOgCd(), "예산편성 등록", 0, 0, loginUser.getUserId(), modiDate);
+    historyRepository.save(history);
+    TblBudgetPlan plan = new TblBudgetPlan();
+    plan.setData(l3Code, loginUser.getOgCd(), 0, null, loginUser.getUserId(), modiDate);
+    planRepository.save(plan);
 
-    //예산편성 - 항목삭제
-    public void deleteBudgetingList(UserInfo loginUser,  BudgetDto.BudgetingInsertReqeust requestDto){
+    return ResultResponseCode.SUCCESS;
+  }
+
+  private String makeCode(String upCode, String lastCode){
+    if (lastCode==null){
+      return upCode+"001";
+    }else{
+      String codeSeq = "00"+(Integer.parseInt(lastCode.substring(lastCode.length()-3))+1);
+      return upCode+codeSeq.substring(codeSeq.length()-3);
+    }
+  }
+
+  //예산편성 - 항목변경
+  public void updateBudgetingList(UserInfo loginUser,  BudgetDto.BudgetingUpdateReqeust requestDto){
+//    UpdateResult result = budgetRepository.callSpUpdateBudgetPlanCodeName( requestDto.getYear(), requestDto.getPrevNameL1(), requestDto.getPrevNameL2(), requestDto.getPrevNameL3(),requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), "OG001", "admin");
+    BudgetParams params = new BudgetParams();
+    params.setYear(requestDto.getYear());
+    params.setCode1(requestDto.getNameL1());
+    params.setCode2(requestDto.getNameL2());
+    params.setCode3(requestDto.getNameL3());
+    params.setNewCode1(requestDto.getPrevNameL1());
+    params.setNewCode2(requestDto.getPrevNameL2());
+    params.setNewCode3(requestDto.getPrevNameL3());
+    params.setOrg("OG001");
+    params.setId("admin");
+    UpdateResult result = budgetMapper.callSpUpdateBudgetPlanCodeName(params);
+
+    if(result.getResultCode().equals("100")) {
+      return;
+    } else if (result.getResultCode().equals("91")) {
+      throw new BaseException(ResultResponseCode.DUPLICATE_CODE);
+    }
+  }
+
+  //예산편성 - 항목삭제
+  public void deleteBudgetingList(UserInfo loginUser,  BudgetDto.BudgetingInsertReqeust requestDto){
 //        System.out.println(requestDto.getYear());
 //        System.out.println(requestDto.getNameL1());
 //        System.out.println(requestDto.getNameL2());
 //        System.out.println(requestDto.getNameL3());
-//        UpdateResult result = budgetRepository.callSpDeleteBudgetPlanCodeName(requestDto.getYear(),requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), "OG001", "admin");
-        BudgetParams params = new BudgetParams();
-        params.setYear(requestDto.getYear());
-        params.setCode1(requestDto.getNameL1());
-        params.setCode2(requestDto.getNameL2());
-        params.setCode3(requestDto.getNameL3());
-        params.setOrg("OG001");
-        params.setId("admin");
-        UpdateResult result = budgetMapper.callSpDeleteBudgetPlanCodeName(params);
+      UpdateResult result = budgetRepository.callSpDeleteBudgetPlanCodeName(requestDto.getYear(),requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), "OG001", "admin");
+//    BudgetParams params = new BudgetParams();
+//    params.setYear(requestDto.getYear());
+//    params.setCode1(requestDto.getNameL1());
+//    params.setCode2(requestDto.getNameL2());
+//    params.setCode3(requestDto.getNameL3());
+//    params.setOrg("OG001");
+//    params.setId("admin");
+//    UpdateResult result = budgetMapper.callSpDeleteBudgetPlanCodeName(params);
 
 //        System.out.println(result.getErrorMessage());
 //        System.out.println(result.getResultCode());
 //        System.out.println(result.getResultCount());
-        if(result.getResultCode().equals("100")) {
-            return;
-        } else {
-            throw new BaseException(ResultResponseCode.DELETE_FOUND_VALUE);
-        }
+    if(result.getResultCode().equals("100")) {
+      return;
+    } else {
+      throw new BaseException(ResultResponseCode.DELETE_FOUND_VALUE);
     }
+  }
 
-    // 예산편성 - 예산편성 저장(modal)
-    @Transactional
-    public void saveBudgetingList(UserInfo loginUser, BudgetDto.BudgetingSaveReqeust requestDto){
+  // 예산편성 - 예산편성 저장(modal)
+  @Transactional
+  public void saveBudgetingList(UserInfo loginUser, BudgetDto.BudgetingSaveReqeust requestDto){
 //		System.out.println(requestDto.getAmount());
 //		System.out.println(requestDto.getNameL1());
 //		System.out.println(requestDto.getNameL2());
 //		System.out.println(requestDto.getNameL3());
 //        UpdateResult result = budgetRepository.callSpUpdateBudgetPlanCodeItem(requestDto.getYear(), requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), requestDto.getAmount(),"OG001", "admin");
-        BudgetParams params = new BudgetParams();
-        params.setYear(requestDto.getYear());
-        params.setCode1(requestDto.getNameL1());
-        params.setCode2(requestDto.getNameL2());
-        params.setCode3(requestDto.getNameL3());
-        params.setAmount(requestDto.getAmount());
-        params.setOrg("OG001");
-        params.setId("admin");
-        UpdateResult result = budgetMapper.callSpUpdateBudgetPlanCodeItem(params);
+    BudgetParams params = new BudgetParams();
+    params.setYear(requestDto.getYear());
+    params.setCode1(requestDto.getNameL1());
+    params.setCode2(requestDto.getNameL2());
+    params.setCode3(requestDto.getNameL3());
+    params.setAmount(requestDto.getAmount());
+    params.setOrg("OG001");
+    params.setId("admin");
+    UpdateResult result = budgetMapper.callSpUpdateBudgetPlanCodeItem(params);
 
 //		System.out.println(result.getErrorMessage());
 //		System.out.println(result.getResultCode());
 //		System.out.println(result.getResultCount());
-        if(result.getResultCode().equals("100")) {
-            return;
-        } else {
+    if(result.getResultCode().equals("100")) {
+      return;
+    } else {
 //            System.out.println(result.getErrorMessage());
 //            System.out.println(result.getResultCode());
 //            System.out.println(result.getResultCount());
-            throw new BaseException(ResultResponseCode.DUPLICATE_CODE);
-        }
-
+      throw new BaseException(ResultResponseCode.DUPLICATE_CODE);
     }
 
-    //예산편성 - 예산삭제(버튼)
-    @Transactional
-    public void deleteBudgeting(UserInfo loginUser,  BudgetDto.BudgetingSaveReqeust requestDto){
+  }
+
+  //예산편성 - 예산삭제(버튼)
+  @Transactional
+  public void deleteBudgeting(UserInfo loginUser,  BudgetDto.BudgetingSaveReqeust requestDto){
 //		System.out.println(requestDto.getYear());
 //		System.out.println(requestDto.getNameL1());
 //		System.out.println(requestDto.getNameL2());
 //		System.out.println(requestDto.getNameL3());
 //        UpdateResult result = budgetRepository.callSpDeleteBudgetPlan(requestDto.getYear(), "OG001", "admin");
-        BudgetParams params = new BudgetParams();
-        params.setYear(requestDto.getYear());
-        params.setOrg("OG001");
-        params.setId("admin");
-        UpdateResult result = budgetMapper.callSpDeleteBudgetPlan(params);
+    BudgetParams params = new BudgetParams();
+    params.setYear(requestDto.getYear());
+    params.setOrg("OG001");
+    params.setId("admin");
+    UpdateResult result = budgetMapper.callSpDeleteBudgetPlan(params);
 
-        if(result.getResultCode().equals("100")) {
-            return;
-        } else {
+    if(result.getResultCode().equals("100")) {
+      return;
+    } else {
 //            System.out.println(result.getErrorMessage());
 //            System.out.println(result.getResultCode());
 //            System.out.println(result.getResultCount());
-            throw new BaseException(ResultResponseCode.NOT_FOUND_CODE);
-        }
-
+      throw new BaseException(ResultResponseCode.NOT_FOUND_CODE);
     }
 
-    // 예산배정
-    public List<AssignResult> selectBudgetAssignInfo(UserInfo loginUser, BudgetDto.AssignSearchReqeust requestDto){
+  }
+
+  // 예산배정
+  public List<AssignResult> selectBudgetAssignInfo(UserInfo loginUser, BudgetDto.AssignSearchReqeust requestDto){
 //        System.out.println(requestDto.getCode());
 //        System.out.println(requestDto.getYear());
 //        System.out.println(requestDto.getStDate());
 //        System.out.println(requestDto.getEdDate());
-        //System.out.println(requestDto.getYear()+" / "+ requestDto.getCode()+" / "+ "admin"+" / "+ java.sql.Date.valueOf(requestDto.getStDate())+" / "+java.sql.Date.valueOf(requestDto.getEdDate()));
+    //System.out.println(requestDto.getYear()+" / "+ requestDto.getCode()+" / "+ "admin"+" / "+ java.sql.Date.valueOf(requestDto.getStDate())+" / "+java.sql.Date.valueOf(requestDto.getEdDate()));
 //        return  budgetRepository.callSpGetBudgetAssignInfo(requestDto.getYear(), requestDto.getCode(), "admin", java.sql.Date.valueOf(requestDto.getStDate()),java.sql.Date.valueOf(requestDto.getEdDate()));
-        BudgetParams params = new BudgetParams();
-        params.setYear(requestDto.getYear());
-        params.setCode(requestDto.getCode());
-        params.setUser("admin");
-        params.setStDate(java.sql.Date.valueOf(requestDto.getStDate()));
-        params.setEdDate(java.sql.Date.valueOf(requestDto.getEdDate()));
-        return budgetMapper.callSpGetBudgetAssignInfo(params);
-    }
+    BudgetParams params = new BudgetParams();
+    params.setYear(requestDto.getYear());
+    params.setCode(requestDto.getCode());
+    params.setUser("admin");
+    params.setStDate(java.sql.Date.valueOf(requestDto.getStDate()));
+    params.setEdDate(java.sql.Date.valueOf(requestDto.getEdDate()));
+    return budgetMapper.callSpGetBudgetAssignInfo(params);
+  }
 
-    //(공통) 2단계로 하위청 뿌려주기
-    public List<CodeResult> selectDownOrg(String userOrgCode){
+  //(공통) 2단계로 하위청 뿌려주기
+  public List<CodeResult> selectDownOrg(String userOrgCode){
 //        return budgetRepository.callSpGetDownOrg(userOrgCode);
-        BudgetParams params = new BudgetParams();
-        params.setOrg(userOrgCode);
-        return budgetMapper.callSpGetDownOrg(params);
-    }
+    BudgetParams params = new BudgetParams();
+    params.setOrg(userOrgCode);
+    return budgetMapper.callSpGetDownOrg(params);
+  }
 
-    //
-    public List<CodeResult> selectGetLowerOrgCodeByName(UserInfo loginUser){
+  //
+  public List<CodeResult> selectGetLowerOrgCodeByName(UserInfo loginUser){
 //        return  budgetRepository.callSpGetLowerOrgCodeByName();
-        return  budgetMapper.callSpGetLowerOrgCodeByName();
-    }
+    return  budgetMapper.callSpGetLowerOrgCodeByName();
+  }
 
-    //상위 기관 코드 가져오기 (3단계인경우만)
-    public String selectGetHighOrgCode(String userOrgCode){
+  //상위 기관 코드 가져오기 (3단계인경우만)
+  public String selectGetHighOrgCode(String userOrgCode){
 //        return budgetRepository.callSpGetHighOrgCode(userOrgCode);
-        BudgetParams params = new BudgetParams();
-        params.setOrg(userOrgCode);
-        return budgetMapper.callSpGetHighOrgCode(params);
-    }
+    BudgetParams params = new BudgetParams();
+    params.setOrg(userOrgCode);
+    return budgetMapper.callSpGetHighOrgCode(params);
+  }
 
-    // 예산배정 - 등록(저장버튼)
-    @Transactional
-    public void updateAssignList(UserInfo loginUser,  BudgetDto.AssignSaveReqeust requestDto){
+  // 예산배정 - 등록(저장버튼)
+  @Transactional
+  public void updateAssignList(UserInfo loginUser,  BudgetDto.AssignSaveReqeust requestDto){
 
 //        System.out.println(requestDto.getCode());
 //        System.out.println(requestDto.getOrg());
 //        System.out.println(requestDto.getYear());
 //		System.out.println(requestDto.getAmount());
 //        UpdateResult result = budgetRepository.callSpAddBudgetAssign(requestDto.getCode(),requestDto.getOrg(),requestDto.getOrg1(), requestDto.getAmount(), "2023-03-15");
-        BudgetParams params = new BudgetParams();
-        params.setCode(requestDto.getCode());
-        params.setOrg(requestDto.getOrg());
-        params.setOrg1(requestDto.getOrg1());
-        params.setAmount(requestDto.getAmount());
-        params.setDt("2023-03-15");
-        UpdateResult result = budgetMapper.callSpAddBudgetAssign(params);
+    BudgetParams params = new BudgetParams();
+    params.setCode(requestDto.getCode());
+    params.setOrg(requestDto.getOrg());
+    params.setOrg1(requestDto.getOrg1());
+    params.setAmount(requestDto.getAmount());
+    params.setDt("2023-03-15");
+    UpdateResult result = budgetMapper.callSpAddBudgetAssign(params);
 
 //        System.out.println(result.getErrorMessage());
 //        System.out.println(result.getResultCode());
 //        System.out.println(result.getResultCount());
-        if(result.getResultCode().equals("100")) {
-            return;
-        }else if(result.getResultCode().equals("72")) {
+    if(result.getResultCode().equals("100")) {
+      return;
+    }else if(result.getResultCode().equals("72")) {
 //            System.out.println(result.getErrorMessage());
 //            System.out.println(result.getResultCode());
 //            System.out.println(result.getResultCount());
-            throw new BaseException(ResultResponseCode.EXPENSE_OVER_VALUE);
-        } else {
+      throw new BaseException(ResultResponseCode.EXPENSE_OVER_VALUE);
+    } else {
 //            System.out.println(result.getErrorMessage());
 //            System.out.println(result.getResultCode());
 //            System.out.println(result.getResultCount());
-            throw new BaseException(ResultResponseCode.DUPLICATE_CODE);
-        }
-
+      throw new BaseException(ResultResponseCode.DUPLICATE_CODE);
     }
 
-    //집행관리
-    public List<ExpenseResult> selectBudgetExpenseInfo(UserInfo loginUser, BudgetDto.AssignSearchReqeust requestDto){
+  }
+
+  //집행관리
+  public List<ExpenseResult> selectBudgetExpenseInfo(UserInfo loginUser, BudgetDto.AssignSearchReqeust requestDto){
 //        System.out.println(requestDto.getYear());
 //        System.out.println(requestDto.getCode());
 //        System.out.println(java.sql.Date.valueOf(requestDto.getStDate()));
 //        System.out.println(requestDto.getEdDate());
 //        return  budgetRepository.callSpGetBudgetExpenseInfo(requestDto.getYear(), requestDto.getCode(), "admin", java.sql.Date.valueOf(requestDto.getStDate()),java.sql.Date.valueOf(requestDto.getEdDate()));
-        BudgetParams params = new BudgetParams();
-        params.setYear(requestDto.getYear());
-        params.setCode(requestDto.getCode());
-        params.setUser("admin");
-        params.setStDate(java.sql.Date.valueOf(requestDto.getStDate()));
-        params.setEdDate(java.sql.Date.valueOf(requestDto.getEdDate()));
-        return  budgetMapper.callSpGetBudgetExpenseInfo(params);
-    }
+    BudgetParams params = new BudgetParams();
+    params.setYear(requestDto.getYear());
+    params.setCode(requestDto.getCode());
+    params.setUser("admin");
+    params.setStDate(java.sql.Date.valueOf(requestDto.getStDate()));
+    params.setEdDate(java.sql.Date.valueOf(requestDto.getEdDate()));
+    return  budgetMapper.callSpGetBudgetExpenseInfo(params);
+  }
 
-    public List<ExpenseInfoResult> selectBudgetExpense(UserInfo loginUser, BudgetDto.ExpenseSearchReqeust requestDto){
+  public List<ExpenseInfoResult> selectBudgetExpense(UserInfo loginUser, BudgetDto.ExpenseSearchReqeust requestDto){
 //        System.out.println(requestDto.getYear());
 //        System.out.println(requestDto.getNameL1());
 //        System.out.println(requestDto.getNameL2());
 //        System.out.println(requestDto.getNameL3());
 //        return  budgetRepository.callSpGetBudgetExpense(requestDto.getYear(), requestDto.getNameL1(), requestDto.getNameL2(), requestDto.getNameL3(), "본청");
-        BudgetParams params = new BudgetParams();
-        params.setYear(requestDto.getYear());
-        params.setCode1(requestDto.getNameL1());
-        params.setCode2(requestDto.getNameL2());
-        params.setCode3(requestDto.getNameL3());
-        params.setOrg("본청");
-        return  budgetMapper.callSpGetBudgetExpense(params);
-    }
+    BudgetParams params = new BudgetParams();
+    params.setYear(requestDto.getYear());
+    params.setCode1(requestDto.getNameL1());
+    params.setCode2(requestDto.getNameL2());
+    params.setCode3(requestDto.getNameL3());
+    params.setOrg("본청");
+    return  budgetMapper.callSpGetBudgetExpense(params);
+  }
 
-    @Transactional
-    public void insertExpense(UserInfo loginUser, BudgetDto.ExpenseSaveReqeust requestDto){
+  @Transactional
+  public void insertExpense(UserInfo loginUser, BudgetDto.ExpenseSaveReqeust requestDto){
 //        System.out.println(requestDto.getYear());
 //        System.out.println(requestDto.getNameL1());
 //        System.out.println(requestDto.getNameL2());
 //        System.out.println(requestDto.getNameL3());
 //        UpdateResult result = budgetRepository.callSpAddBudgetExpense(requestDto.getYear(),requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), "본청",  requestDto.getItem(), requestDto.getAmount(), java.sql.Date.valueOf(requestDto.getExpenseDate()));
 
-        BudgetParams params = new BudgetParams();
-        params.setYear(requestDto.getYear());
-        params.setCode1(requestDto.getNameL1());
-        params.setCode2(requestDto.getNameL2());
-        params.setCode3(requestDto.getNameL3());
-        params.setOrg("본청");
-        params.setItem(requestDto.getItem());
-        params.setAmount(requestDto.getAmount());
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        params.setDt(formatter.format(requestDto.getExpenseDate()));
-        UpdateResult result = budgetMapper.callSpAddBudgetExpense(params);
+    BudgetParams params = new BudgetParams();
+    params.setYear(requestDto.getYear());
+    params.setCode1(requestDto.getNameL1());
+    params.setCode2(requestDto.getNameL2());
+    params.setCode3(requestDto.getNameL3());
+    params.setOrg("본청");
+    params.setItem(requestDto.getItem());
+    params.setAmount(requestDto.getAmount());
+    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+    params.setDt(formatter.format(requestDto.getExpenseDate()));
+    UpdateResult result = budgetMapper.callSpAddBudgetExpense(params);
 //        System.out.println(result.getErrorMessage());
 //        System.out.println(result.getResultCode());
 //        System.out.println(result.getResultCount());
-        if(result.getResultCode().equals("100")) {
-            return;
-        }else if(result.getResultCode().equals("71")) {
-            throw new BaseException(ResultResponseCode.EXPENSE_OVER_VALUE);
-        } else {
-            throw new BaseException(ResultResponseCode.ERROR);
-        }
-
+    if(result.getResultCode().equals("100")) {
+      return;
+    }else if(result.getResultCode().equals("71")) {
+      throw new BaseException(ResultResponseCode.EXPENSE_OVER_VALUE);
+    } else {
+      throw new BaseException(ResultResponseCode.ERROR);
     }
 
-    public List<ExpenseResult> selectSpGetbudgetStatOrg(UserInfo loginUser,BudgetDto.StatsSearchReqeust requestDto){
+  }
+
+  public List<ExpenseResult> selectSpGetbudgetStatOrg(UserInfo loginUser,BudgetDto.StatsSearchReqeust requestDto){
 //        System.out.println(requestDto.getYear());
 //        System.out.println(requestDto.getCode());
 //        System.out.println(java.sql.Date.valueOf(requestDto.getStDate()));
@@ -367,17 +417,17 @@ public class BudgetService {
 //        System.out.println(requestDto.getWon());
 //        return  budgetRepository.callSpGetbudgetStatOrg(requestDto.getYear(), requestDto.getCode(), "admin", java.sql.Date.valueOf(requestDto.getStDate()), java.sql.Date.valueOf(requestDto.getEdDate()), requestDto.getWon());
 
-        BudgetParams params = new BudgetParams();
-        params.setYear(requestDto.getYear());
-        params.setCode(requestDto.getCode());
-        params.setUser("admin");
-        params.setStDate(java.sql.Date.valueOf(requestDto.getStDate()));
-        params.setEdDate(java.sql.Date.valueOf(requestDto.getEdDate()));
-        params.setWon(requestDto.getWon());
-        return  budgetMapper.callSpGetbudgetStatOrg(params);
-    }
+    BudgetParams params = new BudgetParams();
+    params.setYear(requestDto.getYear());
+    params.setCode(requestDto.getCode());
+    params.setUser("admin");
+    params.setStDate(java.sql.Date.valueOf(requestDto.getStDate()));
+    params.setEdDate(java.sql.Date.valueOf(requestDto.getEdDate()));
+    params.setWon(requestDto.getWon());
+    return  budgetMapper.callSpGetbudgetStatOrg(params);
+  }
 
-    public List<StatsItemResult> selectSpGetbudgetStatDetail(UserInfo loginUser,BudgetDto.StatsSearchReqeust requestDto){
+  public List<StatsItemResult> selectSpGetbudgetStatDetail(UserInfo loginUser,BudgetDto.StatsSearchReqeust requestDto){
 //        System.out.println(requestDto.getYear());
 //        System.out.println(requestDto.getCode());
 //        System.out.println(java.sql.Date.valueOf(requestDto.getStDate()));
@@ -385,25 +435,25 @@ public class BudgetService {
 //        System.out.println(requestDto.getWon());
 //        return  budgetRepository.callSpGetbudgetStatDetail(requestDto.getYear(), requestDto.getCode(), requestDto.getItem(), "admin", java.sql.Date.valueOf(requestDto.getStDate()), java.sql.Date.valueOf(requestDto.getEdDate()), requestDto.getWon());
 
-        BudgetParams params = new BudgetParams();
-        params.setYear(requestDto.getYear());
-        params.setCode(requestDto.getCode());
-        params.setItem(requestDto.getItem());
-        params.setUser("admin");
-        params.setStDate(java.sql.Date.valueOf(requestDto.getStDate()));
-        params.setEdDate(java.sql.Date.valueOf(requestDto.getEdDate()));
-        params.setWon(requestDto.getWon());
-        return  budgetMapper.callSpGetbudgetStatDetail(params);
-    }
+    BudgetParams params = new BudgetParams();
+    params.setYear(requestDto.getYear());
+    params.setCode(requestDto.getCode());
+    params.setItem(requestDto.getItem());
+    params.setUser("admin");
+    params.setStDate(java.sql.Date.valueOf(requestDto.getStDate()));
+    params.setEdDate(java.sql.Date.valueOf(requestDto.getEdDate()));
+    params.setWon(requestDto.getWon());
+    return  budgetMapper.callSpGetbudgetStatDetail(params);
+  }
 
-    public List<L3CodeResult> selectSpGetL3Code(UserInfo loginUser,String year){
+  public List<L3CodeResult> selectSpGetL3Code(UserInfo loginUser, String year){
 
 //        return  budgetRepository.callSpGetBudgetCodeL3(year);
 
-        BudgetParams params = new BudgetParams();
-        params.setYear(year);
-        return  budgetMapper.callSpGetBudgetCodeL3(params);
-    }
+    BudgetParams params = new BudgetParams();
+    params.setYear(year);
+    return  budgetMapper.callSpGetBudgetCodeL3(params);
+  }
 
 
 //	public void insertBudgetingYear(UserInfo loginUser,  BudgetDto.BudgetingUpdateReqeust requestDto){

src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/UnlawfulFishingParam.java

@@ -51,7 +51,7 @@ public class UnlawfulFishingParam  extends BaseModel {
 
 
 
-
+  /*사용되는 조건인지 확인이 필요함*/
   private Integer year;
   private Integer month;
   private Double tonMin;

src/main/resources/mybatisMapper/BudgetMapper.xml

@@ -26,9 +26,6 @@
   <select id="callBruteForceDeleteBudgetItem" resultType="UpdateResult" parameterType="BudgetParams">
     call sp_brute_force_delete_budget_item(#{year}, #{id},NULL,NULL,NULL)
   </select>
-  <select id="callSpAddBudgetPlanCodeName" resultType="UpdateResult" parameterType="BudgetParams">
-    call sp_add_budget_plan_codename (#{year}, #{code1}, #{code2}, #{code3}, #{org}, #{id} ,NULL, NULL, NULL)
-  </select>
   <select id="callSpUpdateBudgetPlanCodeName" resultType="UpdateResult" parameterType="BudgetParams">
     call sp_update_budget_plan_codename(#{year}, #{code1}, #{code2}, #{code3}, #{newCode1}, #{newCode2}, #{newCode3}, #{org},#{id},NULL,NULL,NULL)
   </select>