Merge branch 'dev' into deploy-dev-admin
This commit is contained in:
@@ -18,5 +18,5 @@ public class GetBankAutoTransferExpenseRecords {
|
||||
private String sourcePurpose;
|
||||
private String count;
|
||||
private String unitText;
|
||||
private Integer price;
|
||||
private Long price;
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ public class GetBankAutoTransferIncomeRecords {
|
||||
private String sourcePurpose;
|
||||
private String count;
|
||||
private String unitText;
|
||||
private Integer price;
|
||||
private Long price;
|
||||
private String category;
|
||||
private String incomeCode;
|
||||
private String expenseCode;
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
/* getBankAutoTransferIncomeRecords : 은행자동이체 (수입) 내역 목록 조회 */
|
||||
SELECT bat.id, /* 수입 id */
|
||||
ui_crop.code_text AS cropText, /* 재배형태 */
|
||||
-- TODO(ks) : 이게 맞나 싶지만.. 일단 .. case when 으로 ..
|
||||
CASE
|
||||
WHEN ui_category.id = 'code.bank.input.self'
|
||||
THEN bat.transfer_category
|
||||
|
||||
@@ -50,7 +50,6 @@
|
||||
ELSE ui_sub_sale.code_text
|
||||
END AS sub_sale_unit_text /* 부생산물 판매량 단위 */
|
||||
FROM forest_product df
|
||||
-- TODO(ks) : 일단 전부 join.. 추후에 view 로 만들든지 개선해보기..
|
||||
LEFT JOIN uicode ui_main_yield
|
||||
ON ui_main_yield.parent_id = 'code.record.unit'
|
||||
AND ui_main_yield.id = df.main_yield_unit_code
|
||||
|
||||
Reference in New Issue
Block a user