DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

예산배정 오류 수정.

master
강석 최 2023-07-25 18:21:09 +09:00
parent a5827e1a88
commit b92056dcc6
5 changed files with 47 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/dbnt/faisp/main/budget/BudgetController.java
View File

@ -178,7 +178,8 @@ public class BudgetController {
if (requestDto.getYear() != null) {
userOrgCode = requestDto.getCode();
List<AssignResult> list = budgetService.selectBudgetAssignInfo(loginUser, requestDto);
// List<AssignResult> list = budgetService.selectBudgetAssignInfo(loginUser, requestDto);
List<AssignResult> list = budgetService.selectBudgetAssignInfoList(requestDto);
mav.addObject("list", list);
} else {
// 로그인된 해당청 기본선택

6
src/main/java/com/dbnt/faisp/main/budget/model/BudgetParams.java
View File

@ -4,7 +4,7 @@ import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import java.util.Date;
import java.time.LocalDate;
@Getter
@Setter
@ -35,6 +35,6 @@ public class BudgetParams {
private Integer amount;
private String dt;
private Date stDate;
private Date edDate;
private LocalDate stDate;
private LocalDate edDate;
}

41
src/main/java/com/dbnt/faisp/main/budget/service/BudgetService.java
View File

@ -236,11 +236,7 @@ public class BudgetService {
// 예산편성 - 예산편성 저장(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());
@ -251,15 +247,9 @@ public class BudgetService {
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 {
// System.out.println(result.getErrorMessage());
// System.out.println(result.getResultCode());
// System.out.println(result.getResultCount());
throw new BaseException(ResultResponseCode.DUPLICATE_CODE);
}
@ -268,11 +258,7 @@ public class BudgetService {
//예산편성 - 예산삭제(버튼)
@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");
@ -282,9 +268,6 @@ public class BudgetService {
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);
}
@ -296,8 +279,8 @@ public class BudgetService {
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.setStDate(requestDto.getStDate());
params.setEdDate(requestDto.getEdDate());
return budgetMapper.callSpGetBudgetAssignInfo(params);
}
@ -306,8 +289,8 @@ public class BudgetService {
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.setStDate(requestDto.getStDate());
params.setEdDate(requestDto.getEdDate());
List<AssignResult> assignResultList = budgetMapper.selectBudgetAssignInfoList(params);
List<AssignAmount> assignAmountList = budgetMapper.selectBudgetAssignAmountList(params);
for(AssignResult result: assignResultList){
@ -418,8 +401,8 @@ public class BudgetService {
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.setStDate(requestDto.getStDate());
params.setEdDate(requestDto.getEdDate());
return budgetMapper.callSpGetBudgetExpenseInfo(params);
}
@ -482,8 +465,8 @@ public class BudgetService {
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.setStDate(requestDto.getStDate());
params.setEdDate(requestDto.getEdDate());
params.setWon(requestDto.getWon());
return budgetMapper.callSpGetbudgetStatOrg(params);
}
@ -501,8 +484,8 @@ public class BudgetService {
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.setStDate(requestDto.getStDate());
params.setEdDate(requestDto.getEdDate());
params.setWon(requestDto.getWon());
return budgetMapper.callSpGetbudgetStatDetail(params);
}

26
src/main/resources/mybatisMapper/BudgetMapper.xml
View File

@ -52,21 +52,25 @@
<select id="selectBudgetAssignAmountList" resultType="AssignAmount" parameterType="BudgetParams">
select oc.order_seq,
oc.organ_cd,
tba.budget_code,
tba.period_assign_amount,
coalesce(tbe.sum_assign_amount, 0) as sum_assign_amount
total.budget_code,
coalesce(tba.period_assign_amount, 0) as period_assign_amount,
coalesce(total.sum_assign_amount, 0) as sum_assign_amount
from (
select l_org_code, budget_code, sum(amount) as sum_assign_amount
from tbl_budget_assign
where h_org_code = #{code}
and EXTRACT( year FROM assign_date ) = ${year}
group by l_org_code, budget_code
) total
left outer join
(
select h_org_code, l_org_code, budget_code, sum(amount) as period_assign_amount
from tbl_budget_assign
where h_org_code = #{code}
and assign_date >= #{stDate}::date
and assign_date &lt;= #{edDate}::date
group by h_org_code, l_org_code, budget_code
) tba
left outer join (
select org_code, budget_code, sum(amount) as sum_assign_amount
from tbl_budget_expense
where EXTRACT( year FROM expense_date ) = ${year}
group by org_code, budget_code
) tbe on tba.l_org_code = tbe.org_code and tba.budget_code = tbe.budget_code
) tba on tba.l_org_code = total.l_org_code and tba.budget_code = total.budget_code
inner join (
select (ROW_NUMBER() OVER()) AS order_seq, *
from (
@ -76,7 +80,7 @@
from organ_config
where parent_organ = #{code}
) a
) oc on tba.l_org_code = oc.organ_cd
) oc on total.l_org_code = oc.organ_cd
order by order_seq, organ_cd, budget_code
</select>
<select id="callSpGetDownOrg" resultType="CodeResult" parameterType="BudgetParams">

4
src/main/resources/templates/budget/assign.html
View File

@ -59,8 +59,8 @@
</div>
</form>
<div class="row">
<div class="col-12">
<table class="table table-sm table-bordered table-hover">
<div class="col-12 overflow-auto">
<table class="table table-sm table-bordered table-hover text-nowrap">
<thead>
<tr class="table-secondary">
<th rowspan="2">사업명</th>