diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java
index e3409eb2..69b4d8c3 100644
--- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java
+++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java
@@ -18,5 +18,5 @@ public class GetBankAutoTransferExpenseRecords {
private String sourcePurpose;
private String count;
private String unitText;
- private Integer price;
+ private Long price;
}
diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java
index 18a49f25..412927e3 100644
--- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java
+++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java
@@ -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;
diff --git a/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml b/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml
index 4aee8c9a..f053eee5 100644
--- a/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml
+++ b/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml
@@ -15,9 +15,7 @@
household_num,
owner_name,
owner_age,
-
tel,
-
phone,
password,
region_main_code,
@@ -40,9 +38,7 @@
#{householdNum},
#{ownerName},
#{ownerAge},
-
#{tel},
-
#{phone},
#{encodedPassword},
#{regionMainCode},
diff --git a/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml b/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml
index d1c16bd7..563816f2 100644
--- a/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml
+++ b/admin/src/main/resources/mappers/household/GetBankAutoTransferRecordsMapper.xml
@@ -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
diff --git a/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml
index 89ee559a..1787187b 100644
--- a/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml
+++ b/admin/src/main/resources/mappers/household/GetForestProductsStatusMapper.xml
@@ -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
diff --git a/admin/src/main/resources/mappers/household/UpdateHouseholdMapper.xml b/admin/src/main/resources/mappers/household/UpdateHouseholdMapper.xml
index e603a5a7..8d40dfde 100644
--- a/admin/src/main/resources/mappers/household/UpdateHouseholdMapper.xml
+++ b/admin/src/main/resources/mappers/household/UpdateHouseholdMapper.xml
@@ -10,9 +10,7 @@
SET
owner_name = #{ownerName},
owner_age = #{ownerAge},
-
tel = #{tel},
-
phone = #{phone},
region_main_code = #{regionMainCode},
region_sub_code = #{regionSubCode},
diff --git a/admin/src/main/resources/templates/households/tab/daily-record.html b/admin/src/main/resources/templates/households/tab/daily-record.html
index 6f83df20..a2093c0f 100644
--- a/admin/src/main/resources/templates/households/tab/daily-record.html
+++ b/admin/src/main/resources/templates/households/tab/daily-record.html
@@ -509,7 +509,7 @@
$('#incomeCount').text(data.length);
if(data.length === 0) {
- noDataDaily(tbody, status, 10);
+ noDataDaily(tbody, status, 11);
return;
}
diff --git a/admin/src/main/resources/templates/households/{seq}.html b/admin/src/main/resources/templates/households/{seq}.html
index 7db69c47..ed55196d 100644
--- a/admin/src/main/resources/templates/households/{seq}.html
+++ b/admin/src/main/resources/templates/households/{seq}.html
@@ -252,7 +252,7 @@
let $tab = $('.component-tab button[data-tab-value="' + tabActive + '"]');
getTabData($tab.data('tabType'), $tab.data('tabValue'));
- }, 500);
+ }, 100);
});
$('.select-tab').on('click', function () {
diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html
index 5c5e9edf..e73af2bc 100644
--- a/admin/src/main/resources/templates/researcher/detail.html
+++ b/admin/src/main/resources/templates/researcher/detail.html
@@ -55,10 +55,10 @@
-
+
-
-
+
+
-
+
+
+