[FO] 일계부 수입, 지출의 단위 직접입력 추가
This commit is contained in:
@@ -145,11 +145,12 @@ CREATE TABLE daily_income (
|
||||
is_credit boolean, -- 외상판매 여부
|
||||
expense_mark_code varchar(10), -- 지출부호
|
||||
crop_code varchar(255), -- 재배형태 코드 (매핑코드)
|
||||
category_code varchar(255), -- 수입 종류(매핑코드)
|
||||
category_code varchar(255), -- 수입 종류(매핑코드) TODO : 미사용 삭제하기
|
||||
category_self varchar(30), -- 수입 종류(직접입력)
|
||||
source_purpose varchar(10), -- 수입원(용도)
|
||||
quantity decimal(6,2), -- 수량
|
||||
unit_code varchar(255), -- 단위 (매핑코드)
|
||||
unit_code varchar(255), -- 단위(매핑코드)
|
||||
unit_self varchar(30), -- 단위(직접입력)
|
||||
price integer, -- 현금(원)
|
||||
estimated_value integer, -- 현물(평가액)
|
||||
created_at timestamp(6), -- 생성일
|
||||
@@ -172,11 +173,12 @@ COMMENT ON COLUMN daily_income.input_type IS '입력 구분(SELF, OCR)';
|
||||
COMMENT ON COLUMN daily_income.is_credit IS '외상판매 여부';
|
||||
COMMENT ON COLUMN daily_income.expense_mark_code IS '지출부호';
|
||||
COMMENT ON COLUMN daily_income.crop_code IS '재배형태 코드 (매핑코드)';
|
||||
COMMENT ON COLUMN daily_income.category_code IS '수입 종류(매핑코드)';
|
||||
COMMENT ON COLUMN daily_income.category_code IS '수입 종류(매핑코드)'; -- TODO : 미사용 삭제하기
|
||||
COMMENT ON COLUMN daily_income.category_self IS '수입 종류(직접입력)';
|
||||
COMMENT ON COLUMN daily_income.source_purpose IS '수입원(용도)';
|
||||
COMMENT ON COLUMN daily_income.quantity IS '수량';
|
||||
COMMENT ON COLUMN daily_income.unit_code IS '단위 (매핑코드)';
|
||||
COMMENT ON COLUMN daily_income.unit_code IS '단위(매핑코드)';
|
||||
COMMENT ON COLUMN daily_income.unit_self IS '단위(직접입력)';
|
||||
COMMENT ON COLUMN daily_income.price IS '현금(원)';
|
||||
COMMENT ON COLUMN daily_income.estimated_value IS '현물(평가액)';
|
||||
COMMENT ON COLUMN daily_income.created_at IS '생성일';
|
||||
@@ -200,11 +202,12 @@ CREATE TABLE daily_expense (
|
||||
input_type varchar(5), -- 입력 구분(SELF, OCR)
|
||||
is_credit boolean, -- 외상판매 여부
|
||||
income_mark_code varchar(10), -- 수입부호 TODO : 수입종류와 다른것인지 판단 필요. 일단 다르다는 전제조건으로 생성
|
||||
category_code varchar(255), -- 수입 종류(매핑코드)
|
||||
category_code varchar(255), -- 수입 종류(매핑코드) TODO : 미사용 삭제하기
|
||||
category_self varchar(30), -- 수입 종류(직접입력)
|
||||
source_purpose varchar(10), -- 수입원(용도)
|
||||
quantity decimal(6,2), -- 수량
|
||||
unit_code varchar(255), -- 단위 (매핑코드)
|
||||
unit_self varchar(30), -- 단위(직접입력)
|
||||
price integer, -- 현금(원)
|
||||
estimated_value integer, -- 현물(평가액)
|
||||
created_at timestamp(6), -- 생성일
|
||||
@@ -226,11 +229,12 @@ COMMENT ON COLUMN daily_expense.daily_record_seq IS '일계부 작성상태 일
|
||||
COMMENT ON COLUMN daily_expense.input_type IS '입력 구분(SELF, OCR)';
|
||||
COMMENT ON COLUMN daily_expense.is_credit IS '외상판매 여부';
|
||||
COMMENT ON COLUMN daily_expense.income_mark_code IS '수입부호';
|
||||
COMMENT ON COLUMN daily_expense.category_code IS '지출 종류(매핑코드)';
|
||||
COMMENT ON COLUMN daily_expense.category_code IS '지출 종류(매핑코드)'; -- TODO : 미사용 삭제하기
|
||||
COMMENT ON COLUMN daily_expense.category_self IS '지출 종류(직접입력)';
|
||||
COMMENT ON COLUMN daily_expense.source_purpose IS '지출원(용도)';
|
||||
COMMENT ON COLUMN daily_expense.quantity IS '수량';
|
||||
COMMENT ON COLUMN daily_expense.unit_code IS '단위 (매핑코드)';
|
||||
COMMENT ON COLUMN daily_expense.unit_code IS '단위(매핑코드)';
|
||||
COMMENT ON COLUMN daily_expense.unit_self IS '단위(직접입력)';
|
||||
COMMENT ON COLUMN daily_expense.price IS '현금(원)';
|
||||
COMMENT ON COLUMN daily_expense.estimated_value IS '현물(평가액)';
|
||||
COMMENT ON COLUMN daily_expense.created_at IS '생성일';
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
package app.module.front.config.constants;
|
||||
|
||||
public class CommonConstants {
|
||||
private CommonConstants() {
|
||||
throw new IllegalAccessError("어플리케이션에서 공통으로 사용되는 상수 클래스로 생성자를 사용할 수 없습니다.");
|
||||
}
|
||||
|
||||
/**
|
||||
* 단위의 직접입력 코드
|
||||
*/
|
||||
public static final String UNIT_CODE_SELF = "code.record.unit.self";
|
||||
}
|
||||
@@ -3,6 +3,7 @@ package app.module.front.usecase.daily.expense.ports.application;
|
||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
||||
import app.module.front.config.application.util.AuditUtil;
|
||||
import app.module.front.config.constants.CommonConstants;
|
||||
import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseDto;
|
||||
import app.module.front.usecase.daily.expense.adapters.web.model.CreateDailyExpenseReqVO;
|
||||
import app.module.front.usecase.daily.expense.adapters.web.model.DailyExpenseUIReqVO;
|
||||
@@ -53,7 +54,11 @@ public class DailyExpenseService implements DailyExpensePortIn {
|
||||
List<UICodeElement> recordUnit = uiCodeListPortIn.connect("code.record.unit");
|
||||
|
||||
for (DailyExpenseDto dto : list) {
|
||||
dto.setUnitLabel(this.getCodeLabel(dto.getUnitCode(), recordUnit));
|
||||
if (CommonConstants.UNIT_CODE_SELF.equals(dto.getUnitCode())) {
|
||||
dto.setUnitLabel(dto.getUnitSelf());
|
||||
} else {
|
||||
dto.setUnitLabel(this.getCodeLabel(dto.getUnitCode(), recordUnit));
|
||||
}
|
||||
}
|
||||
|
||||
return list;
|
||||
@@ -96,6 +101,7 @@ public class DailyExpenseService implements DailyExpensePortIn {
|
||||
formVO.getSourcePurpose(),
|
||||
formVO.getQuantity(),
|
||||
formVO.getUnitCode(),
|
||||
formVO.getUnitSelf(),
|
||||
formVO.getPrice(),
|
||||
formVO.getEstimatedValue()));
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@ package app.module.front.usecase.daily.income.ports.application;
|
||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
|
||||
import app.module.front.config.application.util.AuditUtil;
|
||||
import app.module.front.config.constants.CommonConstants;
|
||||
import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto;
|
||||
import app.module.front.usecase.daily.income.adapters.web.model.CreateDailyIncomeReqVO;
|
||||
import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO;
|
||||
@@ -55,7 +56,12 @@ public class DailyIncomeService implements DailyIncomePortIn {
|
||||
|
||||
for (DailyIncomeDto dto : list) {
|
||||
dto.setCropLabel(this.getCodeLabel(dto.getCropCode(), recordCrop));
|
||||
dto.setUnitLabel(this.getCodeLabel(dto.getUnitCode(), recordUnit));
|
||||
|
||||
if (CommonConstants.UNIT_CODE_SELF.equals(dto.getUnitCode())) {
|
||||
dto.setUnitLabel(dto.getUnitSelf());
|
||||
} else {
|
||||
dto.setUnitLabel(this.getCodeLabel(dto.getUnitCode(), recordUnit));
|
||||
}
|
||||
}
|
||||
|
||||
return list;
|
||||
@@ -99,6 +105,7 @@ public class DailyIncomeService implements DailyIncomePortIn {
|
||||
formVO.getSourcePurpose(),
|
||||
formVO.getQuantity(),
|
||||
formVO.getUnitCode(),
|
||||
formVO.getUnitSelf(),
|
||||
formVO.getPrice(),
|
||||
formVO.getEstimatedValue()));
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
resultType="app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseDto">
|
||||
select ds.id, ds.daily_record_seq, ds.input_type, ds.is_credit as credit
|
||||
, ds.category_self, ds.source_purpose
|
||||
, ds.quantity, ds.unit_code, ds.price, ds.estimated_value
|
||||
, ds.quantity, ds.unit_code, ds.unit_self, ds.price, ds.estimated_value
|
||||
from daily_expense ds
|
||||
<include refid="app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
||||
where ds.is_deleted = false
|
||||
@@ -30,13 +30,13 @@
|
||||
<insert id="createDailyExpense" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into daily_expense (
|
||||
daily_record_seq, input_type, is_credit, income_mark_code, category_self, source_purpose
|
||||
, quantity, unit_code, price, estimated_value
|
||||
, quantity, unit_code, unit_self, price, estimated_value
|
||||
, is_deleted
|
||||
, <include refid="common.fields.CreateUpdateBaseColumns"/>
|
||||
) values (
|
||||
#{dailyRecordSeq}
|
||||
, #{inputType}, #{credit}, #{incomeMarkCode}, #{categorySelf}, #{sourcePurpose}
|
||||
, #{quantity}, #{unitCode}, #{price}, #{estimatedValue}
|
||||
, #{quantity}, #{unitCode}, #{unitSelf}, #{price}, #{estimatedValue}
|
||||
, false
|
||||
, <include refid="common.fields.CreateUpdateBaseValues"/>
|
||||
)
|
||||
@@ -50,6 +50,7 @@
|
||||
, source_purpose = #{sourcePurpose}
|
||||
, quantity = #{quantity}
|
||||
, unit_code = #{unitCode}
|
||||
, unit_self = #{unitSelf}
|
||||
, price = #{price}
|
||||
, estimated_value = #{estimatedValue}
|
||||
where is_deleted = false
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
resultType="app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto">
|
||||
select ds.id, ds.daily_record_seq, ds.input_type, ds.is_credit as credit
|
||||
, ds.crop_code, ds.category_self, ds.source_purpose
|
||||
, ds.quantity, ds.unit_code, ds.price, ds.estimated_value
|
||||
, ds.quantity, ds.unit_code, ds.unit_self, ds.price, ds.estimated_value
|
||||
from daily_income ds
|
||||
<include refid="app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
|
||||
where ds.is_deleted = false
|
||||
@@ -30,13 +30,13 @@
|
||||
<insert id="createDailyIncome" useGeneratedKeys="true" keyProperty="id">
|
||||
insert into daily_income (
|
||||
daily_record_seq, input_type, is_credit, expense_mark_code, crop_code, category_self, source_purpose
|
||||
, quantity, unit_code, price, estimated_value
|
||||
, quantity, unit_code, unit_self, price, estimated_value
|
||||
, is_deleted
|
||||
, <include refid="common.fields.CreateUpdateBaseColumns"/>
|
||||
) values (
|
||||
#{dailyRecordSeq}
|
||||
, #{inputType}, #{credit}, #{expenseMarkCode}, #{cropCode}, #{categorySelf}, #{sourcePurpose}
|
||||
, #{quantity}, #{unitCode}, #{price}, #{estimatedValue}
|
||||
, #{quantity}, #{unitCode}, #{unitSelf}, #{price}, #{estimatedValue}
|
||||
, false
|
||||
, <include refid="common.fields.CreateUpdateBaseValues"/>
|
||||
)
|
||||
@@ -51,6 +51,7 @@
|
||||
, source_purpose = #{sourcePurpose}
|
||||
, quantity = #{quantity}
|
||||
, unit_code = #{unitCode}
|
||||
, unit_self = #{unitSelf}
|
||||
, price = #{price}
|
||||
, estimated_value = #{estimatedValue}
|
||||
where is_deleted = false
|
||||
|
||||
@@ -8321,6 +8321,9 @@ button.swiper-pagination-bullet {
|
||||
}
|
||||
.form-group .input-flex-group .d-flex .component-input {
|
||||
margin-top: 0;
|
||||
-webkit-box-flex: 1;
|
||||
-webkit-flex: 1;
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.form-desc {
|
||||
|
||||
@@ -92,7 +92,7 @@
|
||||
</p>
|
||||
</div>
|
||||
<div id="unitCode" class="component-select bottom-sheet" data-props-default="단위를 선택해 주세요" data-props-type="bottomSheet">
|
||||
<input type="hidden1" name="unitCode" th:value="${detail.unitCode}">
|
||||
<input type="hidden" name="unitCode" th:value="${detail.unitCode}">
|
||||
<button type="button" class="select-box">
|
||||
<span class="select-txt"></span>
|
||||
</button>
|
||||
@@ -114,6 +114,11 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="component-input" data-option="직접 입력">
|
||||
<div class="input-field">
|
||||
<input type="text" name="unitSelf" th:value="${detail.unitSelf}" maxlength="30" placeholder="단위를 입력해 주세요">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
|
||||
@@ -164,6 +164,11 @@
|
||||
selectItemCallback({selectValue, dataValue}){
|
||||
console.log('selectItemCallback', selectValue, dataValue)
|
||||
$('input[name="unitCode"]').val(dataValue)
|
||||
|
||||
// TODO : ui js 에서 show 적용유무 파악하기
|
||||
if (dataValue === 'code.record.unit.self') {
|
||||
$('#unitCode').parent().find('.component-input').addClass('show');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -144,6 +144,11 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="component-input" data-option="직접 입력">
|
||||
<div class="input-field">
|
||||
<input type="text" name="unitSelf" th:value="${detail.unitSelf}" maxlength="30" placeholder="단위를 입력해 주세요">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
|
||||
@@ -177,6 +177,11 @@
|
||||
selectItemCallback({selectValue, dataValue}){
|
||||
console.log('selectItemCallback', selectValue, dataValue)
|
||||
$('input[name="unitCode"]').val(dataValue)
|
||||
|
||||
// TODO : ui js 에서 show 적용유무 파악하기
|
||||
if (dataValue === 'code.record.unit.self') {
|
||||
$('#unitCode').parent().find('.component-input').addClass('show');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -201,7 +206,11 @@
|
||||
|
||||
// data set
|
||||
selectboxInstance1.setValue($formWrap.find('input[name="cropCode"]').val());
|
||||
//selectboxInstance1.update();
|
||||
|
||||
selectboxInstance2.setValue($formWrap.find('input[name="unitCode"]').val());
|
||||
//selectboxInstance2.update();
|
||||
|
||||
if ($price.val() === '' && $estimatedValue.val() !== '') {
|
||||
modalControl._priceDisabled($price);
|
||||
} else if ($price.val() !== '' && $estimatedValue.val() === '') {
|
||||
|
||||
Reference in New Issue
Block a user