예산관리 작업중.
parent
d4102e2160
commit
02781efdeb
|
|
@ -6,7 +6,6 @@ import com.dbnt.faisp.main.faRpt.model.FaRptBoard;
|
||||||
import com.dbnt.faisp.main.faRpt.model.Sri;
|
import com.dbnt.faisp.main.faRpt.model.Sri;
|
||||||
import com.dbnt.faisp.main.faRpt.service.FaRptService;
|
import com.dbnt.faisp.main.faRpt.service.FaRptService;
|
||||||
import com.dbnt.faisp.main.faRpt.service.SriService;
|
import com.dbnt.faisp.main.faRpt.service.SriService;
|
||||||
import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard;
|
|
||||||
import com.dbnt.faisp.main.fpiMgt.affair.model.DashboardAffair;
|
import com.dbnt.faisp.main.fpiMgt.affair.model.DashboardAffair;
|
||||||
import com.dbnt.faisp.main.fpiMgt.affair.service.AffairService;
|
import com.dbnt.faisp.main.fpiMgt.affair.service.AffairService;
|
||||||
import com.dbnt.faisp.main.menuMgt.service.MenuMgtService;
|
import com.dbnt.faisp.main.menuMgt.service.MenuMgtService;
|
||||||
|
|
@ -18,7 +17,6 @@ import com.dbnt.faisp.main.userInfo.model.UserInfo;
|
||||||
import com.dbnt.faisp.main.codeMgt.service.CodeMgtService;
|
import com.dbnt.faisp.main.codeMgt.service.CodeMgtService;
|
||||||
|
|
||||||
import com.dbnt.faisp.main.userInfo.service.UserAlarmService;
|
import com.dbnt.faisp.main.userInfo.service.UserAlarmService;
|
||||||
import com.dbnt.faisp.main.userInfo.service.UserInfoService;
|
|
||||||
import com.dbnt.faisp.main.userInfo.service.UserLogService;
|
import com.dbnt.faisp.main.userInfo.service.UserLogService;
|
||||||
import com.dbnt.faisp.util.Utils;
|
import com.dbnt.faisp.util.Utils;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
package com.dbnt.faisp.main.budget;
|
package com.dbnt.faisp.main.budget;
|
||||||
|
|
||||||
import com.dbnt.faisp.main.budget.common.ResultResponseCode;
|
import com.dbnt.faisp.main.budget.common.ResultResponseCode;
|
||||||
import com.dbnt.faisp.main.budget.model.ResultResponse;
|
import com.dbnt.faisp.main.budget.model.*;
|
||||||
import com.dbnt.faisp.main.budget.model.BudgetDto;
|
|
||||||
import com.dbnt.faisp.main.budget.repository.BudgetRepository.*;
|
import com.dbnt.faisp.main.budget.repository.BudgetRepository.*;
|
||||||
import com.dbnt.faisp.main.budget.service.BudgetService;
|
import com.dbnt.faisp.main.budget.service.BudgetService;
|
||||||
import com.dbnt.faisp.main.userInfo.model.UserInfo;
|
import com.dbnt.faisp.main.userInfo.model.UserInfo;
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,35 @@
|
||||||
|
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 org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Mapper
|
||||||
|
public interface BudgetMapper {
|
||||||
|
List<BudgetingList> callSpGetBudgetPlanInfo(BudgetParams param);
|
||||||
|
List<YearResult> callSpGetBudgetCodeYearList();
|
||||||
|
UpdateResult callSpCopyBudgetItem(BudgetParams param);
|
||||||
|
UpdateResult callBruteForceDeleteBudgetItem(BudgetParams param);
|
||||||
|
UpdateResult callSpAddBudgetPlanCodeName(BudgetParams param);
|
||||||
|
UpdateResult callSpUpdateBudgetPlanCodeName(BudgetParams param);
|
||||||
|
UpdateResult callSpDeleteBudgetPlanCodeName(BudgetParams param);
|
||||||
|
UpdateResult callSpUpdateBudgetPlanCodeItem(BudgetParams param);
|
||||||
|
UpdateResult callSpDeleteBudgetPlan(BudgetParams param);
|
||||||
|
List<AssignResult> callSpGetBudgetAssignInfo(BudgetParams param);
|
||||||
|
List<CodeResult> callSpGetDownOrg(BudgetParams param);
|
||||||
|
List<CodeResult> callSpGetLowerOrgCodeByName();
|
||||||
|
String callSpGetHighOrgCode(BudgetParams params);
|
||||||
|
UpdateResult callSpAddBudgetAssign(BudgetParams params);
|
||||||
|
List<ExpenseResult> callSpGetBudgetExpenseInfo(BudgetParams params);
|
||||||
|
List<ExpenseInfoResult> callSpGetBudgetExpense(BudgetParams params);
|
||||||
|
UpdateResult callSpAddBudgetExpense(BudgetParams params);
|
||||||
|
List<ExpenseResult> callSpUpdateBudgetExpense(BudgetParams params);
|
||||||
|
List<ExpenseResult> callSpGetbudgetStatOrg(BudgetParams params);
|
||||||
|
List<StatsItemResult> callSpGetbudgetStatDetail(BudgetParams params);
|
||||||
|
List<L3CodeResult> callSpGetBudgetCodeL3(BudgetParams params);
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,33 @@
|
||||||
|
package com.dbnt.faisp.main.budget.model;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
public class AssignResult {
|
||||||
|
String orgCount;
|
||||||
|
String budgetNameL1;
|
||||||
|
String budgetNameL2;
|
||||||
|
String budgetNameL3;
|
||||||
|
String budgetCodeL3;
|
||||||
|
String planAmount;
|
||||||
|
String totalAssignAmount;
|
||||||
|
String periodAssignAmount1;
|
||||||
|
String sumAssignAmount1;
|
||||||
|
String periodAssignAmount2;
|
||||||
|
String sumAssignAmount2;
|
||||||
|
String periodAssignAmount3;
|
||||||
|
String sumAssignAmount3;
|
||||||
|
String periodAssignAmount4;
|
||||||
|
String sumAssignAmount4;
|
||||||
|
String periodAssignAmount5;
|
||||||
|
String sumAssignAmount5;
|
||||||
|
String periodAssignAmount6;
|
||||||
|
String sumAssignAmount6;
|
||||||
|
String periodAssignAmount7;
|
||||||
|
String sumAssignAmount7;
|
||||||
|
String periodAssignAmount8;
|
||||||
|
String sumAssignAmount8;
|
||||||
|
String periodAssignAmount9;
|
||||||
|
String sumAssignAmount9;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,40 @@
|
||||||
|
package com.dbnt.faisp.main.budget.model;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.NoArgsConstructor;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@NoArgsConstructor
|
||||||
|
public class BudgetParams {
|
||||||
|
private String code;
|
||||||
|
private String code1;
|
||||||
|
private String code2;
|
||||||
|
private String code3;
|
||||||
|
|
||||||
|
private String year;
|
||||||
|
private String copyYear;
|
||||||
|
private String org;
|
||||||
|
private String org1;
|
||||||
|
private String user;
|
||||||
|
private String id;
|
||||||
|
private String item;
|
||||||
|
private Integer won;
|
||||||
|
|
||||||
|
private String newCode1;
|
||||||
|
private String newCode2;
|
||||||
|
private String newCode3;
|
||||||
|
|
||||||
|
private String nameL1;
|
||||||
|
private String nameL2;
|
||||||
|
private String nameL3;
|
||||||
|
|
||||||
|
private Integer amount;
|
||||||
|
private String dt;
|
||||||
|
|
||||||
|
private Date stDate;
|
||||||
|
private Date edDate;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,15 @@
|
||||||
|
package com.dbnt.faisp.main.budget.model;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
public class BudgetingList {
|
||||||
|
String budgetNameL1;
|
||||||
|
String budgetNameL2;
|
||||||
|
String budgetNameL3;
|
||||||
|
String budgetCodeL3;
|
||||||
|
Integer amount;
|
||||||
|
String remark;
|
||||||
|
String modiId;
|
||||||
|
String modiDate;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
package com.dbnt.faisp.main.budget.model;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
public class CodeResult {
|
||||||
|
String orgName;
|
||||||
|
String orgCode;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
package com.dbnt.faisp.main.budget.model;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
public class ExpenseInfoResult {
|
||||||
|
String seq;
|
||||||
|
String expenseDate;
|
||||||
|
String expenseItem;
|
||||||
|
String amount;
|
||||||
|
String modiId;
|
||||||
|
String modiDate;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,63 @@
|
||||||
|
package com.dbnt.faisp.main.budget.model;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
public class ExpenseResult {
|
||||||
|
String orgCount;
|
||||||
|
String budgetNameL1;
|
||||||
|
String budgetNameL2;
|
||||||
|
String budgetNameL3;
|
||||||
|
String budgetCodeL3;
|
||||||
|
String planAmount;
|
||||||
|
String totalAssignAmount;
|
||||||
|
String expenseTAmount;
|
||||||
|
String balanceTAmount;
|
||||||
|
Integer periodAssignAmount1;
|
||||||
|
Integer expensePAmount1;
|
||||||
|
Integer blanceAmount1;
|
||||||
|
Integer expenseRate1;
|
||||||
|
|
||||||
|
String periodAssignAmount2;
|
||||||
|
String expensePAmount2;
|
||||||
|
String blanceAmount2;
|
||||||
|
String expenseRate2;
|
||||||
|
|
||||||
|
String periodAssignAmount3;
|
||||||
|
String expensePAmount3;
|
||||||
|
String blanceAmount3;
|
||||||
|
String expenseRate3;
|
||||||
|
|
||||||
|
|
||||||
|
String periodAssignAmount4;
|
||||||
|
String expensePAmount4;
|
||||||
|
String blanceAmount4;
|
||||||
|
String expenseRate4;
|
||||||
|
|
||||||
|
|
||||||
|
String periodAssignAmount5;
|
||||||
|
String expensePAmount5;
|
||||||
|
String blanceAmount5;
|
||||||
|
String expenseRate5;
|
||||||
|
|
||||||
|
|
||||||
|
String periodAssignAmount6;
|
||||||
|
String expensePAmount6;
|
||||||
|
String blanceAmount6;
|
||||||
|
String expenseRate6;
|
||||||
|
|
||||||
|
String periodAssignAmount7;
|
||||||
|
String expensePAmount7;
|
||||||
|
String blanceAmount7;
|
||||||
|
String expenseRate7;
|
||||||
|
|
||||||
|
String periodAssignAmount8;
|
||||||
|
String expensePAmount8;
|
||||||
|
String blanceAmount8;
|
||||||
|
String expenseRate8;
|
||||||
|
|
||||||
|
String periodAssignAmount9;
|
||||||
|
String expensePAmount9;
|
||||||
|
String blanceAmount9;
|
||||||
|
String expenseRate9;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
package com.dbnt.faisp.main.budget.model;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
public class L3CodeResult {
|
||||||
|
|
||||||
|
String l3Name;
|
||||||
|
String l3Code;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
package com.dbnt.faisp.main.budget.model;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
public class StatsItemResult {
|
||||||
|
String orgName;
|
||||||
|
String planAmount;
|
||||||
|
String totalAssignAmount;
|
||||||
|
String expenseTAmount;
|
||||||
|
String balanceTAmount;
|
||||||
|
String expenseTotalRate;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
package com.dbnt.faisp.main.budget.model;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
public class UpdateResult {
|
||||||
|
Integer resultCount;
|
||||||
|
String resultCode;
|
||||||
|
String errorMessage;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
package com.dbnt.faisp.main.budget.model;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
public class YearResult {
|
||||||
|
String year;
|
||||||
|
}
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
package com.dbnt.faisp.main.budget.repository;
|
package com.dbnt.faisp.main.budget.repository;
|
||||||
|
|
||||||
|
import com.dbnt.faisp.main.budget.model.*;
|
||||||
import com.dbnt.faisp.main.codeMgt.model.CodeCatg;
|
import com.dbnt.faisp.main.codeMgt.model.CodeCatg;
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
import org.springframework.data.jpa.repository.Query;
|
import org.springframework.data.jpa.repository.Query;
|
||||||
|
|
@ -197,150 +198,6 @@ public interface BudgetRepository extends JpaRepository<CodeCatg, String> {
|
||||||
@Param("year") String year
|
@Param("year") String year
|
||||||
);
|
);
|
||||||
|
|
||||||
public static interface BudgetingList {
|
|
||||||
String getBudgetNameL1();
|
|
||||||
String getBudgetNameL2();
|
|
||||||
String getBudgetNameL3();
|
|
||||||
String getBudgetCodeL3();
|
|
||||||
Integer getAmount();
|
|
||||||
String getRemark();
|
|
||||||
String getModiId();
|
|
||||||
String getModiDate();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static interface UpdateResult {
|
|
||||||
Integer get_result_count();
|
|
||||||
String get_result_code();
|
|
||||||
String get_error_message();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public static interface YearResult {
|
|
||||||
String getYear();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static interface AssignResult {
|
|
||||||
String getorg_count();
|
|
||||||
String getbudget_name_l1();
|
|
||||||
String getbudget_name_l2();
|
|
||||||
String getbudget_name_l3();
|
|
||||||
String getbudget_code_l3();
|
|
||||||
String getplan_amount();
|
|
||||||
String gettotal_assign_amount();
|
|
||||||
String getperiod_assign_amount1();
|
|
||||||
String getsum_assign_amount1();
|
|
||||||
String getperiod_assign_amount2();
|
|
||||||
String getsum_assign_amount2();
|
|
||||||
String getperiod_assign_amount3();
|
|
||||||
String getsum_assign_amount3();
|
|
||||||
String getperiod_assign_amount4();
|
|
||||||
String getsum_assign_amount4();
|
|
||||||
String getperiod_assign_amount5();
|
|
||||||
String getsum_assign_amount5();
|
|
||||||
String getperiod_assign_amount6();
|
|
||||||
String getsum_assign_amount6();
|
|
||||||
String getperiod_assign_amount7();
|
|
||||||
String getsum_assign_amount7();
|
|
||||||
String getperiod_assign_amount8();
|
|
||||||
String getsum_assign_amount8();
|
|
||||||
String getperiod_assign_amount9();
|
|
||||||
String getsum_assign_amount9();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public static interface L3CodeResult {
|
|
||||||
|
|
||||||
String getl3_name();
|
|
||||||
String getl3_code();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public static interface StatsItemResult {
|
|
||||||
String getorg_name();
|
|
||||||
String getplan_amount();
|
|
||||||
String gettotal_assign_amount();
|
|
||||||
String getexpense_t_amount();
|
|
||||||
String getbalance_t_amount();
|
|
||||||
String getexpense_total_rate();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static interface ExpenseResult {
|
|
||||||
String getorg_count();
|
|
||||||
String getbudget_name_l1();
|
|
||||||
String getbudget_name_l2();
|
|
||||||
String getbudget_name_l3();
|
|
||||||
String getbudget_code_l3();
|
|
||||||
String getplan_amount();
|
|
||||||
String gettotal_assign_amount();
|
|
||||||
String getexpense_t_amount();
|
|
||||||
String getbalance_t_amount();
|
|
||||||
Integer getperiod_assign_amount1();
|
|
||||||
Integer getexpense_p_amount1();
|
|
||||||
Integer getblance_amount1();
|
|
||||||
Integer getexpense_rate1();
|
|
||||||
|
|
||||||
String getperiod_assign_amount2();
|
|
||||||
String getexpense_p_amount2();
|
|
||||||
String getblance_amount2();
|
|
||||||
String getexpense_rate2();
|
|
||||||
|
|
||||||
String getperiod_assign_amount3();
|
|
||||||
String getexpense_p_amount3();
|
|
||||||
String getblance_amount3();
|
|
||||||
String getexpense_rate3();
|
|
||||||
|
|
||||||
|
|
||||||
String getperiod_assign_amount4();
|
|
||||||
String getexpense_p_amount4();
|
|
||||||
String getblance_amount4();
|
|
||||||
String getexpense_rate4();
|
|
||||||
|
|
||||||
|
|
||||||
String getperiod_assign_amount5();
|
|
||||||
String getexpense_p_amount5();
|
|
||||||
String getblance_amount5();
|
|
||||||
String getexpense_rate5();
|
|
||||||
|
|
||||||
|
|
||||||
String getperiod_assign_amount6();
|
|
||||||
String getexpense_p_amount6();
|
|
||||||
String getblance_amount6();
|
|
||||||
String getexpense_rate6();
|
|
||||||
|
|
||||||
String getperiod_assign_amount7();
|
|
||||||
String getexpense_p_amount7();
|
|
||||||
String getblance_amount7();
|
|
||||||
String getexpense_rate7();
|
|
||||||
|
|
||||||
String getperiod_assign_amount8();
|
|
||||||
String getexpense_p_amount8();
|
|
||||||
String getblance_amount8();
|
|
||||||
String getexpense_rate8();
|
|
||||||
|
|
||||||
String getperiod_assign_amount9();
|
|
||||||
String getexpense_p_amount9();
|
|
||||||
String getblance_amount9();
|
|
||||||
String getexpense_rate9();
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public static interface ExpenseInfoResult {
|
|
||||||
String getseq();
|
|
||||||
String getexpense_date();
|
|
||||||
String getexpense_item();
|
|
||||||
String getamount();
|
|
||||||
String getmodi_id();
|
|
||||||
String getmodi_date();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public static interface CodeResult {
|
|
||||||
String getOrgName();
|
|
||||||
String getOrgCode();
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,8 @@ package com.dbnt.faisp.main.budget.service;
|
||||||
|
|
||||||
import com.dbnt.faisp.main.budget.common.BaseException;
|
import com.dbnt.faisp.main.budget.common.BaseException;
|
||||||
import com.dbnt.faisp.main.budget.common.ResultResponseCode;
|
import com.dbnt.faisp.main.budget.common.ResultResponseCode;
|
||||||
import com.dbnt.faisp.main.budget.model.BudgetDto;
|
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.budget.repository.BudgetRepository.*;
|
import com.dbnt.faisp.main.budget.repository.BudgetRepository.*;
|
||||||
import com.dbnt.faisp.main.equip.model.Equip;
|
import com.dbnt.faisp.main.equip.model.Equip;
|
||||||
|
|
@ -14,6 +15,7 @@ import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -23,13 +25,21 @@ import java.util.*;
|
||||||
public class BudgetService {
|
public class BudgetService {
|
||||||
|
|
||||||
private final BudgetRepository budgetRepository;
|
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");
|
|
||||||
|
/*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 budgetRepository.callSpGetBudgetCodeYearList();
|
||||||
|
return budgetMapper.callSpGetBudgetCodeYearList();
|
||||||
}
|
}
|
||||||
|
|
||||||
// 예산편성 - 연도추가(버튼)
|
// 예산편성 - 연도추가(버튼)
|
||||||
|
|
@ -37,14 +47,19 @@ public class BudgetService {
|
||||||
public void copyYearBudgeting(UserInfo loginUser, BudgetDto.BudgetingCopyReqeust requestDto){
|
public void copyYearBudgeting(UserInfo loginUser, BudgetDto.BudgetingCopyReqeust requestDto){
|
||||||
// System.out.println(requestDto.getYear());
|
// System.out.println(requestDto.getYear());
|
||||||
// System.out.println(requestDto.getCopyYear());
|
// System.out.println(requestDto.getCopyYear());
|
||||||
UpdateResult result = budgetRepository.callSpCopyBudgetItem(requestDto.getYear(), requestDto.getCopyYear(), loginUser.getUserId());
|
// 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);
|
||||||
|
|
||||||
if(result.get_result_code().equals("100")) {
|
if(result.getResultCode().equals("100")) {
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
System.out.println(result.get_error_message());
|
// System.out.println(result.getErrorMessage());
|
||||||
System.out.println(result.get_result_code());
|
// System.out.println(result.getResultCode());
|
||||||
System.out.println(result.get_result_count());
|
// System.out.println(result.getResultCount());
|
||||||
throw new BaseException(ResultResponseCode.FOUND_YEAR);
|
throw new BaseException(ResultResponseCode.FOUND_YEAR);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -55,19 +70,23 @@ public class BudgetService {
|
||||||
public void deleteBudgetingYear(UserInfo loginUser, BudgetDto.BudgetingCopyReqeust requestDto){
|
public void deleteBudgetingYear(UserInfo loginUser, BudgetDto.BudgetingCopyReqeust requestDto){
|
||||||
// System.out.println(requestDto.getYear());
|
// System.out.println(requestDto.getYear());
|
||||||
// System.out.println(requestDto.getCopyYear());
|
// System.out.println(requestDto.getCopyYear());
|
||||||
UpdateResult result = budgetRepository.callBruteForceDeleteBudgetItem(requestDto.getYear(), "admin");
|
// UpdateResult result = budgetRepository.callBruteForceDeleteBudgetItem(requestDto.getYear(), "admin");
|
||||||
|
BudgetParams params = new BudgetParams();
|
||||||
|
params.setYear(requestDto.getYear());
|
||||||
|
params.setId("admin");
|
||||||
|
UpdateResult result = budgetMapper.callBruteForceDeleteBudgetItem(params);
|
||||||
|
|
||||||
if(result.get_result_code().equals("100")) {
|
if(result.getResultCode().equals("100")) {
|
||||||
return;
|
return;
|
||||||
}else if( result.get_result_code().equals("93")){
|
}else if( result.getResultCode().equals("93")){
|
||||||
System.out.println(result.get_error_message());
|
// System.out.println(result.getErrorMessage());
|
||||||
System.out.println(result.get_result_code());
|
// System.out.println(result.getResultCode());
|
||||||
System.out.println(result.get_result_count());
|
// System.out.println(result.getResultCount());
|
||||||
throw new BaseException(ResultResponseCode.NOT_FOUND_YEAR);
|
throw new BaseException(ResultResponseCode.NOT_FOUND_YEAR);
|
||||||
} else {
|
} else {
|
||||||
System.out.println(result.get_error_message());
|
// System.out.println(result.getErrorMessage());
|
||||||
System.out.println(result.get_result_code());
|
// System.out.println(result.getResultCode());
|
||||||
System.out.println(result.get_result_count());
|
// System.out.println(result.getResultCount());
|
||||||
throw new BaseException(ResultResponseCode.DELETE_FOUND_VALUE);
|
throw new BaseException(ResultResponseCode.DELETE_FOUND_VALUE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -75,16 +94,23 @@ public class BudgetService {
|
||||||
//예산편성 - 항목추가
|
//예산편성 - 항목추가
|
||||||
@Transactional
|
@Transactional
|
||||||
public void insertBudgetingList(UserInfo loginUser, BudgetDto.BudgetingInsertReqeust requestDto){
|
public void insertBudgetingList(UserInfo loginUser, BudgetDto.BudgetingInsertReqeust requestDto){
|
||||||
System.out.println(requestDto.getYear());
|
// System.out.println(requestDto.getYear());
|
||||||
System.out.println(requestDto.getNameL1());
|
// System.out.println(requestDto.getNameL1());
|
||||||
System.out.println(requestDto.getNameL2());
|
// System.out.println(requestDto.getNameL2());
|
||||||
System.out.println(requestDto.getNameL3());
|
// System.out.println(requestDto.getNameL3());
|
||||||
UpdateResult result = budgetRepository.callSpAddBudgetPlanCodeName(requestDto.getYear(),requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), "OG001", "admin");
|
// UpdateResult result = budgetRepository.callSpAddBudgetPlanCodeName(requestDto.getYear(),requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), "OG001", "admin");
|
||||||
|
BudgetParams params = new BudgetParams();
|
||||||
System.out.println(result.get_error_message());
|
params.setYear(requestDto.getYear());
|
||||||
System.out.println(result.get_result_code());
|
params.setCode1(requestDto.getNameL1());
|
||||||
System.out.println(result.get_result_count());
|
params.setCode2(requestDto.getNameL2());
|
||||||
if(result.get_result_code().equals("100")) {
|
params.setCode3(requestDto.getNameL3());
|
||||||
|
params.setOrg("OG001");
|
||||||
|
params.setId("admin");
|
||||||
|
UpdateResult result = budgetMapper.callSpAddBudgetPlanCodeName(params);
|
||||||
|
// System.out.println(result.getErrorMessage());
|
||||||
|
// System.out.println(result.getResultCode());
|
||||||
|
// System.out.println(result.getResultCount());
|
||||||
|
if(result.getResultCode().equals("100")) {
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
throw new BaseException(ResultResponseCode.DUPLICATE_CODE);
|
throw new BaseException(ResultResponseCode.DUPLICATE_CODE);
|
||||||
|
|
@ -94,31 +120,50 @@ public class BudgetService {
|
||||||
|
|
||||||
//예산편성 - 항목변경
|
//예산편성 - 항목변경
|
||||||
public void updateBudgetingList(UserInfo loginUser, BudgetDto.BudgetingUpdateReqeust requestDto){
|
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());
|
// 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");
|
// UpdateResult result = budgetRepository.callSpUpdateBudgetPlanCodeName( requestDto.getYear(), requestDto.getPrevNameL1(), requestDto.getPrevNameL2(), requestDto.getPrevNameL3(),requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), "OG001", "admin");
|
||||||
System.out.println(result.get_error_message());
|
BudgetParams params = new BudgetParams();
|
||||||
System.out.println(result.get_result_code());
|
params.setYear(requestDto.getYear());
|
||||||
System.out.println(result.get_result_count());
|
params.setCode1(requestDto.getNameL1());
|
||||||
System.out.println(result);
|
params.setCode2(requestDto.getNameL2());
|
||||||
if(result.get_result_code().equals("100")) {
|
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;
|
return;
|
||||||
} else if (result.get_result_code().equals("91")) {
|
} else if (result.getResultCode().equals("91")) {
|
||||||
throw new BaseException(ResultResponseCode.DUPLICATE_CODE);
|
throw new BaseException(ResultResponseCode.DUPLICATE_CODE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//예산편성 - 항목삭제
|
//예산편성 - 항목삭제
|
||||||
public void deleteBudgetingList(UserInfo loginUser, BudgetDto.BudgetingInsertReqeust requestDto){
|
public void deleteBudgetingList(UserInfo loginUser, BudgetDto.BudgetingInsertReqeust requestDto){
|
||||||
System.out.println(requestDto.getYear());
|
// System.out.println(requestDto.getYear());
|
||||||
System.out.println(requestDto.getNameL1());
|
// System.out.println(requestDto.getNameL1());
|
||||||
System.out.println(requestDto.getNameL2());
|
// System.out.println(requestDto.getNameL2());
|
||||||
System.out.println(requestDto.getNameL3());
|
// System.out.println(requestDto.getNameL3());
|
||||||
UpdateResult result = budgetRepository.callSpDeleteBudgetPlanCodeName(requestDto.getYear(),requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), "OG001", "admin");
|
// 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.get_error_message());
|
// System.out.println(result.getErrorMessage());
|
||||||
System.out.println(result.get_result_code());
|
// System.out.println(result.getResultCode());
|
||||||
System.out.println(result.get_result_count());
|
// System.out.println(result.getResultCount());
|
||||||
if(result.get_result_code().equals("100")) {
|
if(result.getResultCode().equals("100")) {
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
throw new BaseException(ResultResponseCode.DELETE_FOUND_VALUE);
|
throw new BaseException(ResultResponseCode.DELETE_FOUND_VALUE);
|
||||||
|
|
@ -132,17 +177,26 @@ public class BudgetService {
|
||||||
// System.out.println(requestDto.getNameL1());
|
// System.out.println(requestDto.getNameL1());
|
||||||
// System.out.println(requestDto.getNameL2());
|
// System.out.println(requestDto.getNameL2());
|
||||||
// System.out.println(requestDto.getNameL3());
|
// System.out.println(requestDto.getNameL3());
|
||||||
UpdateResult result = budgetRepository.callSpUpdateBudgetPlanCodeItem(requestDto.getYear(), requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), requestDto.getAmount(),"OG001", "admin");
|
// 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);
|
||||||
|
|
||||||
// System.out.println(result.get_error_message());
|
// System.out.println(result.getErrorMessage());
|
||||||
// System.out.println(result.get_result_code());
|
// System.out.println(result.getResultCode());
|
||||||
// System.out.println(result.get_result_count());
|
// System.out.println(result.getResultCount());
|
||||||
if(result.get_result_code().equals("100")) {
|
if(result.getResultCode().equals("100")) {
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
System.out.println(result.get_error_message());
|
// System.out.println(result.getErrorMessage());
|
||||||
System.out.println(result.get_result_code());
|
// System.out.println(result.getResultCode());
|
||||||
System.out.println(result.get_result_count());
|
// System.out.println(result.getResultCount());
|
||||||
throw new BaseException(ResultResponseCode.DUPLICATE_CODE);
|
throw new BaseException(ResultResponseCode.DUPLICATE_CODE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -155,15 +209,19 @@ public class BudgetService {
|
||||||
// System.out.println(requestDto.getNameL1());
|
// System.out.println(requestDto.getNameL1());
|
||||||
// System.out.println(requestDto.getNameL2());
|
// System.out.println(requestDto.getNameL2());
|
||||||
// System.out.println(requestDto.getNameL3());
|
// System.out.println(requestDto.getNameL3());
|
||||||
UpdateResult result = budgetRepository.callSpDeleteBudgetPlan(requestDto.getYear(), "OG001", "admin");
|
// 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);
|
||||||
|
|
||||||
|
if(result.getResultCode().equals("100")) {
|
||||||
if(result.get_result_code().equals("100")) {
|
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
System.out.println(result.get_error_message());
|
// System.out.println(result.getErrorMessage());
|
||||||
System.out.println(result.get_result_code());
|
// System.out.println(result.getResultCode());
|
||||||
System.out.println(result.get_result_count());
|
// System.out.println(result.getResultCount());
|
||||||
throw new BaseException(ResultResponseCode.NOT_FOUND_CODE);
|
throw new BaseException(ResultResponseCode.NOT_FOUND_CODE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -175,48 +233,70 @@ public class BudgetService {
|
||||||
// System.out.println(requestDto.getYear());
|
// System.out.println(requestDto.getYear());
|
||||||
// System.out.println(requestDto.getStDate());
|
// System.out.println(requestDto.getStDate());
|
||||||
// System.out.println(requestDto.getEdDate());
|
// System.out.println(requestDto.getEdDate());
|
||||||
return budgetRepository.callSpGetBudgetAssignInfo(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);
|
||||||
}
|
}
|
||||||
|
|
||||||
//(공통) 2단계로 하위청 뿌려주기
|
//(공통) 2단계로 하위청 뿌려주기
|
||||||
public List<CodeResult> selectDownOrg(String userOrgCode){
|
public List<CodeResult> selectDownOrg(String userOrgCode){
|
||||||
return budgetRepository.callSpGetDownOrg(userOrgCode);
|
// return budgetRepository.callSpGetDownOrg(userOrgCode);
|
||||||
|
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 budgetRepository.callSpGetLowerOrgCodeByName();
|
||||||
|
return budgetMapper.callSpGetLowerOrgCodeByName();
|
||||||
}
|
}
|
||||||
|
|
||||||
//상위 기관 코드 가져오기 (3단계인경우만)
|
//상위 기관 코드 가져오기 (3단계인경우만)
|
||||||
public String selectGetHighOrgCode(String userOrgCode){
|
public String selectGetHighOrgCode(String userOrgCode){
|
||||||
return budgetRepository.callSpGetHighOrgCode(userOrgCode);
|
// return budgetRepository.callSpGetHighOrgCode(userOrgCode);
|
||||||
|
BudgetParams params = new BudgetParams();
|
||||||
|
params.setOrg(userOrgCode);
|
||||||
|
return budgetMapper.callSpGetHighOrgCode(params);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 예산배정 - 등록(저장버튼)
|
// 예산배정 - 등록(저장버튼)
|
||||||
@Transactional
|
@Transactional
|
||||||
public void updateAssignList(UserInfo loginUser, BudgetDto.AssignSaveReqeust requestDto){
|
public void updateAssignList(UserInfo loginUser, BudgetDto.AssignSaveReqeust requestDto){
|
||||||
|
|
||||||
System.out.println(requestDto.getCode());
|
// System.out.println(requestDto.getCode());
|
||||||
System.out.println(requestDto.getOrg());
|
// System.out.println(requestDto.getOrg());
|
||||||
System.out.println(requestDto.getYear());
|
// System.out.println(requestDto.getYear());
|
||||||
// System.out.println(requestDto.getAmount());
|
// System.out.println(requestDto.getAmount());
|
||||||
UpdateResult result = budgetRepository.callSpAddBudgetAssign(requestDto.getCode(),requestDto.getOrg(),requestDto.getOrg1(), requestDto.getAmount(), "2023-03-15");
|
// 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);
|
||||||
|
|
||||||
System.out.println(result.get_error_message());
|
// System.out.println(result.getErrorMessage());
|
||||||
System.out.println(result.get_result_code());
|
// System.out.println(result.getResultCode());
|
||||||
System.out.println(result.get_result_count());
|
// System.out.println(result.getResultCount());
|
||||||
if(result.get_result_code().equals("100")) {
|
if(result.getResultCode().equals("100")) {
|
||||||
return;
|
return;
|
||||||
}else if(result.get_result_code().equals("72")) {
|
}else if(result.getResultCode().equals("72")) {
|
||||||
System.out.println(result.get_error_message());
|
// System.out.println(result.getErrorMessage());
|
||||||
System.out.println(result.get_result_code());
|
// System.out.println(result.getResultCode());
|
||||||
System.out.println(result.get_result_count());
|
// System.out.println(result.getResultCount());
|
||||||
throw new BaseException(ResultResponseCode.EXPENSE_OVER_VALUE);
|
throw new BaseException(ResultResponseCode.EXPENSE_OVER_VALUE);
|
||||||
} else {
|
} else {
|
||||||
System.out.println(result.get_error_message());
|
// System.out.println(result.getErrorMessage());
|
||||||
System.out.println(result.get_result_code());
|
// System.out.println(result.getResultCode());
|
||||||
System.out.println(result.get_result_count());
|
// System.out.println(result.getResultCount());
|
||||||
throw new BaseException(ResultResponseCode.DUPLICATE_CODE);
|
throw new BaseException(ResultResponseCode.DUPLICATE_CODE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -224,19 +304,33 @@ public class BudgetService {
|
||||||
|
|
||||||
//집행관리
|
//집행관리
|
||||||
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.getYear());
|
||||||
System.out.println(requestDto.getCode());
|
// System.out.println(requestDto.getCode());
|
||||||
System.out.println(java.sql.Date.valueOf(requestDto.getStDate()));
|
// System.out.println(java.sql.Date.valueOf(requestDto.getStDate()));
|
||||||
System.out.println(requestDto.getEdDate());
|
// 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()));
|
// 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
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.getYear());
|
||||||
System.out.println(requestDto.getNameL1());
|
// System.out.println(requestDto.getNameL1());
|
||||||
System.out.println(requestDto.getNameL2());
|
// System.out.println(requestDto.getNameL2());
|
||||||
System.out.println(requestDto.getNameL3());
|
// System.out.println(requestDto.getNameL3());
|
||||||
return budgetRepository.callSpGetBudgetExpense(requestDto.getYear(), requestDto.getNameL1(), requestDto.getNameL2(), 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
|
|
@ -245,14 +339,25 @@ public class BudgetService {
|
||||||
// System.out.println(requestDto.getNameL1());
|
// System.out.println(requestDto.getNameL1());
|
||||||
// System.out.println(requestDto.getNameL2());
|
// System.out.println(requestDto.getNameL2());
|
||||||
// System.out.println(requestDto.getNameL3());
|
// 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()));
|
// UpdateResult result = budgetRepository.callSpAddBudgetExpense(requestDto.getYear(),requestDto.getNameL1(),requestDto.getNameL2(),requestDto.getNameL3(), "본청", requestDto.getItem(), requestDto.getAmount(), java.sql.Date.valueOf(requestDto.getExpenseDate()));
|
||||||
|
|
||||||
System.out.println(result.get_error_message());
|
BudgetParams params = new BudgetParams();
|
||||||
System.out.println(result.get_result_code());
|
params.setYear(requestDto.getYear());
|
||||||
System.out.println(result.get_result_count());
|
params.setCode1(requestDto.getNameL1());
|
||||||
if(result.get_result_code().equals("100")) {
|
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;
|
return;
|
||||||
}else if(result.get_result_code().equals("71")) {
|
}else if(result.getResultCode().equals("71")) {
|
||||||
throw new BaseException(ResultResponseCode.EXPENSE_OVER_VALUE);
|
throw new BaseException(ResultResponseCode.EXPENSE_OVER_VALUE);
|
||||||
} else {
|
} else {
|
||||||
throw new BaseException(ResultResponseCode.ERROR);
|
throw new BaseException(ResultResponseCode.ERROR);
|
||||||
|
|
@ -261,26 +366,49 @@ public class BudgetService {
|
||||||
}
|
}
|
||||||
|
|
||||||
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.getYear());
|
||||||
System.out.println(requestDto.getCode());
|
// System.out.println(requestDto.getCode());
|
||||||
System.out.println(java.sql.Date.valueOf(requestDto.getStDate()));
|
// System.out.println(java.sql.Date.valueOf(requestDto.getStDate()));
|
||||||
System.out.println(requestDto.getEdDate());
|
// System.out.println(requestDto.getEdDate());
|
||||||
System.out.println(requestDto.getWon());
|
// 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());
|
// 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
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.getYear());
|
||||||
System.out.println(requestDto.getCode());
|
// System.out.println(requestDto.getCode());
|
||||||
System.out.println(java.sql.Date.valueOf(requestDto.getStDate()));
|
// System.out.println(java.sql.Date.valueOf(requestDto.getStDate()));
|
||||||
System.out.println(requestDto.getEdDate());
|
// System.out.println(requestDto.getEdDate());
|
||||||
System.out.println(requestDto.getWon());
|
// 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());
|
// 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<L3CodeResult> selectSpGetL3Code(UserInfo loginUser,String year){
|
public List<L3CodeResult> selectSpGetL3Code(UserInfo loginUser,String year){
|
||||||
|
|
||||||
return budgetRepository.callSpGetBudgetCodeL3(year);
|
// return budgetRepository.callSpGetBudgetCodeL3(year);
|
||||||
|
|
||||||
|
BudgetParams params = new BudgetParams();
|
||||||
|
params.setYear(year);
|
||||||
|
return budgetMapper.callSpGetBudgetCodeL3(params);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,90 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
|
|
||||||
|
<mapper namespace="com.dbnt.faisp.main.budget.mapper.BudgetMapper">
|
||||||
|
<select id="callSpGetBudgetPlanInfo" parameterType="BudgetParams" resultType="BudgetingList">
|
||||||
|
select
|
||||||
|
budget_name_l1 as budgetNameL1,
|
||||||
|
budget_name_l2 as budgetNameL2,
|
||||||
|
budget_name_l3 as budgetNameL3,
|
||||||
|
budget_code_l3 as budgetCodeL3,
|
||||||
|
amount,
|
||||||
|
remark,
|
||||||
|
modi_id as modiId,
|
||||||
|
modi_date as modiDate
|
||||||
|
from public.sp_get_budget_plan_info(#{code1}, #{code2}, #{code3})
|
||||||
|
</select>
|
||||||
|
<select id="callSpGetBudgetCodeYearList" resultType="YearResult">
|
||||||
|
select l1_year as year
|
||||||
|
from public.sp_get_budget_code_year_list( )
|
||||||
|
</select>
|
||||||
|
<select id="callSpCopyBudgetItem" resultType="UpdateResult" parameterType="BudgetParams">
|
||||||
|
call public.sp_copy_budget_item (#{year},#{copyYear},#{id},NULL,NULL,NULL)
|
||||||
|
</select>
|
||||||
|
<select id="callBruteForceDeleteBudgetItem" resultType="UpdateResult" parameterType="BudgetParams">
|
||||||
|
call public.sp_brute_force_delete_budget_item(#{year}, #{id},NULL,NULL,NULL)
|
||||||
|
</select>
|
||||||
|
<select id="callSpAddBudgetPlanCodeName" resultType="UpdateResult" parameterType="BudgetParams">
|
||||||
|
call public.sp_add_budget_plan_codename (#{year}, #{code1}, #{code2}, #{code3}, #{org}, #{id} ,NULL, NULL, NULL)
|
||||||
|
</select>
|
||||||
|
<select id="callSpUpdateBudgetPlanCodeName" resultType="UpdateResult" parameterType="BudgetParams">
|
||||||
|
call public.sp_update_budget_plan_codename(#{year}, #{code1}, #{code2}, #{code3}, #{newCode1}, #{newCode2}, #{newCode3}, #{org},#{id},NULL,NULL,NULL)
|
||||||
|
</select>
|
||||||
|
<select id="callSpDeleteBudgetPlanCodeName" resultType="UpdateResult" parameterType="BudgetParams">
|
||||||
|
call public.sp_delete_budget_plan_codename(#{year}, #{code1}, #{code2}, #{code3}, #{org},#{id},NULL,NULL,NULL)
|
||||||
|
</select>
|
||||||
|
<select id="callSpUpdateBudgetPlanCodeItem" resultType="UpdateResult" parameterType="BudgetParams">
|
||||||
|
call public.sp_update_budget_plan_item (#{year}, #{code1}, #{code2}, #{code3}, #{amount}::int, #{org}, #{id},NULL, NULL, NULL)
|
||||||
|
</select>
|
||||||
|
<select id="callSpDeleteBudgetPlan" resultType="UpdateResult" parameterType="BudgetParams">
|
||||||
|
call public.sp_clear_budget_plan(#{year}, #{org}, #{id},NULL,NULL,NULL)
|
||||||
|
</select>
|
||||||
|
<select id="callSpGetBudgetAssignInfo" resultType="AssignResult" parameterType="BudgetParams">
|
||||||
|
select *
|
||||||
|
from public.sp_get_budget_assign_info(#{year}, #{code}, #{user} ,#{stDate}::date, #{edDate}::date)
|
||||||
|
</select>
|
||||||
|
<select id="callSpGetDownOrg" resultType="CodeResult" parameterType="BudgetParams">
|
||||||
|
select org_code as orgCode,
|
||||||
|
org_name as orgName
|
||||||
|
from public.sp_get_down_org(#{org})
|
||||||
|
</select>
|
||||||
|
<select id="callSpGetLowerOrgCodeByName" resultType="CodeResult" parameterType="BudgetParams">
|
||||||
|
select org_code as orgCode,
|
||||||
|
org_name as orgName
|
||||||
|
from public.sp_get_lower_org_code_by_name('본청')
|
||||||
|
</select>
|
||||||
|
<select id="callSpGetHighOrgCode" resultType="String" parameterType="BudgetParams">
|
||||||
|
select *
|
||||||
|
from public.sp_get_high_org_code(#{org})
|
||||||
|
</select>
|
||||||
|
<select id="callSpAddBudgetAssign" resultType="UpdateResult" parameterType="BudgetParams">
|
||||||
|
call public.sp_add_budget_assign(#{code}, #{org}, #{org}1, #{amount}::int, #{dt}::date, 'admin', NULL,NULL,NULL)
|
||||||
|
</select>
|
||||||
|
<select id="callSpGetBudgetExpenseInfo" resultType="ExpenseResult" parameterType="BudgetParams">
|
||||||
|
select *
|
||||||
|
from public.sp_get_budget_expense_info(#{year},#{code},#{user},#{stDate}::date,#{edDate}::date)
|
||||||
|
</select>
|
||||||
|
<select id="callSpGetBudgetExpense" resultType="ExpenseInfoResult" parameterType="BudgetParams">
|
||||||
|
select * from public.sp_get_budget_expense(#{year},#{code1},#{code2},#{code3},#{org},1,2,20,1)
|
||||||
|
</select>
|
||||||
|
<select id="callSpAddBudgetExpense" resultType="UpdateResult" parameterType="BudgetParams">
|
||||||
|
call public.sp_add_budget_EXPENSE(#{year},#{code1},#{code2},#{code3}, #{org}, #{item} ,cast (#{amount} as bigint), #{dt}::date,'admin',NULL,NULL,NULL)
|
||||||
|
</select>
|
||||||
|
<select id="callSpUpdateBudgetExpense" resultType="ExpenseResult" parameterType="BudgetParams">
|
||||||
|
call public.sp_update_budget_expense(#{seq},#{item} ,#{amount}::int,NULL,NULL,NULL,NULL,NULL)
|
||||||
|
</select>
|
||||||
|
<select id="callSpGetbudgetStatOrg" resultType="ExpenseResult" parameterType="BudgetParams">
|
||||||
|
select *
|
||||||
|
from public.sp_get_budget_statistics_by_org(#{year},#{code},#{user},#{stDate}::date,#{edDate}::date,#{won})
|
||||||
|
</select>
|
||||||
|
<select id="callSpGetbudgetStatDetail" resultType="StatsItemResult" parameterType="BudgetParams">
|
||||||
|
select *
|
||||||
|
from public.sp_get_budget_statistics_by_item(#{year},#{code},#{item}, #{user},#{stDate}::date,#{edDate}::date,#{won})
|
||||||
|
</select>
|
||||||
|
<select id="callSpGetBudgetCodeL3" resultType="L3CodeResult" parameterType="BudgetParams">
|
||||||
|
select *
|
||||||
|
from public.sp_get_budget_code_l3(#{year},null,null,null)
|
||||||
|
</select>
|
||||||
|
</mapper>
|
||||||
|
|
@ -339,8 +339,8 @@ $(document).on('click', '#assignSaveBtn', function (){
|
||||||
params = {}
|
params = {}
|
||||||
params.year = $("#orgYear").val();
|
params.year = $("#orgYear").val();
|
||||||
// console.dir($("#org"+j+"_amount"+i)[0].dataset.code);
|
// console.dir($("#org"+j+"_amount"+i)[0].dataset.code);
|
||||||
params.code = $("#org"+j+"_amount"+i)[0].dataset.code;
|
params.code = $("#org"+j+"Amount"+i)[0].dataset.code;
|
||||||
params.amount = $("#org"+j+"_amount"+i).val() == "" ? 0 :$("#org"+j+"_amount"+i).val()
|
params.amount = $("#org"+j+"Amount"+i).val() == "" ? 0 :$("#org"+j+"Amount"+i).val()
|
||||||
params.org = $("#code").val();
|
params.org = $("#code").val();
|
||||||
params.org1 = $("#orgSave"+j).text();
|
params.org1 = $("#orgSave"+j).text();
|
||||||
// console.dir(params.org);
|
// console.dir(params.org);
|
||||||
|
|
|
||||||
|
|
@ -81,60 +81,60 @@
|
||||||
</thead>
|
</thead>
|
||||||
<tbody class="table-group-divider" id="ResultRow">
|
<tbody class="table-group-divider" id="ResultRow">
|
||||||
<tr th:each="info, i : ${list}">
|
<tr th:each="info, i : ${list}">
|
||||||
<td th:text="${info.getbudget_name_l1}"></td>
|
<td th:text="${info.budgetNameL1}"></td>
|
||||||
<td th:text="${info.getbudget_name_l2}"></td>
|
<td th:text="${info.budgetNameL2}"></td>
|
||||||
<td th:text="${info.getbudget_name_l3}"></td>
|
<td th:text="${info.budgetNameL3}"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getplan_amount,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.planAmount,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.gettotal_assign_amount,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.totalAssignAmount,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<th:block th:each="orglist, j : ${downOrgList}">
|
<th:block th:each="orglist, j : ${downOrgList}">
|
||||||
<th:block th:if="${j.index} == '0'">
|
<th:block th:if="${j.index} == '0'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount1,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount1,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getsum_assign_amount1,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.sumAssignAmount1,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '1'">
|
<th:block th:if="${j.index} == '1'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount2,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount2,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getsum_assign_amount2,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.sumAssignAmount2,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '2'">
|
<th:block th:if="${j.index} == '2'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount3,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount3,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getsum_assign_amount3,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.sumAssignAmount3,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '3'">
|
<th:block th:if="${j.index} == '3'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount4,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount4,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getsum_assign_amount4,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.sumAssignAmount4,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '4'">
|
<th:block th:if="${j.index} == '4'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount5,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount5,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getsum_assign_amount5,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.sumAssignAmount5,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '5'">
|
<th:block th:if="${j.index} == '5'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount6,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount6,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getsum_assign_amount6,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.sumAssignAmount6,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '6'">
|
<th:block th:if="${j.index} == '6'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount7,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount7,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getsum_assign_amount7,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.sumAssignAmount7,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '7'">
|
<th:block th:if="${j.index} == '7'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount8,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount8,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getsum_assign_amount8,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.sumAssignAmount8,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
</th:block>
|
</th:block>
|
||||||
|
|
|
||||||
|
|
@ -46,89 +46,89 @@
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr class="odd gradeX reporterTr grid" th:each="info, i : ${list}">
|
<tr class="odd gradeX reporterTr grid" th:each="info, i : ${list}">
|
||||||
<td class="table-secondary" th:text="${info.getbudget_name_l1}"></td>
|
<td class="table-secondary" th:text="${info.budgetNameL1}"></td>
|
||||||
<td class="table-secondary" th:text="${info.getbudget_name_l2}"></td>
|
<td class="table-secondary" th:text="${info.budgetNameL2}"></td>
|
||||||
<td class="table-secondary" th:text="${info.getbudget_name_l3}"></td>
|
<td class="table-secondary" th:text="${info.budgetNameL3}"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getplan_amount,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.planAmount,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.gettotal_assign_amount,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.totalAssignAmount,1,'COMMA')}" class="text-end"></td>
|
||||||
<th:block th:each="orglist, j : ${downOrgList}">
|
<th:block th:each="orglist, j : ${downOrgList}">
|
||||||
<th:block th:if="${j.index} == '0'">
|
<th:block th:if="${j.index} == '0'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount1,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount1,1,'COMMA')}" class="text-end"></td>
|
||||||
<td>
|
<td>
|
||||||
<input type="text" th:id="'org0_amount'+${i.index}" name="year" value="" class="w-100 text-end"
|
<input type="text" th:id="'org0Amount'+${i.index}" name="year" value="" class="w-100 text-end"
|
||||||
th:data-code="${info?.getbudget_code_l3}"
|
th:data-code="${info?.budgetCodeL3}"
|
||||||
oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"
|
oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"
|
||||||
/></td>
|
/></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getsum_assign_amount1,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.sumAssignAmount1,1,'COMMA')}" class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '1'">
|
<th:block th:if="${j.index} == '1'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount2,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount2,1,'COMMA')}" class="text-end"></td>
|
||||||
<td>
|
<td>
|
||||||
<input type="text" th:id="'org1_amount'+${i.index}" name="year" value="" class="w-100 text-end"
|
<input type="text" th:id="'org1Amount'+${i.index}" name="year" value="" class="w-100 text-end"
|
||||||
th:data-code="${info?.getbudget_code_l3}"
|
th:data-code="${info?.budgetCodeL3}"
|
||||||
oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"
|
oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"
|
||||||
/></td>
|
/></td>
|
||||||
</td>
|
</td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getsum_assign_amount2,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.sumAssignAmount2,1,'COMMA')}" class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '2'">
|
<th:block th:if="${j.index} == '2'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount3,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount3,1,'COMMA')}" class="text-end"></td>
|
||||||
<td>
|
<td>
|
||||||
<input type="text" th:id="'org2_amount'+${i.index}" name="year" value="" class="w-100 text-end"
|
<input type="text" th:id="'org2Amount'+${i.index}" name="year" value="" class="w-100 text-end"
|
||||||
th:data-code="${info?.getbudget_code_l3}"
|
th:data-code="${info?.budgetCodeL3}"
|
||||||
oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"
|
oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"
|
||||||
/></td>
|
/></td>
|
||||||
</td>
|
</td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getsum_assign_amount3,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.sumAssignAmount3,1,'COMMA')}" class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '3'">
|
<th:block th:if="${j.index} == '3'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount4,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount4,1,'COMMA')}" class="text-end"></td>
|
||||||
<td>
|
<td>
|
||||||
<input type="text" th:id="'org3_amount'+${i.index}" name="year" value="" class="w-100 text-end"
|
<input type="text" th:id="'org3Amount'+${i.index}" name="year" value="" class="w-100 text-end"
|
||||||
th:data-code="${info?.getbudget_code_l3}"
|
th:data-code="${info?.budgetCodeL3}"
|
||||||
oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"
|
oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"
|
||||||
/></td>
|
/></td>
|
||||||
</td>
|
</td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getsum_assign_amount4,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.sumAssignAmount4,1,'COMMA')}" class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '4'">
|
<th:block th:if="${j.index} == '4'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount5,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount5,1,'COMMA')}" class="text-end"></td>
|
||||||
<td>
|
<td>
|
||||||
<input type="text" th:id="'org4_amount'+${i.index}" name="year" value="" class="w-100 text-end"
|
<input type="text" th:id="'org4Amount'+${i.index}" name="year" value="" class="w-100 text-end"
|
||||||
th:data-code="${info?.getbudget_code_l3}"
|
th:data-code="${info?.budgetCodeL3}"
|
||||||
oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"
|
oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"
|
||||||
/></td>
|
/></td>
|
||||||
</td>
|
</td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getsum_assign_amount5,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.sumAssignAmount5,1,'COMMA')}" class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '5'">
|
<th:block th:if="${j.index} == '5'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount6,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount6,1,'COMMA')}" class="text-end"></td>
|
||||||
<td>
|
<td>
|
||||||
<input type="text" th:id="'org5_amount'+${i.index}" name="year" value="" class="w-100 text-end"
|
<input type="text" th:id="'org5Amount'+${i.index}" name="year" value="" class="w-100 text-end"
|
||||||
th:data-code="${info?.getbudget_code_l3}"
|
th:data-code="${info?.budgetCodeL3}"
|
||||||
oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"
|
oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"
|
||||||
/></td>
|
/></td>
|
||||||
</td>
|
</td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getsum_assign_amount6,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.sumAssignAmount6,1,'COMMA')}" class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '6'">
|
<th:block th:if="${j.index} == '6'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount7,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount7,1,'COMMA')}" class="text-end"></td>
|
||||||
<td>
|
<td>
|
||||||
<input type="text" th:id="'org6_amount'+${i.index}" name="year" value="" class="w-100 text-end"
|
<input type="text" th:id="'org6Amount'+${i.index}" name="year" value="" class="w-100 text-end"
|
||||||
th:data-code="${info?.getbudget_code_l3}"
|
th:data-code="${info?.budgetCodeL3}"
|
||||||
oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"
|
oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"
|
||||||
/></td>
|
/></td>
|
||||||
</td>
|
</td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getsum_assign_amount7,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.sumAssignAmount7,1,'COMMA')}" class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '7'">
|
<th:block th:if="${j.index} == '7'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount8,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount8,1,'COMMA')}" class="text-end"></td>
|
||||||
<td>
|
<td>
|
||||||
<input type="text" th:id="'org7_amount'+${i.index}" name="year" value="" class="w-100 text-end"
|
<input type="text" th:id="'org7Amount'+${i.index}" name="year" value="" class="w-100 text-end"
|
||||||
th:data-code="${info?.getbudget_code_l3}"
|
th:data-code="${info?.budgetCodeL3}"
|
||||||
oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"/>
|
oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"/>
|
||||||
</td>
|
</td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getsum_assign_amount8,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.sumAssignAmount8,1,'COMMA')}" class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
</th:block>
|
</th:block>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
||||||
|
|
@ -85,99 +85,99 @@
|
||||||
</thead>
|
</thead>
|
||||||
<tbody class="table-group-divider" id="ResultRow">
|
<tbody class="table-group-divider" id="ResultRow">
|
||||||
<tr class="faRptTr" th:each="info, i : ${list}" onclick="getEditModal(this)"
|
<tr class="faRptTr" th:each="info, i : ${list}" onclick="getEditModal(this)"
|
||||||
th:data-name1="${info.getbudget_name_l1}"
|
th:data-name1="${info.budgetNameL1}"
|
||||||
th:data-name2="${info.getbudget_name_l2}"
|
th:data-name2="${info.budgetNameL2}"
|
||||||
th:data-name3="${info.getbudget_name_l3}">
|
th:data-name3="${info.budgetNameL3}">
|
||||||
<td th:text="${info.getbudget_name_l1}"></td>
|
<td th:text="${info.budgetNameL1}"></td>
|
||||||
<td th:text="${info.getbudget_name_l2}"></td>
|
<td th:text="${info.budgetNameL2}"></td>
|
||||||
<td th:text="${info.getbudget_name_l3}"></td>
|
<td th:text="${info.budgetNameL3}"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getplan_amount,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.planAmount,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.gettotal_assign_amount,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.totalAssignAmount,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_t_amount,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.expenseTAmount,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getbalance_t_amount,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.balanceTAmount,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<th:block th:each="orglist, j : ${downOrgList}">
|
<th:block th:each="orglist, j : ${downOrgList}">
|
||||||
<th:block th:if="${j.index} == '0'">
|
<th:block th:if="${j.index} == '0'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount1,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount1,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_p_amount1,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.expensePAmount1,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getblance_amount1,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.blanceAmount1,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_rate1,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.expenseRate1,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '1'">
|
<th:block th:if="${j.index} == '1'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount2,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount2,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_p_amount2,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.expensePAmount2,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getblance_amount2,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.blanceAmount2,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_rate2,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.expenseRate2,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '2'">
|
<th:block th:if="${j.index} == '2'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount3,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount3,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_p_amount3,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.expensePAmount3,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getblance_amount3,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.blanceAmount3,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_rate3,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.expenseRate3,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '3'">
|
<th:block th:if="${j.index} == '3'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount4,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount4,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_p_amount4,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.expensePAmount4,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getblance_amount4,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.blanceAmount4,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_rate4,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.expenseRate4,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '4'">
|
<th:block th:if="${j.index} == '4'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount5,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount5,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_p_amount5,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.expensePAmount5,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getblance_amount5,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.blanceAmount5,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_rate5,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.expenseRate5,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '5'">
|
<th:block th:if="${j.index} == '5'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount6,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount6,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_p_amount6,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.expensePAmount6,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getblance_amount6,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.blanceAmount6,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_rate6,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.expenseRate6,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '6'">
|
<th:block th:if="${j.index} == '6'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount7,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount7,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_p_amount7,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.expensePAmount7,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getblance_amount7,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.blanceAmount7,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_rate7,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.expenseRate7,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '7'">
|
<th:block th:if="${j.index} == '7'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount8,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount8,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_p_amount8,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.expensePAmount8,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getblance_amount8,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.blanceAmount8,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_rate8,1,'COMMA')}"
|
<td th:text="${#numbers.formatInteger(info.expenseRate8,1,'COMMA')}"
|
||||||
class="text-end"></td>
|
class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
</th:block>
|
</th:block>
|
||||||
|
|
|
||||||
|
|
@ -78,11 +78,11 @@
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr class="odd gradeX reporterTr grid" th:each="info, i : ${list}">
|
<tr class="odd gradeX reporterTr grid" th:each="info, i : ${list}">
|
||||||
<td th:text="${info.getexpense_date}"></td>
|
<td th:text="${info.expenseDate}"></td>
|
||||||
<td th:text="${info.getexpense_item}"></td>
|
<td th:text="${info.expenseItem}"></td>
|
||||||
<td th:text="${info.getamount}"></td>
|
<td th:text="${info.amount}"></td>
|
||||||
<td th:text="${info.getmodi_id}"></td>
|
<td th:text="${info.modiId}"></td>
|
||||||
<td th:text="${info.getmodi_date}"></td>
|
<td th:text="${info.modiDate}"></td>
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
<th:block th:if="${#lists.isEmpty(list)}">
|
<th:block th:if="${#lists.isEmpty(list)}">
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<select class="form-select form-select-sm" name="item" id="item">
|
<select class="form-select form-select-sm" name="item" id="item">
|
||||||
<option th:each="code, i : ${codeList}" th:value="${code?.getl3_code}" th:text="${code?.getl3_name}" th:selected="${searchParams?.item eq code.getl3_code}">2023</option>
|
<option th:each="code, i : ${codeList}" th:value="${code?.l3Code}" th:text="${code?.l3Name}" th:selected="${searchParams?.item eq code.l3Code}">2023</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
|
|
@ -97,12 +97,12 @@
|
||||||
</thead>
|
</thead>
|
||||||
<tbody class="table-group-divider" id="ResultRow">
|
<tbody class="table-group-divider" id="ResultRow">
|
||||||
<tr class="faRptTr" th:each="info, i : ${list}">
|
<tr class="faRptTr" th:each="info, i : ${list}">
|
||||||
<td th:text="${info.getorg_name}"></td>
|
<td th:text="${info.orgName}"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getplan_amount,1,'COMMA')}"></td>
|
<td th:text="${#numbers.formatInteger(info.planAmount,1,'COMMA')}"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.gettotal_assign_amount,1,'COMMA')}"></td>
|
<td th:text="${#numbers.formatInteger(info.totalAssignAmount,1,'COMMA')}"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_t_amount,1,'COMMA')}"></td>
|
<td th:text="${#numbers.formatInteger(info.expenseTAmount,1,'COMMA')}"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getbalance_t_amount,1,'COMMA')}"></td>
|
<td th:text="${#numbers.formatInteger(info.balanceTAmount,1,'COMMA')}"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_total_rate,1,'COMMA')}"></td>
|
<td th:text="${#numbers.formatInteger(info.ExpenseTotalRate,1,'COMMA')}"></td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
|
||||||
|
|
@ -103,62 +103,62 @@
|
||||||
</thead>
|
</thead>
|
||||||
<tbody class="table-group-divider" id="ResultRow">
|
<tbody class="table-group-divider" id="ResultRow">
|
||||||
<tr class="faRptTr" th:each="info, i : ${list}">
|
<tr class="faRptTr" th:each="info, i : ${list}">
|
||||||
<td th:text="${info.getbudget_name_l1}"></td>
|
<td th:text="${info.budgetNameL1}"></td>
|
||||||
<td th:text="${info.getbudget_name_l2}"></td>
|
<td th:text="${info.budgetNameL2}"></td>
|
||||||
<td th:text="${info.getbudget_name_l3}"></td>
|
<td th:text="${info.budgetNameL3}"></td>
|
||||||
|
|
||||||
<td th:text="${#numbers.formatInteger(info.getplan_amount,1,'COMMA')}"></td>
|
<td th:text="${#numbers.formatInteger(info.planAmount,1,'COMMA')}"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.gettotal_assign_amount,1,'COMMA')}"></td>
|
<td th:text="${#numbers.formatInteger(info.totalAssignAmount,1,'COMMA')}"></td>
|
||||||
<td th:text="${info.getexpense_t_amount}"></td>
|
<td th:text="${info.expenseTAmount}"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getbalance_t_amount,1,'COMMA')}"></td>
|
<td th:text="${#numbers.formatInteger(info.balanceTAmount,1,'COMMA')}"></td>
|
||||||
<th:block th:each="orglist, j : ${downOrgList}">
|
<th:block th:each="orglist, j : ${downOrgList}">
|
||||||
<th:block th:if="${j.index} == '0'">
|
<th:block th:if="${j.index} == '0'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount1,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount1,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_p_amount1,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.expensePAmount1,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getblance_amount1,1,'COMMA')}" class="text-end">11</td>
|
<td th:text="${#numbers.formatInteger(info.blanceAmount1,1,'COMMA')}" class="text-end">11</td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_rate1,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.expenseRate1,1,'COMMA')}" class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '1'">
|
<th:block th:if="${j.index} == '1'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount2,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount2,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_p_amount2,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.expensePAmount2,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getblance_amount2,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.blanceAmount2,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_rate2,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.expenseRate2,1,'COMMA')}" class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '2'">
|
<th:block th:if="${j.index} == '2'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount3,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount3,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_p_amount3,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.expensePAmount3,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getblance_amount3,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.blanceAmount3,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_rate3,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.expenseRate3,1,'COMMA')}" class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '3'">
|
<th:block th:if="${j.index} == '3'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount4,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount4,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_p_amount4,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.expensePAmount4,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getblance_amount4,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.blanceAmount4,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_rate4,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.expenseRate4,1,'COMMA')}" class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '4'">
|
<th:block th:if="${j.index} == '4'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount5,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount5,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_p_amount5,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.expensePAmount5,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getblance_amount5,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.blanceAmount5,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_rate5,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.expenseRate5,1,'COMMA')}" class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '5'">
|
<th:block th:if="${j.index} == '5'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount6,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount6,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_p_amount6,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.expensePAmount6,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getblance_amount6,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.blanceAmount6,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_rate6,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.expenseRate6,1,'COMMA')}" class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '6'">
|
<th:block th:if="${j.index} == '6'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount7,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount7,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_p_amount7,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.expensePAmount7,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getblance_amount7,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.blanceAmount7,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_rate7,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.expenseRate7,1,'COMMA')}" class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:if="${j.index} == '7'">
|
<th:block th:if="${j.index} == '7'">
|
||||||
<td th:text="${#numbers.formatInteger(info.getperiod_assign_amount8,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.periodAssignAmount8,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_p_amount8,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.expensePAmount8,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getblance_amount8,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.blanceAmount8,1,'COMMA')}" class="text-end"></td>
|
||||||
<td th:text="${#numbers.formatInteger(info.getexpense_rate8,1,'COMMA')}" class="text-end"></td>
|
<td th:text="${#numbers.formatInteger(info.expenseRate8,1,'COMMA')}" class="text-end"></td>
|
||||||
</th:block>
|
</th:block>
|
||||||
</th:block>
|
</th:block>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue