diff --git a/ga-api/src/main/java/com/ga/api/controller/approval/ApprovalController.java b/ga-api/src/main/java/com/ga/api/controller/approval/ApprovalController.java index bf196a0..03c532d 100644 --- a/ga-api/src/main/java/com/ga/api/controller/approval/ApprovalController.java +++ b/ga-api/src/main/java/com/ga/api/controller/approval/ApprovalController.java @@ -77,6 +77,20 @@ public class ApprovalController { return ApiResponse.ok(service.listRequests(param)); } + @GetMapping("/requests/mine") + @RequirePermission(menu = "APPROVAL", perm = "READ") + public ApiResponse> myRequests( + @ModelAttribute ApprovalRequestSearchParam param) { + return ApiResponse.ok(service.myRequests(param)); + } + + @GetMapping("/requests/pending") + @RequirePermission(menu = "APPROVAL", perm = "READ") + public ApiResponse> pendingRequests( + @ModelAttribute ApprovalRequestSearchParam param) { + return ApiResponse.ok(service.pendingRequests(param)); + } + @GetMapping("/requests/{requestId}") @RequirePermission(menu = "APPROVAL", perm = "READ") public ApiResponse detailRequest(@PathVariable Long requestId) { diff --git a/ga-api/src/main/java/com/ga/api/service/approval/ApprovalService.java b/ga-api/src/main/java/com/ga/api/service/approval/ApprovalService.java index 1bd44f4..4d4e4c3 100644 --- a/ga-api/src/main/java/com/ga/api/service/approval/ApprovalService.java +++ b/ga-api/src/main/java/com/ga/api/service/approval/ApprovalService.java @@ -100,6 +100,20 @@ public class ApprovalService { return PageResponse.of(requestMapper.selectList(param)); } + /** 내가 상신한 결재 요청 */ + public PageResponse myRequests(ApprovalRequestSearchParam param) { + param.setRequestedBy(SecurityUtil.getCurrentUserId()); + param.startPage(); + return PageResponse.of(requestMapper.selectList(param)); + } + + /** 진행 중(PENDING) 결재 요청 */ + public PageResponse pendingRequests(ApprovalRequestSearchParam param) { + param.setStatus("PENDING"); + param.startPage(); + return PageResponse.of(requestMapper.selectList(param)); + } + public ApprovalRequestResp detailRequest(Long requestId) { ApprovalRequestResp resp = requestMapper.selectById(requestId); if (resp == null) throw new BizException(ErrorCode.NOT_FOUND); diff --git a/ga-core/src/main/resources/mapper/accounting/ContractAccountingEntryMapper.xml b/ga-core/src/main/resources/mapper/accounting/ContractAccountingEntryMapper.xml index af22881..c5ced9e 100644 --- a/ga-core/src/main/resources/mapper/accounting/ContractAccountingEntryMapper.xml +++ b/ga-core/src/main/resources/mapper/accounting/ContractAccountingEntryMapper.xml @@ -10,7 +10,7 @@ cae.entry_id, cae.contract_id, - ac.contract_no, + ac.policy_no AS contract_no, cae.payment_id, a.agent_id, a.agent_name, @@ -45,8 +45,8 @@ AND cae.journal_no IS NULL - AND (ac.contract_no LIKE CONCAT('%', #{searchKeyword}, '%') - OR a.agent_name LIKE CONCAT('%', #{searchKeyword}, '%')) + AND (ac.policy_no LIKE CONCAT('%', #{searchKeyword}, '%') + OR a.agent_name LIKE CONCAT('%', #{searchKeyword}, '%')) ORDER BY cae.entry_date DESC, cae.entry_id DESC diff --git a/ga-core/src/main/resources/mapper/kpi/KpiMapper.xml b/ga-core/src/main/resources/mapper/kpi/KpiMapper.xml index 8f5f03b..e2d9248 100644 --- a/ga-core/src/main/resources/mapper/kpi/KpiMapper.xml +++ b/ga-core/src/main/resources/mapper/kpi/KpiMapper.xml @@ -32,7 +32,7 @@ total_tax, total_net, total_incentive, - refreshed_at + refreshed_at::timestamp AS refreshed_at FROM mv_monthly_summary @@ -62,7 +62,7 @@ total_chargeback, total_gross, total_net, - refreshed_at + refreshed_at::timestamp AS refreshed_at FROM mv_org_summary AND org_id = #{orgId} @@ -91,7 +91,7 @@ retained_25m, retention_rate_13m, retention_rate_25m, - refreshed_at + refreshed_at::timestamp AS refreshed_at FROM mv_retention AND carrier_id = #{carrierId} @@ -125,7 +125,7 @@ cum_chargeback, cum_override, cum_incentive, - refreshed_at + refreshed_at::timestamp AS refreshed_at FROM mv_cumulative