diff --git a/core/src/main/resources/sql/schema/01_drop-all.sql b/core/src/main/resources/sql/schema/01_drop-all.sql index 3f9b3d64..ab7f4766 100644 --- a/core/src/main/resources/sql/schema/01_drop-all.sql +++ b/core/src/main/resources/sql/schema/01_drop-all.sql @@ -47,7 +47,7 @@ DROP TABLE IF EXISTS work_input; DROP TABLE IF EXISTS monthly_carryover; DROP TABLE IF EXISTS bank_auto_transfer; DROP TABLE IF EXISTS income_expense_record; -DROP TABLE IF EXISTS daily_input_status; +--DROP TABLE IF EXISTS daily_input_status; DROP TABLE IF EXISTS monthly_input_status; -- admin diff --git a/core/src/main/resources/sql/schema/02_create-all.sql b/core/src/main/resources/sql/schema/02_create-all.sql index e59ff5f9..52f6ddbf 100644 --- a/core/src/main/resources/sql/schema/02_create-all.sql +++ b/core/src/main/resources/sql/schema/02_create-all.sql @@ -1140,6 +1140,7 @@ COMMENT ON COLUMN monthly_input_status.is_deleted IS '삭제여부'; -- TABLE : daily_input_status -- DESC : 일계부 일별 작성상태 -- ============================================ +/* CREATE SEQUENCE daily_input_status_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; CREATE TABLE daily_input_status ( @@ -1186,6 +1187,7 @@ COMMENT ON COLUMN daily_input_status.updated_by IS '수정자'; COMMENT ON COLUMN daily_input_status.deleted_at IS '삭제일'; COMMENT ON COLUMN daily_input_status.deleted_by IS '삭제자'; COMMENT ON COLUMN daily_input_status.is_deleted IS '삭제여부'; +*/ -- 4. forest_product → forest_product_yield diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseDto.java b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseDto.java index e21f023b..fbefcd17 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/persistence/model/DailyExpenseDto.java @@ -1,5 +1,6 @@ package app.module.front.usecase.daily.expense.adapters.persistence.model; +import app.module.front.usecase.daily.income.adapters.web.model.DailyInputType; import lombok.Getter; import lombok.Setter; @@ -8,12 +9,11 @@ import lombok.Setter; public class DailyExpenseDto { private Long id; private Long dailyRecordSeq; - // TODO : SELF, OCR - private String inputType; + private DailyInputType inputType; private Boolean credit; - private String categorySelf; + private String expenseKind; private String sourcePurpose; - private Double quantity; + private String quantity; private String unitCode; private String unitLabel; private String unitSelf; diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/model/CreateDailyExpenseReqVO.java b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/model/CreateDailyExpenseReqVO.java index fd43b13f..3898b1ae 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/model/CreateDailyExpenseReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/model/CreateDailyExpenseReqVO.java @@ -1,5 +1,6 @@ package app.module.front.usecase.daily.expense.adapters.web.model; +import app.module.front.usecase.daily.income.adapters.web.model.DailyInputType; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; import jakarta.validation.constraints.NotBlank; import lombok.Getter; @@ -19,9 +20,9 @@ public class CreateDailyExpenseReqVO extends DailyUIReqVO { */ private Long dailyRecordSeq; /** - * 등록 유형(SELF, OCR) + * 등록 유형 */ - private String inputType; + private DailyInputType inputType; /** * 외상판매 여부 */ @@ -30,7 +31,7 @@ public class CreateDailyExpenseReqVO extends DailyUIReqVO { * 지출의 종류 직접입력 */ @NotBlank(message = "지출 종류를 입력해 주세요.") - private String categorySelf; + private String expenseKind; /** * 용도 */ @@ -45,7 +46,7 @@ public class CreateDailyExpenseReqVO extends DailyUIReqVO { */ private String unitCode; /** - * 단위 직접입력 + * 단위 직접 입력 */ private String unitSelf; /** diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java b/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java index e0bee7b3..dd95c14d 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java @@ -94,11 +94,11 @@ public class DailyExpenseService implements DailyExpensePortIn { new CreateDailyExpenseCmd( formVO.getId(), formVO.getDailyRecordSeq(), - (formVO.getCredit() ? "52210" : null), // [정책] 외상판매 Y 일 경우 수입부호 52210 적재 - null, formVO.getInputType(), + "2", // [정책] 2 고정 + (formVO.getCredit() ? "52210" : null), // [정책] 외상판매 Y 일 경우 수입부호 52210 적재 formVO.getCredit(), - formVO.getCategorySelf(), + formVO.getExpenseKind(), formVO.getSourcePurpose(), formVO.getQuantity(), formVO.getUnitCode(), diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/domain/CreateDailyExpenseCmd.java b/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/domain/CreateDailyExpenseCmd.java index 620a7787..ce462a0a 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/domain/CreateDailyExpenseCmd.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/domain/CreateDailyExpenseCmd.java @@ -1,6 +1,7 @@ package app.module.front.usecase.daily.expense.ports.application.domain; import app.module.front.config.adapters.persistence.component.FrontAuditCommand; +import app.module.front.usecase.daily.income.adapters.web.model.DailyInputType; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; @@ -13,11 +14,17 @@ import lombok.ToString; public class CreateDailyExpenseCmd extends FrontAuditCommand { private Long id; private Long dailyRecordSeq; + private DailyInputType inputType; + /** + * 유형 + */ + private String category; + /** + * 수입 부호 + */ private String incomeMark; - private String expenseMark; - private String inputType; private Boolean credit; - private String categorySelf; + private String expenseKind; private String sourcePurpose; private Double quantity; private String unitCode; diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeDto.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeDto.java index 7b8d2b47..ad1b92fb 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/persistence/model/DailyIncomeDto.java @@ -1,23 +1,21 @@ package app.module.front.usecase.daily.income.adapters.persistence.model; +import app.module.front.usecase.daily.income.adapters.web.model.DailyInputType; import lombok.Getter; import lombok.Setter; -import java.time.LocalDateTime; - @Getter @Setter public class DailyIncomeDto { private Long id; private Long dailyRecordSeq; - // TODO : SELF, OCR - private String inputType; + private DailyInputType inputType; private Boolean credit; private String cropCode; private String cropLabel; - private String categorySelf; + private String incomeKind; private String sourcePurpose; - private Double quantity; + private String quantity; private String unitCode; private String unitLabel; private String unitSelf; diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/model/CreateDailyIncomeReqVO.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/model/CreateDailyIncomeReqVO.java index 813aa8db..dbf0a371 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/model/CreateDailyIncomeReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/model/CreateDailyIncomeReqVO.java @@ -19,9 +19,9 @@ public class CreateDailyIncomeReqVO extends DailyUIReqVO { */ private Long dailyRecordSeq; /** - * 등록 유형(SELF, OCR) + * 등록 유형 */ - private String inputType; + private DailyInputType inputType; /** * 외상판매 여부 */ @@ -34,7 +34,7 @@ public class CreateDailyIncomeReqVO extends DailyUIReqVO { * 수입의 종류 직접입력 */ @NotBlank(message = "수입 종류를 입력해 주세요.") - private String categorySelf; + private String incomeKind; /** * 수입원 */ @@ -49,7 +49,7 @@ public class CreateDailyIncomeReqVO extends DailyUIReqVO { */ private String unitCode; /** - * 단위 직접입력 + * 단위 직접 입력 */ private String unitSelf; /** diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/model/DailyInputType.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/model/DailyInputType.java new file mode 100644 index 00000000..75fa2494 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/model/DailyInputType.java @@ -0,0 +1,16 @@ +package app.module.front.usecase.daily.income.adapters.web.model; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +public enum DailyInputType { + /** + * 직접 입력 + */ + SELF, + /** + * 영수증 입력 + */ + OCR, + ; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java b/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java index e72535ce..10675bf7 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/ports/application/DailyIncomeService.java @@ -97,12 +97,12 @@ public class DailyIncomeService implements DailyIncomePortIn { new CreateDailyIncomeCmd( formVO.getId(), formVO.getDailyRecordSeq(), - null, - (formVO.getCredit() ? "91206" : null), // [정책] 외상판매 Y 일 경우 지출부호 91206 적재 formVO.getInputType(), + "1", // [정책] 1 고정 + (formVO.getCredit() ? "91206" : null), // [정책] 외상판매 Y 일 경우 지출부호 91206 적재 formVO.getCredit(), formVO.getCropCode(), - formVO.getCategorySelf(), + formVO.getIncomeKind(), formVO.getSourcePurpose(), formVO.getQuantity(), formVO.getUnitCode(), diff --git a/front/src/main/java/app/module/front/usecase/daily/income/ports/application/domain/CreateDailyIncomeCmd.java b/front/src/main/java/app/module/front/usecase/daily/income/ports/application/domain/CreateDailyIncomeCmd.java index d8d7a57d..5a33d68e 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/ports/application/domain/CreateDailyIncomeCmd.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/ports/application/domain/CreateDailyIncomeCmd.java @@ -1,6 +1,7 @@ package app.module.front.usecase.daily.income.ports.application.domain; import app.module.front.config.adapters.persistence.component.FrontAuditCommand; +import app.module.front.usecase.daily.income.adapters.web.model.DailyInputType; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; @@ -13,12 +14,18 @@ import lombok.ToString; public class CreateDailyIncomeCmd extends FrontAuditCommand { private Long id; private Long dailyRecordSeq; - private String incomeMark; + private DailyInputType inputType; + /** + * 유형 + */ + private String category; + /** + * 지출 부호 + */ private String expenseMark; - private String inputType; private Boolean credit; private String cropCode; - private String categorySelf; + private String incomeKind; private String sourcePurpose; private Double quantity; private String unitCode; diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/model/DailyPowerDto.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/model/DailyPowerDto.java index f14234f2..01950bec 100644 --- a/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/model/DailyPowerDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/persistence/model/DailyPowerDto.java @@ -9,8 +9,8 @@ public class DailyPowerDto { private Long id; private Long dailyRecordSeq; private String equipmentName; - private Integer ownedHours; - private Integer leasedHours; + private String ownedHours; + private String leasedHours; /** * 수정 가능 여부 diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/model/CreateDailyPowerReqVO.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/model/CreateDailyPowerReqVO.java index f664f631..3166b2b9 100644 --- a/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/model/CreateDailyPowerReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/model/CreateDailyPowerReqVO.java @@ -27,9 +27,9 @@ public class CreateDailyPowerReqVO extends DailyUIReqVO { /** * 자가 사용시간 */ - private Integer ownedHours; + private Double ownedHours; /** * 임차 사용시간 */ - private Integer leasedHours; + private Double leasedHours; } diff --git a/front/src/main/java/app/module/front/usecase/daily/power/ports/application/DailyPowerService.java b/front/src/main/java/app/module/front/usecase/daily/power/ports/application/DailyPowerService.java index f0acbe87..2a07b42d 100644 --- a/front/src/main/java/app/module/front/usecase/daily/power/ports/application/DailyPowerService.java +++ b/front/src/main/java/app/module/front/usecase/daily/power/ports/application/DailyPowerService.java @@ -66,8 +66,6 @@ public class DailyPowerService implements DailyPowerPortIn { new CreateDailyPowerCmd( formVO.getId(), formVO.getDailyRecordSeq(), - null, - null, formVO.getEquipmentName(), formVO.getOwnedHours(), formVO.getLeasedHours())); diff --git a/front/src/main/java/app/module/front/usecase/daily/power/ports/application/domain/CreateDailyPowerCmd.java b/front/src/main/java/app/module/front/usecase/daily/power/ports/application/domain/CreateDailyPowerCmd.java index 7b26ea8d..87545a91 100644 --- a/front/src/main/java/app/module/front/usecase/daily/power/ports/application/domain/CreateDailyPowerCmd.java +++ b/front/src/main/java/app/module/front/usecase/daily/power/ports/application/domain/CreateDailyPowerCmd.java @@ -13,9 +13,7 @@ import lombok.ToString; public class CreateDailyPowerCmd extends FrontAuditCommand { private Long id; private Long dailyRecordSeq; - private String incomeMark; - private String expenseMark; private String equipmentName; - private Integer ownedHours; - private Integer leasedHours; + private Double ownedHours; + private Double leasedHours; } diff --git a/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/model/DailyWorkDto.java b/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/model/DailyWorkDto.java index 4b78b4ae..53c22dbc 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/model/DailyWorkDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/adapters/persistence/model/DailyWorkDto.java @@ -12,7 +12,7 @@ public class DailyWorkDto { private String itemMark; private String workName; private String workMark; - private Double workLandArea; + private String workLandArea; private String areaUnitCode; private String areaUnitLabel; private String areaUnitSelf; @@ -20,16 +20,16 @@ public class DailyWorkDto { private String harvestUnitCode; private String harvestUnitLabel; private String harvestUnitSelf; - private Double ownerTime; - private Double spouseTime; - private Double familyMHours; - private Double familyFHours; - private Double hiredMHours; - private Double hiredFHours; - private Double sharedMHours; - private Double sharedFHours; - private Double volunteerMHours; - private Double volunteerFHours; + private String ownerTime; + private String spouseTime; + private String familyMHours; + private String familyFHours; + private String hiredMHours; + private String hiredFHours; + private String sharedMHours; + private String sharedFHours; + private String volunteerMHours; + private String volunteerFHours; /** * 수정 가능 여부 diff --git a/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/model/CreateDailyWorkReqVO.java b/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/model/CreateDailyWorkReqVO.java index 1728ff4b..b4e78b62 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/model/CreateDailyWorkReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/model/CreateDailyWorkReqVO.java @@ -24,19 +24,11 @@ public class CreateDailyWorkReqVO extends DailyUIReqVO { */ @NotBlank(message = "품목명을 입력해 주세요.") private String itemName; - /** - * 품목부호 - */ - private Boolean itemMark; /** * 작업명 */ @NotBlank(message = "작업명을 입력해 주세요.") private String workName; - /** - * 작업 부호 - */ - private String workMark; /** * 작업 면적 */ @@ -52,8 +44,7 @@ public class CreateDailyWorkReqVO extends DailyUIReqVO { /** * 수확량 */ - @NotBlank(message = "수확량을 입력해 주세요.") - private String harvestQuantity; + private Double harvestQuantity; /** * 수확량 단위 코드 */ diff --git a/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/validator/CreateDailyWorkValidator.java b/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/validator/CreateDailyWorkValidator.java index 41c7b9ad..66d69481 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/validator/CreateDailyWorkValidator.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/validator/CreateDailyWorkValidator.java @@ -20,14 +20,10 @@ public class CreateDailyWorkValidator implements Validator { public void validate(Object target, Errors errors) { CreateDailyWorkReqVO vo = (CreateDailyWorkReqVO) target; - if (vo.getOwnerTime() == null && vo.getSpouseTime() == null - && vo.getFamilyMHours() == null && vo.getFamilyFHours() == null - && vo.getHiredMHours() == null && vo.getHiredFHours() == null - && vo.getSharedMHours() == null && vo.getSharedFHours() == null - && vo.getVolunteerMHours() == null && vo.getVolunteerFHours() == null) { + if (vo.getHarvestQuantity() == null) { errors.rejectValue( - "ownerTime", "valid.common.required", - "최소 1개의 항목을 입력해주세요."); + "harvestQuantity", "valid.common.required", + "수확량을 입력해 주세요."); } if ("SELF".equals(vo.getAreaUnitCode()) && StringUtils.isBlank(vo.getAreaUnitSelf())) { @@ -41,5 +37,15 @@ public class CreateDailyWorkValidator implements Validator { "harvestUnitSelf", "valid.common.required", "단위를 입력해 주세요."); } + + if (vo.getOwnerTime() == null && vo.getSpouseTime() == null + && vo.getFamilyMHours() == null && vo.getFamilyFHours() == null + && vo.getHiredMHours() == null && vo.getHiredFHours() == null + && vo.getSharedMHours() == null && vo.getSharedFHours() == null + && vo.getVolunteerMHours() == null && vo.getVolunteerFHours() == null) { + errors.rejectValue( + "ownerTime", "valid.common.required", + "최소 1개의 항목을 입력해주세요."); + } } } diff --git a/front/src/main/java/app/module/front/usecase/daily/work/ports/application/DailyWorkService.java b/front/src/main/java/app/module/front/usecase/daily/work/ports/application/DailyWorkService.java index a40dbad9..c5eecd42 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/ports/application/DailyWorkService.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/ports/application/DailyWorkService.java @@ -101,9 +101,7 @@ public class DailyWorkService implements DailyWorkPortIn { formVO.getId(), formVO.getDailyRecordSeq(), formVO.getItemName(), - null, formVO.getWorkName(), - null, formVO.getWorkLandArea(), formVO.getAreaUnitCode(), formVO.getAreaUnitSelf(), diff --git a/front/src/main/java/app/module/front/usecase/daily/work/ports/application/domain/CreateDailyWorkCmd.java b/front/src/main/java/app/module/front/usecase/daily/work/ports/application/domain/CreateDailyWorkCmd.java index 49325c2a..5248480d 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/ports/application/domain/CreateDailyWorkCmd.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/ports/application/domain/CreateDailyWorkCmd.java @@ -14,13 +14,11 @@ public class CreateDailyWorkCmd extends FrontAuditCommand { private Long id; private Long dailyRecordSeq; private String itemName; - private String itemMark; private String workName; - private String workMark; private Double workLandArea; private String areaUnitCode; private String areaUnitSelf; - private String harvestQuantity; + private Double harvestQuantity; private String harvestUnitCode; private String harvestUnitSelf; private Double ownerTime; diff --git a/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml b/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml index b14cf298..f0ed51d3 100644 --- a/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml @@ -5,7 +5,7 @@ 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.crop_code, ds.income_kind, ds.source_purpose , ds.quantity, ds.unit_code, ds.unit_self, ds.price, ds.estimated_value from daily_income ds @@ -29,14 +29,14 @@ insert into daily_income ( - daily_record_seq, income_mark, expense_mark - , input_type, is_credit, crop_code, category_self, source_purpose + daily_record_seq, input_type, category, expense_mark + , is_credit, crop_code, income_kind, source_purpose , quantity, unit_code, unit_self, price, estimated_value , is_deleted , ) values ( - #{dailyRecordSeq}, #{incomeMark}, #{expenseMark} - , #{inputType}, #{credit}, #{cropCode}, #{categorySelf}, #{sourcePurpose} + #{dailyRecordSeq}, #{inputType}, #{category}, #{expenseMark} + , #{credit}, #{cropCode}, #{incomeKind}, #{sourcePurpose} , #{quantity}, #{unitCode}, #{unitSelf}, #{price}, #{estimatedValue} , false , @@ -46,10 +46,9 @@ update daily_income set , is_credit = #{credit} - , income_mark = #{incomeMark} , expense_mark = #{expenseMark} , crop_code = #{cropCode} - , category_self = #{categorySelf} + , income_kind = #{incomeKind} , source_purpose = #{sourcePurpose} , quantity = #{quantity} , unit_code = #{unitCode} diff --git a/front/src/main/resources/mappers/daily/DailyWorkMapper.xml b/front/src/main/resources/mappers/daily/DailyWorkMapper.xml index cc9f3046..b80effce 100644 --- a/front/src/main/resources/mappers/daily/DailyWorkMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyWorkMapper.xml @@ -5,7 +5,7 @@ +
diff --git a/front/src/main/resources/templates/record/expense/index.html b/front/src/main/resources/templates/record/expense/index.html index 1c70397d..f3824625 100644 --- a/front/src/main/resources/templates/record/expense/index.html +++ b/front/src/main/resources/templates/record/expense/index.html @@ -52,7 +52,7 @@
-

[[${item.categorySelf}]]

+

[[${item.expenseKind}]]

diff --git a/front/src/main/resources/templates/record/income/form.html b/front/src/main/resources/templates/record/income/form.html index 3e7c5e92..4b9c87b7 100644 --- a/front/src/main/resources/templates/record/income/form.html +++ b/front/src/main/resources/templates/record/income/form.html @@ -78,12 +78,12 @@
-
- +
diff --git a/front/src/main/resources/templates/record/income/index.html b/front/src/main/resources/templates/record/income/index.html index 9ad07e35..ae07406b 100644 --- a/front/src/main/resources/templates/record/income/index.html +++ b/front/src/main/resources/templates/record/income/index.html @@ -52,7 +52,7 @@
-

[[${item.categorySelf}]]

+

[[${item.incomeKind}]]

diff --git a/front/src/main/resources/templates/record/work/form.html b/front/src/main/resources/templates/record/work/form.html index 1dfde57a..b941a2ab 100644 --- a/front/src/main/resources/templates/record/work/form.html +++ b/front/src/main/resources/templates/record/work/form.html @@ -108,7 +108,8 @@
- +