From b6e3d6e740a8a814886724cdce6eb43f2b6ebc77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Mon, 30 Jun 2025 17:45:33 +0900 Subject: [PATCH 01/14] =?UTF-8?q?=EC=9E=84=EC=82=B0=EB=AC=BC=20=ED=98=84?= =?UTF-8?q?=ED=99=A9=20=EC=9B=94=EB=B3=84=20create=20drop=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/main/resources/sql/schema/01_drop-all.sql | 6 ++++-- core/src/main/resources/sql/schema/02_create-all.sql | 11 +++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) 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 ab7f4766..dbcbad23 100644 --- a/core/src/main/resources/sql/schema/01_drop-all.sql +++ b/core/src/main/resources/sql/schema/01_drop-all.sql @@ -45,9 +45,9 @@ DROP TABLE IF EXISTS power_equipment_usage; DROP TABLE IF EXISTS work_input_time; 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 bank_auto_transfer; DROP TABLE IF EXISTS monthly_input_status; -- admin @@ -103,9 +103,11 @@ DROP SEQUENCE IF EXISTS power_equipment_usage_seq; DROP SEQUENCE IF EXISTS work_input_time_seq; DROP SEQUENCE IF EXISTS work_input_seq; DROP SEQUENCE IF EXISTS monthly_carryover_seq; -DROP SEQUENCE IF EXISTS bank_auto_transfer_seq; + DROP SEQUENCE IF EXISTS income_expense_record_seq; DROP SEQUENCE IF EXISTS daily_input_status_seq; + +DROP SEQUENCE IF EXISTS bank_auto_transfer_seq; DROP SEQUENCE IF EXISTS monthly_input_status_seq; DROP SEQUENCE IF EXISTS admin_seq; 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 dfd380d3..97c97f3b 100644 --- a/core/src/main/resources/sql/schema/02_create-all.sql +++ b/core/src/main/resources/sql/schema/02_create-all.sql @@ -1108,7 +1108,9 @@ CREATE TABLE monthly_input_status ( household_seq bigint NOT NULL, -- 임가 일련번호 (FK) month varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm) forest_product_status varchar(15), -- 임산물 현황 입력상태 (enum) - bank_auto_transfer_status varchar(15), -- 은행 자동이체 내역 입력상태 (enum) + bank_auto_transfer_input_status varchar(15), + bank_auto_transfer_output_status varchar(15), + -- 은행 자동이체 내역 입력상태 (enum) created_at timestamp(6), -- 생성일 created_by varchar(255), -- 생성자 updated_at timestamp(6), -- 수정일 @@ -1119,8 +1121,8 @@ CREATE TABLE monthly_input_status ( CONSTRAINT monthly_input_status_pkey PRIMARY KEY (id), CONSTRAINT fk_monthly_input_status__household FOREIGN KEY (household_seq) REFERENCES household(seq), - CONSTRAINT mis_forest_product_status CHECK (forest_product_status::text = ANY (ARRAY['NONE'::text, 'NOTHING'::text, 'REGISTERED'::text])), - CONSTRAINT mis_bank_auto_transfer_status CHECK (bank_auto_transfer_status::text = ANY (ARRAY['NONE'::text, 'NOTHING'::text, 'REGISTERED'::text])) + --CONSTRAINT mis_forest_product_status CHECK (forest_product_status::text = ANY (ARRAY['NONE'::text, 'NOTHING'::text, 'REGISTERED'::text])), + --CONSTRAINT mis_bank_auto_transfer_status CHECK (bank_auto_transfer_status::text = ANY (ARRAY['NONE'::text, 'NOTHING'::text, 'REGISTERED'::text])) ); @@ -1130,7 +1132,8 @@ COMMENT ON COLUMN monthly_input_status.id IS '일계부 작성상태 ID'; COMMENT ON COLUMN monthly_input_status.household_seq IS '임가 일련번호'; COMMENT ON COLUMN monthly_input_status.month IS '조사시행 월 (yyyy-mm)'; COMMENT ON COLUMN monthly_input_status.forest_product_status IS '임산물 현황 입력상태'; -COMMENT ON COLUMN monthly_input_status.bank_auto_transfer_status IS '은행 자동이체 내역 입력상태'; +COMMENT ON COLUMN monthly_input_status.bank_auto_transfer_input_status IS '은행 자동이체 내역 입력상태'; +COMMENT ON COLUMN monthly_input_status.bank_auto_transfer_output_status IS '은행 자동이체 내역 입력상태'; COMMENT ON COLUMN monthly_input_status.created_at IS '생성일'; COMMENT ON COLUMN monthly_input_status.created_by IS '생성자'; COMMENT ON COLUMN monthly_input_status.updated_at IS '수정일'; From 5352d1b1efe7879ebe4d01ff16051345d9d0d3a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Tue, 1 Jul 2025 10:13:20 +0900 Subject: [PATCH 02/14] =?UTF-8?q?=EB=B0=B0=ED=8F=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/main/resources/application.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/front/src/main/resources/application.yml b/front/src/main/resources/application.yml index 6b611ef3..e020e3c5 100644 --- a/front/src/main/resources/application.yml +++ b/front/src/main/resources/application.yml @@ -5,7 +5,6 @@ spring: messages: basename: messages/exception,messages/validation,messages/uri,messages/operation encoding: UTF-8 - # gzip compression 설정 compression: enabled: true From 2d67455a065ebb235e5be03db3a5954051cdd1f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 1 Jul 2025 10:40:28 +0900 Subject: [PATCH 03/14] =?UTF-8?q?[BO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20?= =?UTF-8?q?=EB=85=B8=EB=8F=99=ED=88=AC=EC=9E=85=20=EB=93=B1=EB=A1=9D,=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/SaveDailyIncomeDao.java | 3 + .../web/SaveDailyIncomeController.java | 4 +- .../application/SaveDailyIncomeService.java | 4 +- .../persistence/SaveDailyWorkDao.java | 40 ++ .../persistence/SaveDailyWorkMapper.java | 39 ++ .../persistence/modal/GetDailyWorkDto.java | 34 ++ .../adapters/web/SaveDailyWorkController.java | 87 +++++ .../adapters/web/model/DailyWorkUIReqVO.java | 30 ++ .../web/model/SaveDailyWorkReqVO.java | 86 +++++ .../web/validator/SaveDailyWorkValidator.java | 76 ++++ .../ports/SaveDailyWorkPortIn.java | 22 ++ .../ports/SaveDailyWorkPortOut.java | 23 ++ .../application/SaveDailyWorkService.java | 66 ++++ .../application/domain/GetDailyWorkCmd.java | 27 ++ .../application/domain/SaveDailyWorkCmd.java | 34 ++ .../household/daily/SaveDailyWorkMapper.xml | 71 ++++ .../households/modal/modal-daily-income.html | 8 +- .../households/modal/modal-daily-work.html | 362 ++++++++++++++++++ .../households/tab/daily-record.html | 4 +- .../resources/templates/households/{seq}.html | 3 +- .../mappers/daily/DailyWorkMapper.xml | 1 - 21 files changed, 1013 insertions(+), 11 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/SaveDailyWorkDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/SaveDailyWorkMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/modal/GetDailyWorkDto.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/SaveDailyWorkController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/model/DailyWorkUIReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/model/SaveDailyWorkReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/validator/SaveDailyWorkValidator.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/SaveDailyWorkPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/SaveDailyWorkPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/application/SaveDailyWorkService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/application/domain/GetDailyWorkCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/application/domain/SaveDailyWorkCmd.java create mode 100644 admin/src/main/resources/mappers/household/daily/SaveDailyWorkMapper.xml create mode 100644 admin/src/main/resources/templates/households/modal/modal-daily-work.html diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeDao.java index ad37cec4..ed6948d1 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeDao.java @@ -4,6 +4,8 @@ import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapte import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.SaveDailyIncomePortOut; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.SaveDailyIncomeCmd; import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.GetDailyIncomeCmd; +import app.module.core.config.application.annotation.CreateCommand; +import app.module.core.config.application.annotation.UpdateCommand; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -20,6 +22,7 @@ public class SaveDailyIncomeDao implements SaveDailyIncomePortOut { return dailyIncomeMapper.getDailyIncome(command); } + @CreateCommand @Override public void create(GetDailyIncomeCmd findCmd, SaveDailyIncomeCmd command) { Integer existCount = dailyIncomeMapper.getRecordExistCount(findCmd); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/SaveDailyIncomeController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/SaveDailyIncomeController.java index ee98794c..30412897 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/SaveDailyIncomeController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/SaveDailyIncomeController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*; public class SaveDailyIncomeController { private final DailyRecordPortIn dailyRecordPortIn; private final SaveDailyIncomePortIn dailyIncomePortIn; - private final SaveDailyIncomeValidator sailyIncomeValidator; + private final SaveDailyIncomeValidator dailyIncomeValidator; /** * 일계부 수입 조회 @@ -53,7 +53,7 @@ public class SaveDailyIncomeController { @PostMapping(path = "/save") ResponseEntity create(@Valid @RequestBody SaveDailyIncomeReqVO formVO, BindingResult bindingResult) { - sailyIncomeValidator.validate(formVO, bindingResult); + dailyIncomeValidator.validate(formVO, bindingResult); if (bindingResult.hasErrors()) { return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) .body(bindingResult.getFieldErrors()); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/SaveDailyIncomeService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/SaveDailyIncomeService.java index 28a06502..817eeff3 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/SaveDailyIncomeService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/SaveDailyIncomeService.java @@ -38,7 +38,7 @@ public class SaveDailyIncomeService implements SaveDailyIncomePortIn { formVO.getHouseholdSeq(), formVO.getId()); - SaveDailyIncomeCmd command = AuditUtil.create( + SaveDailyIncomeCmd command = new SaveDailyIncomeCmd( formVO.getId(), formVO.getDailyId(), @@ -53,7 +53,7 @@ public class SaveDailyIncomeService implements SaveDailyIncomePortIn { formVO.getUnitCode(), formVO.getUnitSelf(), formVO.getPrice(), - formVO.getEstimatedValue())); + formVO.getEstimatedValue()); portOut.create(findCmd, command); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/SaveDailyWorkDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/SaveDailyWorkDao.java new file mode 100644 index 00000000..a6af3580 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/SaveDailyWorkDao.java @@ -0,0 +1,40 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.persistence.modal.GetDailyWorkDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application.domain.GetDailyWorkCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application.domain.SaveDailyWorkCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.SaveDailyWorkPortOut; +import app.module.core.config.application.annotation.CreateCommand; +import app.module.core.config.application.annotation.UpdateCommand; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +@RequiredArgsConstructor +public class SaveDailyWorkDao implements SaveDailyWorkPortOut { + private final SaveDailyWorkMapper dailyWorkMapper; + + @Override + public GetDailyWorkDto detail(GetDailyWorkCmd command) { + + return dailyWorkMapper.getDailyWork(command); + } + + @CreateCommand + @Override + public void create(GetDailyWorkCmd findCmd, SaveDailyWorkCmd command) { + Integer existCount = dailyWorkMapper.getRecordExistCount(findCmd); + if (existCount == 0) { + dailyWorkMapper.createDailyWork(command); + + log.debug("[CreateDailyWork] command={}", command); + } else { + dailyWorkMapper.updateDailyWork(command); + + log.debug("[UpdateDailyWork] command={}", command); + } + } + +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/SaveDailyWorkMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/SaveDailyWorkMapper.java new file mode 100644 index 00000000..0243f089 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/SaveDailyWorkMapper.java @@ -0,0 +1,39 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.persistence.modal.GetDailyWorkDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application.domain.GetDailyWorkCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application.domain.SaveDailyWorkCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SaveDailyWorkMapper { + /** + * 일계부 노동투입 데이터 조회 + * + * @param command 검색 조건 + * @return 노동투입 데이터 + */ + GetDailyWorkDto getDailyWork(GetDailyWorkCmd command); + + /** + * 일계부 노동투입 데이터 존재 여부 + * + * @param command 검색 조건 + * @return 중복 개수 + */ + Integer getRecordExistCount(GetDailyWorkCmd command); + + /** + * 일계부 노동투입 등록 + * + * @param command 등록 데이터 + */ + void createDailyWork(SaveDailyWorkCmd command); + + /** + * 일계부 노동투입 수정 + * + * @param command 수정 데이터 + */ + void updateDailyWork(SaveDailyWorkCmd command); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/modal/GetDailyWorkDto.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/modal/GetDailyWorkDto.java new file mode 100644 index 00000000..a272f0bf --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/modal/GetDailyWorkDto.java @@ -0,0 +1,34 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.persistence.modal; + +import app.module.core.config.application.enums.DailyInputType; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class GetDailyWorkDto { + private Long id; + private Long dailyRecordSeq; + private String itemName; + private String itemMark; + private String workName; + private String workMark; + private String workLandArea; + private String areaUnitCode; + private String areaUnitLabel; + private String areaUnitSelf; + private String harvestQuantity; + private String harvestUnitCode; + private String harvestUnitLabel; + private String harvestUnitSelf; + 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/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/SaveDailyWorkController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/SaveDailyWorkController.java new file mode 100644 index 00000000..47b0a340 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/SaveDailyWorkController.java @@ -0,0 +1,87 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.persistence.modal.GetDailyWorkDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web.model.DailyWorkUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web.model.SaveDailyWorkReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web.validator.SaveDailyWorkValidator; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.SaveDailyWorkPortIn; +import app.module.core.config.application.exception.NoRecordDataException; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +@Slf4j +@RestController +@RequiredArgsConstructor +@RequestMapping(path = "/api/household/daily/work") +public class SaveDailyWorkController { + private final DailyRecordPortIn dailyRecordPortIn; + private final SaveDailyWorkPortIn dailyWorkPortIn; + private final SaveDailyWorkValidator dailyWorkValidator; + + /** + * 일계부 노동투입 조회 + * + * @param id 노동투입 일련번호 + * @param reqVO 검색 조건 + */ + @GetMapping(path = "/{id}") + ResponseEntity detail(@PathVariable("id") String id, @ModelAttribute DailyWorkUIReqVO reqVO) { + + reqVO.setId(Long.parseLong(id)); + + GetDailyWorkDto detail = dailyWorkPortIn.detail(reqVO); + if (detail == null) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); + } + + return ResponseEntity.status(HttpStatus.OK).body(detail); + } + + /** + * 일계부 노동투입 등록 처리 + * + * @param formVO 입력 데이터 + * @param bindingResult BindingResult + */ + @PostMapping(path = "/save") + ResponseEntity create(@Valid @RequestBody SaveDailyWorkReqVO formVO, BindingResult bindingResult) { + + dailyWorkValidator.validate(formVO, bindingResult); + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getFieldErrors()); + } + + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(formVO.getDailyId()); + + formVO.setSearchMonth(dailyRecord.getRecordMonth()); + formVO.setGroupNo(dailyRecord.getGroupNo()); + formVO.setDailyId(dailyRecord.getId()); + log.debug("formVO: {}", formVO); + + dailyWorkPortIn.create(formVO); + + return ResponseEntity.status(HttpStatus.OK).body(formVO); + } + + /** + * 일계부 유효성 체크 및 데이터 조회 + * + * @param dailyRecordSeq 항목 일련번호 + */ + private DailyRecordDto vaildGetDailyRecord(Long dailyRecordSeq) { + DailyRecordDto dailyRecord = dailyRecordPortIn.detail(dailyRecordSeq); + if (dailyRecord == null || dailyRecord.getId() == null) { + throw new NoRecordDataException(); + } + + return dailyRecord; + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/model/DailyWorkUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/model/DailyWorkUIReqVO.java new file mode 100644 index 00000000..a3126482 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/model/DailyWorkUIReqVO.java @@ -0,0 +1,30 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web.model; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class DailyWorkUIReqVO { + /** + * 검색 월(yyyyMM) + */ + private String searchMonth; + /** + * 검색 그룸번호 + */ + private Integer groupNo; + /** + * 임가 일련번호 + */ + private Long householdSeq; + + /** + * 일계부 항목 일련번호 + */ + private Long dailyId; + /** + * 노동투입 일련번호 + */ + private Long id; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/model/SaveDailyWorkReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/model/SaveDailyWorkReqVO.java new file mode 100644 index 00000000..b851f06d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/model/SaveDailyWorkReqVO.java @@ -0,0 +1,86 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web.model; + +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString(callSuper = true) +public class SaveDailyWorkReqVO extends DailyWorkUIReqVO { + /** + * 품목명 + */ + @NotBlank(message = "품목명을 입력해 주세요.") + private String itemName; + /** + * 작업명 + */ + @NotBlank(message = "작업명을 입력해 주세요.") + private String workName; + /** + * 작업 면적 + */ + private Double workLandArea; + /** + * 작업 면적 단위 코드 + */ + private String areaUnitCode; + /** + * 작업 면적 단위 직업입력 + */ + private String areaUnitSelf; + /** + * 수확량 + */ + private Double harvestQuantity; + /** + * 수확량 단위 코드 + */ + private String harvestUnitCode; + /** + * 수확량 단위 직접입력 + */ + 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; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/validator/SaveDailyWorkValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/validator/SaveDailyWorkValidator.java new file mode 100644 index 00000000..2cc1ef22 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/validator/SaveDailyWorkValidator.java @@ -0,0 +1,76 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web.validator; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web.model.SaveDailyWorkReqVO; +import app.module.core.config.constants.CommonConstants; +import lombok.RequiredArgsConstructor; +import org.apache.tika.utils.StringUtils; +import org.springframework.stereotype.Component; +import org.springframework.validation.Errors; +import org.springframework.validation.Validator; + +@Component +@RequiredArgsConstructor +public class SaveDailyWorkValidator implements Validator { + @Override + public boolean supports(Class clazz) { + return SaveDailyWorkReqVO.class.equals(clazz); + } + + @Override + public void validate(Object target, Errors errors) { + SaveDailyWorkReqVO vo = (SaveDailyWorkReqVO) target; + + if (vo.getWorkLandArea() == null && !StringUtils.isBlank(vo.getAreaUnitCode())) { + errors.rejectValue( + "workLandArea", "valid.common.required", + "작업 면적을 입력해 주세요."); + } + + if (vo.getWorkLandArea() != null && StringUtils.isBlank(vo.getAreaUnitCode())) { + errors.rejectValue( + "areaUnitCode", "valid.common.required", + "단위를 선택해 주세요."); + } + + if (CommonConstants.AREA_CODE_OTHER.equals(vo.getAreaUnitCode()) && StringUtils.isBlank(vo.getAreaUnitSelf())) { + errors.rejectValue( + "areaUnitSelf", "valid.common.required", + "단위를 입력해 주세요."); + } + + if (vo.getHarvestQuantity() == null && !StringUtils.isBlank(vo.getHarvestUnitCode())) { + errors.rejectValue( + "harvestQuantity", "valid.common.required", + "수확량을 입력해 주세요."); + } + + if (vo.getHarvestQuantity() != null && StringUtils.isBlank(vo.getHarvestUnitCode())) { + errors.rejectValue( + "harvestUnitCode", "valid.common.required", + "단위를 선택해 주세요."); + } + + if (CommonConstants.UNIT_CODE_SELF.equals(vo.getHarvestUnitCode()) && StringUtils.isBlank(vo.getHarvestUnitSelf())) { + errors.rejectValue( + "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개의 노동투입시간을 입력해 주세요."); + errors.rejectValue("spouseTime", "valid.common.required"); + errors.rejectValue("familyMHours", "valid.common.required"); + errors.rejectValue("familyFHours", "valid.common.required"); + errors.rejectValue("hiredMHours", "valid.common.required"); + errors.rejectValue("hiredFHours", "valid.common.required"); + errors.rejectValue("sharedMHours", "valid.common.required"); + errors.rejectValue("sharedFHours", "valid.common.required"); + errors.rejectValue("volunteerMHours", "valid.common.required"); + errors.rejectValue("volunteerFHours", "valid.common.required"); + } + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/SaveDailyWorkPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/SaveDailyWorkPortIn.java new file mode 100644 index 00000000..1367d20c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/SaveDailyWorkPortIn.java @@ -0,0 +1,22 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.persistence.modal.GetDailyWorkDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web.model.DailyWorkUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web.model.SaveDailyWorkReqVO; + +public interface SaveDailyWorkPortIn { + /** + * 일계부 노동투입 조회 + * + * @param reqVO 검색 조건 + * @return 노동투입 상세 + */ + GetDailyWorkDto detail(DailyWorkUIReqVO reqVO); + + /** + * 일계부 노동투입 등록 + * + * @param formVO 입력 데이터 + */ + void create(SaveDailyWorkReqVO formVO); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/SaveDailyWorkPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/SaveDailyWorkPortOut.java new file mode 100644 index 00000000..2bb4fa0c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/SaveDailyWorkPortOut.java @@ -0,0 +1,23 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.persistence.modal.GetDailyWorkDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application.domain.GetDailyWorkCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application.domain.SaveDailyWorkCmd; + +public interface SaveDailyWorkPortOut { + /** + * 일계부 노동투입 조회 + * + * @param command 검색 조건 + * @return 노동투입 상세 + */ + GetDailyWorkDto detail(GetDailyWorkCmd command); + + /** + * 일계부 노동투입 등록 + * + * @param findCmd 검색 조건 + * @param command 입력 데이터 + */ + void create(GetDailyWorkCmd findCmd, SaveDailyWorkCmd command); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/application/SaveDailyWorkService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/application/SaveDailyWorkService.java new file mode 100644 index 00000000..112905dc --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/application/SaveDailyWorkService.java @@ -0,0 +1,66 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.persistence.modal.GetDailyWorkDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web.model.DailyWorkUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web.model.SaveDailyWorkReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.SaveDailyWorkPortIn; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.SaveDailyWorkPortOut; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application.domain.GetDailyWorkCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application.domain.SaveDailyWorkCmd; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class SaveDailyWorkService implements SaveDailyWorkPortIn { + private final SaveDailyWorkPortOut portOut; + private final DailyRecordPortIn dailyRecordPortIn; + + @Override + public GetDailyWorkDto detail(DailyWorkUIReqVO reqVO) { + GetDailyWorkCmd findCmd = new GetDailyWorkCmd( + reqVO.getSearchMonth(), + reqVO.getGroupNo(), + reqVO.getHouseholdSeq(), + reqVO.getId()); + + return portOut.detail(findCmd); + } + + @Override + public void create(SaveDailyWorkReqVO formVO) { + GetDailyWorkCmd findCmd = new GetDailyWorkCmd( + formVO.getSearchMonth(), + formVO.getGroupNo(), + formVO.getHouseholdSeq(), + formVO.getId()); + + SaveDailyWorkCmd command = + new SaveDailyWorkCmd( + formVO.getId(), + formVO.getDailyId(), + formVO.getItemName(), + formVO.getWorkName(), + formVO.getWorkLandArea(), + formVO.getAreaUnitCode(), + formVO.getAreaUnitSelf(), + formVO.getHarvestQuantity(), + formVO.getHarvestUnitCode(), + formVO.getHarvestUnitSelf(), + formVO.getOwnerTime(), + formVO.getSpouseTime(), + formVO.getFamilyMHours(), + formVO.getFamilyFHours(), + formVO.getHiredMHours(), + formVO.getHiredFHours(), + formVO.getSharedMHours(), + formVO.getSharedFHours(), + formVO.getVolunteerMHours(), + formVO.getVolunteerFHours()); + + portOut.create(findCmd, command); + + dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq()); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/application/domain/GetDailyWorkCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/application/domain/GetDailyWorkCmd.java new file mode 100644 index 00000000..f1818a09 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/application/domain/GetDailyWorkCmd.java @@ -0,0 +1,27 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class GetDailyWorkCmd { + /** + * 검색 월(yyyyMM) + */ + private String searchMonth; + /** + * 검색 그룸번호 + */ + private Integer groupNo; + /** + * 임가 일련번호 + */ + private Long householdSeq; + /** + * 노동투입 일련번호 + */ + private Long id; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/application/domain/SaveDailyWorkCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/application/domain/SaveDailyWorkCmd.java new file mode 100644 index 00000000..ff53c3fe --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/application/domain/SaveDailyWorkCmd.java @@ -0,0 +1,34 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@AllArgsConstructor +@ToString +public class SaveDailyWorkCmd extends AuditCommand { + private Long id; + private Long dailyRecordSeq; + private String itemName; + private String workName; + private Double workLandArea; + private String areaUnitCode; + private String areaUnitSelf; + private Double harvestQuantity; + private String harvestUnitCode; + 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; +} diff --git a/admin/src/main/resources/mappers/household/daily/SaveDailyWorkMapper.xml b/admin/src/main/resources/mappers/household/daily/SaveDailyWorkMapper.xml new file mode 100644 index 00000000..47d2d626 --- /dev/null +++ b/admin/src/main/resources/mappers/household/daily/SaveDailyWorkMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + insert into daily_work ( + daily_record_seq + , item_name, work_name + , work_land_area, area_unit_code, area_unit_self, harvest_quantity, harvest_unit_code, harvest_unit_self + , owner_time, spouse_time, family_m_hours, family_f_hours, hired_m_hours, hired_f_hours, shared_m_hours, shared_f_hours, volunteer_m_hours, volunteer_f_hours + , is_deleted + , + ) values ( + #{dailyRecordSeq} + , #{itemName}, #{workName} + , #{workLandArea}, #{areaUnitCode}, #{areaUnitSelf}, #{harvestQuantity}, #{harvestUnitCode}, #{harvestUnitSelf} + , #{ownerTime}, #{spouseTime}, #{familyMHours}, #{familyFHours}, #{hiredMHours}, #{hiredFHours}, #{sharedMHours}, #{sharedFHours}, #{volunteerMHours}, #{volunteerFHours} + , false + , + ) + + + + update daily_work set + , item_name = #{itemName} + , work_name = #{workName} + , work_land_area = #{workLandArea} + , area_unit_code = #{areaUnitCode} + , area_unit_self = #{areaUnitSelf} + , harvest_quantity = #{harvestQuantity} + , harvest_unit_code = #{harvestUnitCode} + , harvest_unit_self = #{harvestUnitSelf} + , owner_time = #{ownerTime} + , spouse_time = #{spouseTime} + , family_m_hours = #{familyMHours} + , family_f_hours = #{familyFHours} + , hired_m_hours = #{hiredMHours} + , hired_f_hours = #{hiredFHours} + , shared_m_hours = #{sharedMHours} + , shared_f_hours = #{sharedFHours} + , volunteer_m_hours = #{volunteerMHours} + , volunteer_f_hours = #{volunteerFHours} + where is_deleted = false + and daily_record_seq = #{dailyRecordSeq} + and id = #{id} + + + diff --git a/admin/src/main/resources/templates/households/modal/modal-daily-income.html b/admin/src/main/resources/templates/households/modal/modal-daily-income.html index 35cb2afb..1961a6ff 100644 --- a/admin/src/main/resources/templates/households/modal/modal-daily-income.html +++ b/admin/src/main/resources/templates/households/modal/modal-daily-income.html @@ -159,7 +159,7 @@ + + + + \ No newline at end of file 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 6653bb1d..d02d07a9 100644 --- a/admin/src/main/resources/templates/households/tab/daily-record.html +++ b/admin/src/main/resources/templates/households/tab/daily-record.html @@ -548,7 +548,7 @@ - ${ifNullHyphen(item.itemName)} + ${ifNullHyphen(item.itemName)} ${ifNullHyphen(item.workName)} ${ifNullHyphen(item.workLandArea)} ${ifNullHyphen(item.areaUnitText)} @@ -810,6 +810,8 @@ if (currentStep === 'INCOME') { showDailyIncomeModal(); + } else if (currentStep === 'WORK') { + showDailyWorkModal(); } else { alert('TODO : 추가'); } diff --git a/admin/src/main/resources/templates/households/{seq}.html b/admin/src/main/resources/templates/households/{seq}.html index 9d4bd5ea..bab55e44 100644 --- a/admin/src/main/resources/templates/households/{seq}.html +++ b/admin/src/main/resources/templates/households/{seq}.html @@ -177,6 +177,7 @@ + @@ -315,7 +316,7 @@ const unitArea = tr.querySelector('.unit-self-input'); const unitInput = tr.querySelector('.unit-self-input input'); - if (el.value === 'code.record.unit.self') { + if (el.value.indexOf('.self') !== -1) { unitInput.disabled = false; unitArea.classList.remove('input-disabled'); } else { diff --git a/front/src/main/resources/mappers/daily/DailyWorkMapper.xml b/front/src/main/resources/mappers/daily/DailyWorkMapper.xml index 2dd2b588..5f440c69 100644 --- a/front/src/main/resources/mappers/daily/DailyWorkMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyWorkMapper.xml @@ -9,7 +9,6 @@ , ds.work_land_area, ds.area_unit_code, ds.area_unit_self, ds.harvest_quantity, ds.harvest_unit_code, ds.harvest_unit_self , ds.owner_time, ds.spouse_time, ds.family_m_hours, ds.family_f_hours, ds.hired_m_hours , ds.hired_f_hours, ds.shared_m_hours, ds.shared_f_hours, ds.volunteer_m_hours, ds.volunteer_f_hours - , ds.is_deleted from daily_work ds where ds.is_deleted = false From c3c8859a28e5ef50311531fd500761eb69814f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 1 Jul 2025 10:43:09 +0900 Subject: [PATCH 04/14] =?UTF-8?q?[1=EC=B0=A8][BO]=20=EC=9E=84=EC=97=85?= =?UTF-8?q?=EB=85=B8=EB=8F=99=20=ED=88=AC=EC=9E=85=EC=9D=98=20=EC=9E=91?= =?UTF-8?q?=EC=97=85=20=EB=A9=B4=EC=A0=81=20=EC=A7=81=EC=A0=91=20=EC=9E=85?= =?UTF-8?q?=EB=A0=A5=20=EB=8B=A8=EC=9C=84=20=EB=AF=B8=EB=85=B8=EC=B6=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mappers/household/GetDailyRecordStatusDetailMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml b/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml index c0b3e8ea..49015667 100644 --- a/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml +++ b/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml @@ -59,7 +59,7 @@ dw.work_name, /* 작업명*/ dw.work_land_area, /* 작업 면적 */ CASE - WHEN dw.area_unit_code = 'code.record.unit.self' + WHEN dw.area_unit_code = 'code.record.area.self' THEN dw.area_unit_self ELSE ui_area.code_text END AS areaUnitText, /* 작업면적 단위 텍스트 */ @@ -83,7 +83,7 @@ dw.updated_at /* 최종수정날짜 */ FROM daily_work dw LEFT JOIN uicode ui_area - ON ui_area.parent_id = 'code.record.unit' + ON ui_area.parent_id = 'code.record.area' AND ui_area.id = dw.area_unit_code LEFT JOIN uicode ui_harvest ON ui_harvest.parent_id = 'code.record.unit' From 99e0258993f8dc4d05d99e354b3835f34575d60d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 1 Jul 2025 11:06:38 +0900 Subject: [PATCH 05/14] =?UTF-8?q?[BO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=82=AD=EC=A0=9C=20=EC=BF=BC?= =?UTF-8?q?=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../household/daily/RemoveDailyMapper.xml | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/admin/src/main/resources/mappers/household/daily/RemoveDailyMapper.xml b/admin/src/main/resources/mappers/household/daily/RemoveDailyMapper.xml index 43415611..e829295d 100644 --- a/admin/src/main/resources/mappers/household/daily/RemoveDailyMapper.xml +++ b/admin/src/main/resources/mappers/household/daily/RemoveDailyMapper.xml @@ -19,7 +19,10 @@ update daily_work set where is_deleted = false - and daily_record_seq = #{dailyRecordSeq} + and id IN + + #{id} + @@ -28,7 +31,10 @@ update daily_expense set where is_deleted = false - and daily_record_seq = #{dailyRecordSeq} + and id IN + + #{id} + @@ -37,7 +43,10 @@ update daily_power set where is_deleted = false - and daily_record_seq = #{dailyRecordSeq} + and id IN + + #{id} + @@ -46,7 +55,10 @@ update daily_forestry set where is_deleted = false - and daily_record_seq = #{dailyRecordSeq} + and id IN + + #{id} + @@ -55,7 +67,10 @@ update daily_farming set where is_deleted = false - and daily_record_seq = #{dailyRecordSeq} + and id IN + + #{id} + From 8eff4f5772bf6ade5249dda01c43897dfaa5ae57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 1 Jul 2025 11:23:06 +0900 Subject: [PATCH 06/14] =?UTF-8?q?[1=EC=B0=A8][FO]=2015=EC=9D=BC=EC=A0=84?= =?UTF-8?q?=EA=B9=8C=EC=A7=80=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EA=B0=80=EB=8A=A5,=20=EC=88=98=EC=9E=85=EC=99=B8?= =?UTF-8?q?=20=ED=95=AD=EB=AA=A9=EC=97=90=EC=84=9C=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=EB=B6=88=EA=B0=80=EA=B8=B0=EA=B0=84=EC=97=90=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=EB=93=B1=EB=A1=9D=EC=9D=B4=20=EA=B0=80=EB=8A=A5?= =?UTF-8?q?=ED=95=9C=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/module/core/config/application/util/DailyUtil.java | 6 ++---- .../src/main/resources/templates/record/expense/index.html | 3 ++- .../src/main/resources/templates/record/farming/index.html | 3 ++- .../src/main/resources/templates/record/forestry/index.html | 3 ++- front/src/main/resources/templates/record/power/index.html | 3 ++- front/src/main/resources/templates/record/work/index.html | 3 ++- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/app/module/core/config/application/util/DailyUtil.java b/core/src/main/java/app/module/core/config/application/util/DailyUtil.java index 247d6fb0..0e4be6a1 100644 --- a/core/src/main/java/app/module/core/config/application/util/DailyUtil.java +++ b/core/src/main/java/app/module/core/config/application/util/DailyUtil.java @@ -87,8 +87,7 @@ public class DailyUtil { * @return true=수정 가능, false=수정 불가 */ public boolean isModifiable(LocalDate startDate, LocalDate endDate) { - // TODO : 15일로 변경, 테스트를 위해 30일로 진행중 - LocalDate limitStart = LocalDate.now().minusDays(30); + LocalDate limitStart = LocalDate.now().minusDays(15); log.debug("isModifiable @@limitStart: {}, startDate: {}, endDate: {}", limitStart, startDate, endDate); return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate) || limitStart.isEqual(endDate)); @@ -101,8 +100,7 @@ public class DailyUtil { * @return */ public boolean isRegisterPossible(LocalDate startDate, LocalDate endDate) { - // TODO : 15일로 변경, 테스트를 위해 60일로 진행중 - LocalDate limitStart = LocalDate.now().minusDays(60); + LocalDate limitStart = LocalDate.now().minusDays(15); log.debug("isRegisterPossible @@limitStart: {}, startDate: {}, endDate: {}", limitStart, startDate, endDate); return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate)); diff --git a/front/src/main/resources/templates/record/expense/index.html b/front/src/main/resources/templates/record/expense/index.html index 95b8b5c9..c1fa1b2d 100644 --- a/front/src/main/resources/templates/record/expense/index.html +++ b/front/src/main/resources/templates/record/expense/index.html @@ -89,7 +89,8 @@ - diff --git a/front/src/main/resources/templates/record/farming/index.html b/front/src/main/resources/templates/record/farming/index.html index 918c23aa..b9ed6a39 100644 --- a/front/src/main/resources/templates/record/farming/index.html +++ b/front/src/main/resources/templates/record/farming/index.html @@ -87,7 +87,8 @@ - diff --git a/front/src/main/resources/templates/record/forestry/index.html b/front/src/main/resources/templates/record/forestry/index.html index d294ffb5..8324c0ba 100644 --- a/front/src/main/resources/templates/record/forestry/index.html +++ b/front/src/main/resources/templates/record/forestry/index.html @@ -87,7 +87,8 @@ - diff --git a/front/src/main/resources/templates/record/power/index.html b/front/src/main/resources/templates/record/power/index.html index da4f8544..bd07d638 100644 --- a/front/src/main/resources/templates/record/power/index.html +++ b/front/src/main/resources/templates/record/power/index.html @@ -77,7 +77,8 @@ - diff --git a/front/src/main/resources/templates/record/work/index.html b/front/src/main/resources/templates/record/work/index.html index 987d64f4..cb20f194 100644 --- a/front/src/main/resources/templates/record/work/index.html +++ b/front/src/main/resources/templates/record/work/index.html @@ -129,7 +129,8 @@ - From f540b842f47eaeecfd5737e8642221d35cecd0d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 1 Jul 2025 12:21:15 +0900 Subject: [PATCH 07/14] =?UTF-8?q?[BO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20?= =?UTF-8?q?=EC=A7=80=EC=B6=9C=20=EB=93=B1=EB=A1=9D,=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/SaveDailyExpenseDao.java | 39 +++ .../persistence/SaveDailyExpenseMapper.java | 39 +++ .../persistence/modal/GetDailyExpenseDto.java | 22 ++ .../web/SaveDailyExpenseController.java | 87 ++++++ .../web/model/DailyExpenseUIReqVO.java | 30 +++ .../web/model/SaveDailyExpenseReqVO.java | 51 ++++ .../validator/SaveDailyExpenseValidator.java | 51 ++++ .../ports/SaveDailyExpensePortIn.java | 23 ++ .../ports/SaveDailyExpensePortOut.java | 24 ++ .../application/SaveDailyExpenseService.java | 60 +++++ .../domain/GetDailyExpenseCmd.java | 27 ++ .../domain/SaveDailyExpenseCmd.java | 34 +++ .../daily/SaveDailyExpenseMapper.xml | 58 ++++ .../households/modal/modal-daily-expense.html | 252 ++++++++++++++++++ .../households/modal/modal-daily-income.html | 1 + .../households/tab/daily-record.html | 4 +- .../resources/templates/households/{seq}.html | 17 ++ .../constants/DailyRecordConstants.java | 12 + .../application/DailyExpenseService.java | 5 +- 19 files changed, 833 insertions(+), 3 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/SaveDailyExpenseDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/SaveDailyExpenseMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/modal/GetDailyExpenseDto.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/SaveDailyExpenseController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/model/DailyExpenseUIReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/model/SaveDailyExpenseReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/validator/SaveDailyExpenseValidator.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/SaveDailyExpensePortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/SaveDailyExpensePortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/application/SaveDailyExpenseService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/application/domain/GetDailyExpenseCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/application/domain/SaveDailyExpenseCmd.java create mode 100644 admin/src/main/resources/mappers/household/daily/SaveDailyExpenseMapper.xml create mode 100644 admin/src/main/resources/templates/households/modal/modal-daily-expense.html diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/SaveDailyExpenseDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/SaveDailyExpenseDao.java new file mode 100644 index 00000000..be157920 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/SaveDailyExpenseDao.java @@ -0,0 +1,39 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.persistence.modal.GetDailyExpenseDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.SaveDailyExpensePortOut; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application.domain.GetDailyExpenseCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application.domain.SaveDailyExpenseCmd; +import app.module.core.config.application.annotation.CreateCommand; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +@RequiredArgsConstructor +public class SaveDailyExpenseDao implements SaveDailyExpensePortOut { + private final SaveDailyExpenseMapper dailyExpenseMapper; + + @Override + public GetDailyExpenseDto detail(GetDailyExpenseCmd command) { + + return dailyExpenseMapper.getDailyExpense(command); + } + + @CreateCommand + @Override + public void create(GetDailyExpenseCmd findCmd, SaveDailyExpenseCmd command) { + Integer existCount = dailyExpenseMapper.getRecordExistCount(findCmd); + if (existCount == 0) { + dailyExpenseMapper.createDailyExpense(command); + + log.debug("[CreateDailyExpense] command={}", command); + } else { + dailyExpenseMapper.updateDailyExpense(command); + + log.debug("[UpdateDailyExpense] command={}", command); + } + } + +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/SaveDailyExpenseMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/SaveDailyExpenseMapper.java new file mode 100644 index 00000000..fee1bee5 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/SaveDailyExpenseMapper.java @@ -0,0 +1,39 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.persistence.modal.GetDailyExpenseDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application.domain.GetDailyExpenseCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application.domain.SaveDailyExpenseCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SaveDailyExpenseMapper { + /** + * 일계부 지출 데이터 조회 + * + * @param command 검색 조건 + * @return 지출 데이터 + */ + GetDailyExpenseDto getDailyExpense(GetDailyExpenseCmd command); + + /** + * 일계부 지출 데이터 존재 여부 + * + * @param command 검색 조건 + * @return 중복 개수 + */ + Integer getRecordExistCount(GetDailyExpenseCmd command); + + /** + * 일계부 지출 등록 + * + * @param command 등록 데이터 + */ + void createDailyExpense(SaveDailyExpenseCmd command); + + /** + * 일계부 지출 수정 + * + * @param command 수정 데이터 + */ + void updateDailyExpense(SaveDailyExpenseCmd command); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/modal/GetDailyExpenseDto.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/modal/GetDailyExpenseDto.java new file mode 100644 index 00000000..f1a54bc2 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/modal/GetDailyExpenseDto.java @@ -0,0 +1,22 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.persistence.modal; + +import app.module.core.config.application.enums.DailyInputType; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class GetDailyExpenseDto { + private Long id; + private Long dailyRecordSeq; + private DailyInputType inputType; + private Boolean credit; + private String expenseKind; + private String sourcePurpose; + private String quantity; + private String unitCode; + private String unitLabel; + private String unitSelf; + private Long price; + private Long estimatedValue; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/SaveDailyExpenseController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/SaveDailyExpenseController.java new file mode 100644 index 00000000..9eae6c30 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/SaveDailyExpenseController.java @@ -0,0 +1,87 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.web; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.persistence.modal.GetDailyExpenseDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.web.model.DailyExpenseUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.web.model.SaveDailyExpenseReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.web.validator.SaveDailyExpenseValidator; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.SaveDailyExpensePortIn; +import app.module.core.config.application.exception.NoRecordDataException; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +@Slf4j +@RestController +@RequiredArgsConstructor +@RequestMapping(path = "/api/household/daily/expense") +public class SaveDailyExpenseController { + private final DailyRecordPortIn dailyRecordPortIn; + private final SaveDailyExpensePortIn dailyExpensePortIn; + private final SaveDailyExpenseValidator dailyExpenseValidator; + + /** + * 일계부 지출 조회 + * + * @param id 지출 일련번호 + * @param reqVO 검색 조건 + */ + @GetMapping(path = "/{id}") + ResponseEntity detail(@PathVariable("id") String id, @ModelAttribute DailyExpenseUIReqVO reqVO) { + + reqVO.setId(Long.parseLong(id)); + + GetDailyExpenseDto detail = dailyExpensePortIn.detail(reqVO); + if (detail == null) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); + } + + return ResponseEntity.status(HttpStatus.OK).body(detail); + } + + /** + * 일계부 지출 등록 처리 + * + * @param formVO 입력 데이터 + * @param bindingResult BindingResult + */ + @PostMapping(path = "/save") + ResponseEntity create(@Valid @RequestBody SaveDailyExpenseReqVO formVO, BindingResult bindingResult) { + + dailyExpenseValidator.validate(formVO, bindingResult); + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getFieldErrors()); + } + + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(formVO.getDailyId()); + + formVO.setSearchMonth(dailyRecord.getRecordMonth()); + formVO.setGroupNo(dailyRecord.getGroupNo()); + formVO.setDailyId(dailyRecord.getId()); + log.debug("formVO: {}", formVO); + + dailyExpensePortIn.create(formVO); + + return ResponseEntity.status(HttpStatus.OK).body(formVO); + } + + /** + * 일계부 유효성 체크 및 데이터 조회 + * + * @param dailyRecordSeq 항목 일련번호 + */ + private DailyRecordDto vaildGetDailyRecord(Long dailyRecordSeq) { + DailyRecordDto dailyRecord = dailyRecordPortIn.detail(dailyRecordSeq); + if (dailyRecord == null || dailyRecord.getId() == null) { + throw new NoRecordDataException(); + } + + return dailyRecord; + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/model/DailyExpenseUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/model/DailyExpenseUIReqVO.java new file mode 100644 index 00000000..576871ca --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/model/DailyExpenseUIReqVO.java @@ -0,0 +1,30 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.web.model; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class DailyExpenseUIReqVO { + /** + * 검색 월(yyyyMM) + */ + private String searchMonth; + /** + * 검색 그룸번호 + */ + private Integer groupNo; + /** + * 임가 일련번호 + */ + private Long householdSeq; + + /** + * 일계부 항목 일련번호 + */ + private Long dailyId; + /** + * 지출 일련번호 + */ + private Long id; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/model/SaveDailyExpenseReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/model/SaveDailyExpenseReqVO.java new file mode 100644 index 00000000..c415cfde --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/model/SaveDailyExpenseReqVO.java @@ -0,0 +1,51 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.web.model; + +import app.module.core.config.application.enums.DailyInputType; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString(callSuper = true) +public class SaveDailyExpenseReqVO extends DailyExpenseUIReqVO { + /** + * 등록 유형 + */ + private DailyInputType inputType; + /** + * 외상판매 여부 + */ + private Boolean credit; + /** + * 지출의 종류 직접입력 + */ + @NotBlank(message = "지출 종류를 입력해 주세요.") + private String expenseKind; + /** + * 용도 + */ + @NotBlank(message = "용도를 입력해 주세요.") + private String sourcePurpose; + /** + * 수량 + */ + private Double quantity; + /** + * 단위 코드 + */ + private String unitCode; + /** + * 단위 직접 입력 + */ + private String unitSelf; + /** + * 현금 + */ + private Long price; + /** + * 현물평가액 + */ + private Long estimatedValue; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/validator/SaveDailyExpenseValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/validator/SaveDailyExpenseValidator.java new file mode 100644 index 00000000..b475d1d3 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/validator/SaveDailyExpenseValidator.java @@ -0,0 +1,51 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.web.validator; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.web.model.SaveDailyExpenseReqVO; +import app.module.core.config.constants.CommonConstants; +import lombok.RequiredArgsConstructor; +import org.apache.tika.utils.StringUtils; +import org.springframework.stereotype.Component; +import org.springframework.validation.Errors; +import org.springframework.validation.Validator; + +@Component +@RequiredArgsConstructor +public class SaveDailyExpenseValidator implements Validator { + + @Override + public boolean supports(Class clazz) { + return SaveDailyExpenseReqVO.class.equals(clazz); + } + + @Override + public void validate(Object target, Errors errors) { + SaveDailyExpenseReqVO vo = (SaveDailyExpenseReqVO) target; + + if (vo.getQuantity() == null && !StringUtils.isBlank(vo.getUnitCode())) { + errors.rejectValue( + "quantity", "valid.common.required", + "수량을 입력해 주세요."); + } + + if (vo.getQuantity() != null && StringUtils.isBlank(vo.getUnitCode())) { + errors.rejectValue( + "unitCode", "valid.common.required", + "단위를 선택해 주세요."); + } + + if (CommonConstants.UNIT_CODE_SELF.equals(vo.getUnitCode()) && StringUtils.isBlank(vo.getUnitSelf())) { + errors.rejectValue( + "unitSelf", "valid.common.required", + "단위를 입력해 주세요."); + } + + if (vo.getPrice() == null && vo.getEstimatedValue() == null) { + errors.rejectValue( + "price", "valid.common.required", + "현금 또는 현물평가액을 입력해 주세요."); + errors.rejectValue( + "estimatedValue", "valid.common.required", + "현금 또는 현물평가액을 입력해 주세요."); + } + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/SaveDailyExpensePortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/SaveDailyExpensePortIn.java new file mode 100644 index 00000000..036bd0e6 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/SaveDailyExpensePortIn.java @@ -0,0 +1,23 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports; + + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.persistence.modal.GetDailyExpenseDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.web.model.DailyExpenseUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.web.model.SaveDailyExpenseReqVO; + +public interface SaveDailyExpensePortIn { + /** + * 일계부 지출 조회 + * + * @param reqVO 검색 조건 + * @return 지출 상세 + */ + GetDailyExpenseDto detail(DailyExpenseUIReqVO reqVO); + + /** + * 일계부 지출 등록 + * + * @param formVO 입력 데이터 + */ + void create(SaveDailyExpenseReqVO formVO); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/SaveDailyExpensePortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/SaveDailyExpensePortOut.java new file mode 100644 index 00000000..d871c292 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/SaveDailyExpensePortOut.java @@ -0,0 +1,24 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports; + + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.persistence.modal.GetDailyExpenseDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application.domain.GetDailyExpenseCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application.domain.SaveDailyExpenseCmd; + +public interface SaveDailyExpensePortOut { + /** + * 일계부 지출 조회 + * + * @param command 검색 조건 + * @return 지출 상세 + */ + GetDailyExpenseDto detail(GetDailyExpenseCmd command); + + /** + * 일계부 지출 등록 + * + * @param findCmd 검색 조건 + * @param command 입력 데이터 + */ + void create(GetDailyExpenseCmd findCmd, SaveDailyExpenseCmd command); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/application/SaveDailyExpenseService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/application/SaveDailyExpenseService.java new file mode 100644 index 00000000..c8626e1b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/application/SaveDailyExpenseService.java @@ -0,0 +1,60 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.persistence.modal.GetDailyExpenseDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.web.model.DailyExpenseUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.web.model.SaveDailyExpenseReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.SaveDailyExpensePortIn; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.SaveDailyExpensePortOut; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application.domain.GetDailyExpenseCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application.domain.SaveDailyExpenseCmd; +import app.module.core.config.constants.DailyRecordConstants; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class SaveDailyExpenseService implements SaveDailyExpensePortIn { + private final SaveDailyExpensePortOut portOut; + private final DailyRecordPortIn dailyRecordPortIn; + + @Override + public GetDailyExpenseDto detail(DailyExpenseUIReqVO reqVO) { + GetDailyExpenseCmd findCmd = new GetDailyExpenseCmd( + reqVO.getSearchMonth(), + reqVO.getGroupNo(), + reqVO.getHouseholdSeq(), + reqVO.getId()); + + return portOut.detail(findCmd); + } + + @Override + public void create(SaveDailyExpenseReqVO formVO) { + GetDailyExpenseCmd findCmd = new GetDailyExpenseCmd( + formVO.getSearchMonth(), + formVO.getGroupNo(), + formVO.getHouseholdSeq(), + formVO.getId()); + + SaveDailyExpenseCmd command = + new SaveDailyExpenseCmd( + formVO.getId(), + formVO.getDailyId(), + formVO.getInputType(), + DailyRecordConstants.EXPENSE_CATEGORY, + (formVO.getCredit() ? DailyRecordConstants.EXPENSE_INCOME_MARK : null), + formVO.getCredit(), + formVO.getExpenseKind(), + formVO.getSourcePurpose(), + formVO.getQuantity(), + formVO.getUnitCode(), + formVO.getUnitSelf(), + formVO.getPrice(), + formVO.getEstimatedValue()); + + portOut.create(findCmd, command); + + dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq()); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/application/domain/GetDailyExpenseCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/application/domain/GetDailyExpenseCmd.java new file mode 100644 index 00000000..a376b6cd --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/application/domain/GetDailyExpenseCmd.java @@ -0,0 +1,27 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class GetDailyExpenseCmd { + /** + * 검색 월(yyyyMM) + */ + private String searchMonth; + /** + * 검색 그룸번호 + */ + private Integer groupNo; + /** + * 임가 일련번호 + */ + private Long householdSeq; + /** + * 지출 일련번호 + */ + private Long id; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/application/domain/SaveDailyExpenseCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/application/domain/SaveDailyExpenseCmd.java new file mode 100644 index 00000000..03a8edac --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/application/domain/SaveDailyExpenseCmd.java @@ -0,0 +1,34 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import app.module.core.config.application.enums.DailyInputType; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@AllArgsConstructor +@ToString +public class SaveDailyExpenseCmd extends AuditCommand { + private Long id; + private Long dailyRecordSeq; + private DailyInputType inputType; + /** + * 유형 + */ + private String category; + /** + * 수입 부호 + */ + private String incomeMark; + private Boolean credit; + private String expenseKind; + private String sourcePurpose; + private Double quantity; + private String unitCode; + private String unitSelf; + private Long price; + private Long estimatedValue; +} diff --git a/admin/src/main/resources/mappers/household/daily/SaveDailyExpenseMapper.xml b/admin/src/main/resources/mappers/household/daily/SaveDailyExpenseMapper.xml new file mode 100644 index 00000000..af768bb7 --- /dev/null +++ b/admin/src/main/resources/mappers/household/daily/SaveDailyExpenseMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + insert into daily_expense ( + daily_record_seq, input_type, category, income_mark + , is_credit, expense_kind, source_purpose + , quantity, unit_code, unit_self, price, estimated_value + , is_deleted + , + ) values ( + #{dailyRecordSeq}, #{inputType}, #{category}, #{incomeMark} + , #{credit}, #{expenseKind}, #{sourcePurpose} + , #{quantity}, #{unitCode}, #{unitSelf}, #{price}, #{estimatedValue} + , false + , + ) + + + + update daily_expense set + , is_credit = #{credit} + , income_mark = #{incomeMark} + , expense_kind = #{expenseKind} + , source_purpose = #{sourcePurpose} + , quantity = #{quantity} + , unit_code = #{unitCode} + , unit_self = #{unitSelf} + , price = #{price} + , estimated_value = #{estimatedValue} + where is_deleted = false + and daily_record_seq = #{dailyRecordSeq} + and id = #{id} + + + diff --git a/admin/src/main/resources/templates/households/modal/modal-daily-expense.html b/admin/src/main/resources/templates/households/modal/modal-daily-expense.html new file mode 100644 index 00000000..6906e4c0 --- /dev/null +++ b/admin/src/main/resources/templates/households/modal/modal-daily-expense.html @@ -0,0 +1,252 @@ + + + +
+
+ + + + + + + +
+ + + + +
+ \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/modal/modal-daily-income.html b/admin/src/main/resources/templates/households/modal/modal-daily-income.html index 1961a6ff..071b3dc6 100644 --- a/admin/src/main/resources/templates/households/modal/modal-daily-income.html +++ b/admin/src/main/resources/templates/households/modal/modal-daily-income.html @@ -173,6 +173,7 @@ form.estimatedValue.value = ''; document.getElementById('isCredit_N').checked = true; + priceDisabledReset(form.price, form.estimatedValue); } // 일계부 상세 값 set 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 d02d07a9..bed9acb9 100644 --- a/admin/src/main/resources/templates/households/tab/daily-record.html +++ b/admin/src/main/resources/templates/households/tab/daily-record.html @@ -599,7 +599,7 @@ ${item.isCredit ? "Y" : "N"} - ${ifNullHyphen(item.expenseKind)} + ${ifNullHyphen(item.expenseKind)} ${ifNullHyphen(item.sourcePurpose)} ${ifNullHyphen(item.quantity)} ${ifNullHyphen(item.unitText)} @@ -812,6 +812,8 @@ showDailyIncomeModal(); } else if (currentStep === 'WORK') { showDailyWorkModal(); + } else if (currentStep === 'EXPENSE') { + showDailyExpenseModal(); } else { alert('TODO : 추가'); } diff --git a/admin/src/main/resources/templates/households/{seq}.html b/admin/src/main/resources/templates/households/{seq}.html index bab55e44..b65ca452 100644 --- a/admin/src/main/resources/templates/households/{seq}.html +++ b/admin/src/main/resources/templates/households/{seq}.html @@ -178,6 +178,7 @@ + @@ -341,6 +342,22 @@ disableArea.classList.add('input-disabled'); } } + + const priceDisabledReset = (el, disableEl) => { + let wrap = null; + + if (el.value === '') { + wrap = el.closest('td'); + wrap.querySelector('input').disabled = false; + wrap.querySelector('.component-input').classList.remove('input-disabled'); + } + + if (disableEl.value === '') { + wrap = disableEl.closest('td'); + wrap.querySelector('input').disabled = false; + wrap.querySelector('.component-input').classList.remove('input-disabled'); + } + } diff --git a/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java b/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java index 43a7686f..4fc81f5a 100644 --- a/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java +++ b/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java @@ -16,4 +16,16 @@ public class DailyRecordConstants { * [정책] 외상판매 Y 일 경우 지출부호 91206 적재 */ public static final String INCOME_EXPENSE_MARK = "91206"; + + /** + * 지출의 유형 + * [정책] 2 고정 + */ + public static final String EXPENSE_CATEGORY = "2"; + + /** + * 지출의 수입부호 + * [정책] 외상판매 Y 일 경우 수입부호 52210 적재 + */ + public static final String EXPENSE_INCOME_MARK = "52210"; } 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 4e95d946..be06f0c9 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 @@ -1,5 +1,6 @@ package app.module.front.usecase.daily.expense.ports.application; +import app.module.core.config.constants.DailyRecordConstants; import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; @@ -98,8 +99,8 @@ public class DailyExpenseService implements DailyExpensePortIn { formVO.getId(), formVO.getDailyRecordSeq(), formVO.getInputType(), - "2", // [정책] 2 고정 - (formVO.getCredit() ? "52210" : null), // [정책] 외상판매 Y 일 경우 수입부호 52210 적재 + DailyRecordConstants.EXPENSE_CATEGORY, + (formVO.getCredit() ? DailyRecordConstants.EXPENSE_INCOME_MARK : null), formVO.getCredit(), formVO.getExpenseKind(), formVO.getSourcePurpose(), From 15dd6a47981df92b562289987405713059ced173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 1 Jul 2025 13:59:53 +0900 Subject: [PATCH 08/14] =?UTF-8?q?[BO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20?= =?UTF-8?q?=EB=8F=99=EB=A0=A5=20=EC=82=AC=EC=9A=A9=EC=8B=9C=EA=B0=84?= =?UTF-8?q?=EB=93=B1=EB=A1=9D,=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/SaveDailyPowerDao.java | 39 ++++ .../persistence/SaveDailyPowerMapper.java | 39 ++++ .../persistence/modal/GetDailyPowerDto.java | 14 ++ .../web/SaveDailyPowerController.java | 87 +++++++++ .../adapters/web/model/DailyPowerUIReqVO.java | 30 +++ .../web/model/SaveDailyPowerReqVO.java | 26 +++ .../validator/SaveDailyPowerValidator.java | 32 ++++ .../ports/SaveDailyPowerPortIn.java | 22 +++ .../ports/SaveDailyPowerPortOut.java | 23 +++ .../application/SaveDailyPowerService.java | 51 +++++ .../application/domain/GetDailyPowerCmd.java | 27 +++ .../application/domain/SaveDailyPowerCmd.java | 19 ++ .../household/daily/SaveDailyPowerMapper.xml | 49 +++++ .../households/modal/modal-daily-power.html | 177 ++++++++++++++++++ .../households/tab/daily-record.html | 4 +- .../resources/templates/households/{seq}.html | 1 + 16 files changed, 639 insertions(+), 1 deletion(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/persistence/SaveDailyPowerDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/persistence/SaveDailyPowerMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/persistence/modal/GetDailyPowerDto.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/SaveDailyPowerController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/model/DailyPowerUIReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/model/SaveDailyPowerReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/validator/SaveDailyPowerValidator.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/ports/SaveDailyPowerPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/ports/SaveDailyPowerPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/ports/application/SaveDailyPowerService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/ports/application/domain/GetDailyPowerCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/ports/application/domain/SaveDailyPowerCmd.java create mode 100644 admin/src/main/resources/mappers/household/daily/SaveDailyPowerMapper.xml create mode 100644 admin/src/main/resources/templates/households/modal/modal-daily-power.html diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/persistence/SaveDailyPowerDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/persistence/SaveDailyPowerDao.java new file mode 100644 index 00000000..615bc870 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/persistence/SaveDailyPowerDao.java @@ -0,0 +1,39 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.persistence.modal.GetDailyPowerDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.SaveDailyPowerPortOut; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application.domain.GetDailyPowerCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application.domain.SaveDailyPowerCmd; +import app.module.core.config.application.annotation.CreateCommand; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +@RequiredArgsConstructor +public class SaveDailyPowerDao implements SaveDailyPowerPortOut { + private final SaveDailyPowerMapper dailyPowerMapper; + + @Override + public GetDailyPowerDto detail(GetDailyPowerCmd command) { + + return dailyPowerMapper.getDailyPower(command); + } + + @CreateCommand + @Override + public void create(GetDailyPowerCmd findCmd, SaveDailyPowerCmd command) { + Integer existCount = dailyPowerMapper.getRecordExistCount(findCmd); + if (existCount == 0) { + dailyPowerMapper.createDailyPower(command); + + log.debug("[CreateDailyPower] command={}", command); + } else { + dailyPowerMapper.updateDailyPower(command); + + log.debug("[UpdateDailyPower] command={}", command); + } + } + +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/persistence/SaveDailyPowerMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/persistence/SaveDailyPowerMapper.java new file mode 100644 index 00000000..31187f99 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/persistence/SaveDailyPowerMapper.java @@ -0,0 +1,39 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.persistence.modal.GetDailyPowerDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application.domain.GetDailyPowerCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application.domain.SaveDailyPowerCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SaveDailyPowerMapper { + /** + * 일계부 동력 사용시간 데이터 조회 + * + * @param command 검색 조건 + * @return 동력 사용시간 데이터 + */ + GetDailyPowerDto getDailyPower(GetDailyPowerCmd command); + + /** + * 일계부 동력 사용시간 데이터 존재 여부 + * + * @param command 검색 조건 + * @return 중복 개수 + */ + Integer getRecordExistCount(GetDailyPowerCmd command); + + /** + * 일계부 동력 사용시간 등록 + * + * @param command 등록 데이터 + */ + void createDailyPower(SaveDailyPowerCmd command); + + /** + * 일계부 동력 사용시간 수정 + * + * @param command 수정 데이터 + */ + void updateDailyPower(SaveDailyPowerCmd command); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/persistence/modal/GetDailyPowerDto.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/persistence/modal/GetDailyPowerDto.java new file mode 100644 index 00000000..620e9d12 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/persistence/modal/GetDailyPowerDto.java @@ -0,0 +1,14 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.persistence.modal; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class GetDailyPowerDto { + private Long id; + private Long dailyRecordSeq; + private String equipmentName; + private String ownedHours; + private String leasedHours; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/SaveDailyPowerController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/SaveDailyPowerController.java new file mode 100644 index 00000000..280f0311 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/SaveDailyPowerController.java @@ -0,0 +1,87 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.persistence.modal.GetDailyPowerDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model.DailyPowerUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model.SaveDailyPowerReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.validator.SaveDailyPowerValidator; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.SaveDailyPowerPortIn; +import app.module.core.config.application.exception.NoRecordDataException; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +@Slf4j +@RestController +@RequiredArgsConstructor +@RequestMapping(path = "/api/household/daily/power") +public class SaveDailyPowerController { + private final DailyRecordPortIn dailyRecordPortIn; + private final SaveDailyPowerPortIn dailyPowerPortIn; + private final SaveDailyPowerValidator dailyPowerValidator; + + /** + * 일계부 동력 사용시간 조회 + * + * @param id 동력 사용시간 일련번호 + * @param reqVO 검색 조건 + */ + @GetMapping(path = "/{id}") + ResponseEntity detail(@PathVariable("id") String id, @ModelAttribute DailyPowerUIReqVO reqVO) { + + reqVO.setId(Long.parseLong(id)); + + GetDailyPowerDto detail = dailyPowerPortIn.detail(reqVO); + if (detail == null) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); + } + + return ResponseEntity.status(HttpStatus.OK).body(detail); + } + + /** + * 일계부 동력 사용시간 등록 처리 + * + * @param formVO 입력 데이터 + * @param bindingResult BindingResult + */ + @PostMapping(path = "/save") + ResponseEntity create(@Valid @RequestBody SaveDailyPowerReqVO formVO, BindingResult bindingResult) { + + dailyPowerValidator.validate(formVO, bindingResult); + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getFieldErrors()); + } + + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(formVO.getDailyId()); + + formVO.setSearchMonth(dailyRecord.getRecordMonth()); + formVO.setGroupNo(dailyRecord.getGroupNo()); + formVO.setDailyId(dailyRecord.getId()); + log.debug("formVO: {}", formVO); + + dailyPowerPortIn.create(formVO); + + return ResponseEntity.status(HttpStatus.OK).body(formVO); + } + + /** + * 일계부 유효성 체크 및 데이터 조회 + * + * @param dailyRecordSeq 항목 일련번호 + */ + private DailyRecordDto vaildGetDailyRecord(Long dailyRecordSeq) { + DailyRecordDto dailyRecord = dailyRecordPortIn.detail(dailyRecordSeq); + if (dailyRecord == null || dailyRecord.getId() == null) { + throw new NoRecordDataException(); + } + + return dailyRecord; + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/model/DailyPowerUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/model/DailyPowerUIReqVO.java new file mode 100644 index 00000000..60994999 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/model/DailyPowerUIReqVO.java @@ -0,0 +1,30 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class DailyPowerUIReqVO { + /** + * 검색 월(yyyyMM) + */ + private String searchMonth; + /** + * 검색 그룸번호 + */ + private Integer groupNo; + /** + * 임가 일련번호 + */ + private Long householdSeq; + + /** + * 일계부 항목 일련번호 + */ + private Long dailyId; + /** + * 동력 사용시간 일련번호 + */ + private Long id; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/model/SaveDailyPowerReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/model/SaveDailyPowerReqVO.java new file mode 100644 index 00000000..56c4c43b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/model/SaveDailyPowerReqVO.java @@ -0,0 +1,26 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model.DailyPowerUIReqVO; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString(callSuper = true) +public class SaveDailyPowerReqVO extends DailyPowerUIReqVO { + /** + * 명칭 + */ + @NotBlank(message = "명칭을 입력해 주세요.") + private String equipmentName; + /** + * 자가 사용시간 + */ + private Double ownedHours; + /** + * 임차 사용시간 + */ + private Double leasedHours; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/validator/SaveDailyPowerValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/validator/SaveDailyPowerValidator.java new file mode 100644 index 00000000..5a1d9f67 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/adapters/web/validator/SaveDailyPowerValidator.java @@ -0,0 +1,32 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.validator; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model.SaveDailyPowerReqVO; +import app.module.core.config.constants.CommonConstants; +import lombok.RequiredArgsConstructor; +import org.apache.tika.utils.StringUtils; +import org.springframework.stereotype.Component; +import org.springframework.validation.Errors; +import org.springframework.validation.Validator; + +@Component +@RequiredArgsConstructor +public class SaveDailyPowerValidator implements Validator { + @Override + public boolean supports(Class clazz) { + return SaveDailyPowerReqVO.class.equals(clazz); + } + + @Override + public void validate(Object target, Errors errors) { + SaveDailyPowerReqVO vo = (SaveDailyPowerReqVO) target; + + if (vo.getOwnedHours() == null && vo.getLeasedHours() == null) { + errors.rejectValue( + "ownedHours", "valid.common.required", + "자가 사용시간 또는 임차 사용시간을 입력해 주세요."); + errors.rejectValue( + "leasedHours", "valid.common.required", + "자가 사용시간 또는 임차 사용시간을 입력해 주세요."); + } + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/ports/SaveDailyPowerPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/ports/SaveDailyPowerPortIn.java new file mode 100644 index 00000000..2594a733 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/ports/SaveDailyPowerPortIn.java @@ -0,0 +1,22 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.persistence.modal.GetDailyPowerDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model.DailyPowerUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model.SaveDailyPowerReqVO; + +public interface SaveDailyPowerPortIn { + /** + * 일계부 동력 사용시간 조회 + * + * @param reqVO 검색 조건 + * @return 동력 사용시간 상세 + */ + GetDailyPowerDto detail(DailyPowerUIReqVO reqVO); + + /** + * 일계부 동력 사용시간 등록 + * + * @param formVO 입력 데이터 + */ + void create(SaveDailyPowerReqVO formVO); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/ports/SaveDailyPowerPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/ports/SaveDailyPowerPortOut.java new file mode 100644 index 00000000..3e1e0528 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/ports/SaveDailyPowerPortOut.java @@ -0,0 +1,23 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.persistence.modal.GetDailyPowerDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application.domain.GetDailyPowerCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application.domain.SaveDailyPowerCmd; + +public interface SaveDailyPowerPortOut { + /** + * 일계부 동력 사용시간 조회 + * + * @param command 검색 조건 + * @return 동력 사용시간 상세 + */ + GetDailyPowerDto detail(GetDailyPowerCmd command); + + /** + * 일계부 동력 사용시간 등록 + * + * @param findCmd 검색 조건 + * @param command 입력 데이터 + */ + void create(GetDailyPowerCmd findCmd, SaveDailyPowerCmd command); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/ports/application/SaveDailyPowerService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/ports/application/SaveDailyPowerService.java new file mode 100644 index 00000000..cdbcb7ec --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/ports/application/SaveDailyPowerService.java @@ -0,0 +1,51 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.persistence.modal.GetDailyPowerDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model.DailyPowerUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model.SaveDailyPowerReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.SaveDailyPowerPortIn; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.SaveDailyPowerPortOut; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application.domain.GetDailyPowerCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application.domain.SaveDailyPowerCmd; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class SaveDailyPowerService implements SaveDailyPowerPortIn { + private final SaveDailyPowerPortOut portOut; + private final DailyRecordPortIn dailyRecordPortIn; + + @Override + public GetDailyPowerDto detail(DailyPowerUIReqVO reqVO) { + GetDailyPowerCmd findCmd = new GetDailyPowerCmd( + reqVO.getSearchMonth(), + reqVO.getGroupNo(), + reqVO.getHouseholdSeq(), + reqVO.getId()); + + return portOut.detail(findCmd); + } + + @Override + public void create(SaveDailyPowerReqVO formVO) { + GetDailyPowerCmd findCmd = new GetDailyPowerCmd( + formVO.getSearchMonth(), + formVO.getGroupNo(), + formVO.getHouseholdSeq(), + formVO.getId()); + + SaveDailyPowerCmd command = + new SaveDailyPowerCmd( + formVO.getId(), + formVO.getDailyId(), + formVO.getEquipmentName(), + formVO.getOwnedHours(), + formVO.getLeasedHours()); + + portOut.create(findCmd, command); + + dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq()); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/ports/application/domain/GetDailyPowerCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/ports/application/domain/GetDailyPowerCmd.java new file mode 100644 index 00000000..caa7611f --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/ports/application/domain/GetDailyPowerCmd.java @@ -0,0 +1,27 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class GetDailyPowerCmd { + /** + * 검색 월(yyyyMM) + */ + private String searchMonth; + /** + * 검색 그룸번호 + */ + private Integer groupNo; + /** + * 임가 일련번호 + */ + private Long householdSeq; + /** + * 동력 사용시간 일련번호 + */ + private Long id; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/ports/application/domain/SaveDailyPowerCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/ports/application/domain/SaveDailyPowerCmd.java new file mode 100644 index 00000000..36ca2f46 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyPower/ports/application/domain/SaveDailyPowerCmd.java @@ -0,0 +1,19 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@AllArgsConstructor +@ToString +public class SaveDailyPowerCmd extends AuditCommand { + private Long id; + private Long dailyRecordSeq; + private String equipmentName; + private Double ownedHours; + private Double leasedHours; +} diff --git a/admin/src/main/resources/mappers/household/daily/SaveDailyPowerMapper.xml b/admin/src/main/resources/mappers/household/daily/SaveDailyPowerMapper.xml new file mode 100644 index 00000000..edd89058 --- /dev/null +++ b/admin/src/main/resources/mappers/household/daily/SaveDailyPowerMapper.xml @@ -0,0 +1,49 @@ + + + + + + + + + + insert into daily_power ( + daily_record_seq + , equipment_name, owned_hours, leased_hours + , is_deleted + , + ) values ( + #{dailyRecordSeq} + , #{equipmentName}, #{ownedHours}, #{leasedHours} + , false + , + ) + + + + update daily_power set + , equipment_name = #{equipmentName} + , owned_hours = #{ownedHours} + , leased_hours = #{leasedHours} + where is_deleted = false + and daily_record_seq = #{dailyRecordSeq} + and id = #{id} + + + diff --git a/admin/src/main/resources/templates/households/modal/modal-daily-power.html b/admin/src/main/resources/templates/households/modal/modal-daily-power.html new file mode 100644 index 00000000..7fefeb03 --- /dev/null +++ b/admin/src/main/resources/templates/households/modal/modal-daily-power.html @@ -0,0 +1,177 @@ + + + +
+
+ + + + + + + +
+ + + + +
+ \ No newline at end of file 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 bed9acb9..d40a6534 100644 --- a/admin/src/main/resources/templates/households/tab/daily-record.html +++ b/admin/src/main/resources/templates/households/tab/daily-record.html @@ -639,7 +639,7 @@ - ${ifNullHyphen(item.equipmentName)} + ${ifNullHyphen(item.equipmentName)} ${ifNullHyphen(item.ownedHours)} ${ifNullHyphen(item.leasedHours)} @@ -814,6 +814,8 @@ showDailyWorkModal(); } else if (currentStep === 'EXPENSE') { showDailyExpenseModal(); + } else if (currentStep === 'POWER') { + showDailyPowerModal(); } else { alert('TODO : 추가'); } diff --git a/admin/src/main/resources/templates/households/{seq}.html b/admin/src/main/resources/templates/households/{seq}.html index b65ca452..2b2abc75 100644 --- a/admin/src/main/resources/templates/households/{seq}.html +++ b/admin/src/main/resources/templates/households/{seq}.html @@ -179,6 +179,7 @@ + From 5e6365d620a8d8ba5a10d12f24ba589305537420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 1 Jul 2025 14:53:10 +0900 Subject: [PATCH 09/14] =?UTF-8?q?[BO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20?= =?UTF-8?q?=EC=9E=84=EC=97=85=EC=83=9D=EC=82=B0=EB=AC=BC=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D,=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/SaveDailyForestryDao.java | 39 ++++ .../persistence/SaveDailyForestryMapper.java | 39 ++++ .../modal/GetDailyForestryDto.java | 18 ++ .../web/SaveDailyForestryController.java | 87 ++++++++ .../web/model/DailyForestryUIReqVO.java | 30 +++ .../web/model/SaveDailyForestryReqVO.java | 38 ++++ .../validator/SaveDailyForestryValidator.java | 47 ++++ .../ports/SaveDailyForestryPortIn.java | 22 ++ .../ports/SaveDailyForestryPortOut.java | 23 ++ .../application/SaveDailyForestryService.java | 56 +++++ .../domain/GetDailyForestryCmd.java | 27 +++ .../domain/SaveDailyForestryCmd.java | 23 ++ .../daily/SaveDailyForestryMapper.xml | 56 +++++ .../modal/modal-daily-forestry.html | 207 ++++++++++++++++++ .../households/tab/daily-record.html | 4 +- .../resources/templates/households/{seq}.html | 1 + .../constants/DailyRecordConstants.java | 6 + .../application/DailyForestryService.java | 3 +- 18 files changed, 724 insertions(+), 2 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/modal/GetDailyForestryDto.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/SaveDailyForestryController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/model/DailyForestryUIReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/model/SaveDailyForestryReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/validator/SaveDailyForestryValidator.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/SaveDailyForestryPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/SaveDailyForestryPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/application/SaveDailyForestryService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/application/domain/GetDailyForestryCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/application/domain/SaveDailyForestryCmd.java create mode 100644 admin/src/main/resources/mappers/household/daily/SaveDailyForestryMapper.xml create mode 100644 admin/src/main/resources/templates/households/modal/modal-daily-forestry.html diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryDao.java new file mode 100644 index 00000000..ca54c0f4 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryDao.java @@ -0,0 +1,39 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence.modal.GetDailyForestryDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.SaveDailyForestryPortOut; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.GetDailyForestryCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.SaveDailyForestryCmd; +import app.module.core.config.application.annotation.CreateCommand; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +@RequiredArgsConstructor +public class SaveDailyForestryDao implements SaveDailyForestryPortOut { + private final SaveDailyForestryMapper dailyForestryMapper; + + @Override + public GetDailyForestryDto detail(GetDailyForestryCmd command) { + + return dailyForestryMapper.getDailyForestry(command); + } + + @CreateCommand + @Override + public void create(GetDailyForestryCmd findCmd, SaveDailyForestryCmd command) { + Integer existCount = dailyForestryMapper.getRecordExistCount(findCmd); + if (existCount == 0) { + dailyForestryMapper.createDailyForestry(command); + + log.debug("[CreateDailyForestry] command={}", command); + } else { + dailyForestryMapper.updateDailyForestry(command); + + log.debug("[UpdateDailyForestry] command={}", command); + } + } + +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryMapper.java new file mode 100644 index 00000000..5df9912b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryMapper.java @@ -0,0 +1,39 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence.modal.GetDailyForestryDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.GetDailyForestryCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.SaveDailyForestryCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SaveDailyForestryMapper { + /** + * 일계부 임업생산 데이터 조회 + * + * @param command 검색 조건 + * @return 임업생산 데이터 + */ + GetDailyForestryDto getDailyForestry(GetDailyForestryCmd command); + + /** + * 일계부 임업생산 데이터 존재 여부 + * + * @param command 검색 조건 + * @return 중복 개수 + */ + Integer getRecordExistCount(GetDailyForestryCmd command); + + /** + * 일계부 임업생산 등록 + * + * @param command 등록 데이터 + */ + void createDailyForestry(SaveDailyForestryCmd command); + + /** + * 일계부 임업생산 수정 + * + * @param command 수정 데이터 + */ + void updateDailyForestry(SaveDailyForestryCmd command); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/modal/GetDailyForestryDto.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/modal/GetDailyForestryDto.java new file mode 100644 index 00000000..7afc0639 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/modal/GetDailyForestryDto.java @@ -0,0 +1,18 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence.modal; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class GetDailyForestryDto { + private Long id; + private Long dailyRecordSeq; + private String productName; + private String usage; + private String quantity; + private String unitCode; + private String unitLabel; + private String unitSelf; + private Long estimatedValue; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/SaveDailyForestryController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/SaveDailyForestryController.java new file mode 100644 index 00000000..71d59875 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/SaveDailyForestryController.java @@ -0,0 +1,87 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence.modal.GetDailyForestryDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model.DailyForestryUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model.SaveDailyForestryReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.validator.SaveDailyForestryValidator; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.SaveDailyForestryPortIn; +import app.module.core.config.application.exception.NoRecordDataException; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +@Slf4j +@RestController +@RequiredArgsConstructor +@RequestMapping(path = "/api/household/daily/forestry") +public class SaveDailyForestryController { + private final DailyRecordPortIn dailyRecordPortIn; + private final SaveDailyForestryPortIn dailyForestryPortIn; + private final SaveDailyForestryValidator dailyForestryValidator; + + /** + * 일계부 임업생산 조회 + * + * @param id 임업생산 일련번호 + * @param reqVO 검색 조건 + */ + @GetMapping(path = "/{id}") + ResponseEntity detail(@PathVariable("id") String id, @ModelAttribute DailyForestryUIReqVO reqVO) { + + reqVO.setId(Long.parseLong(id)); + + GetDailyForestryDto detail = dailyForestryPortIn.detail(reqVO); + if (detail == null) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); + } + + return ResponseEntity.status(HttpStatus.OK).body(detail); + } + + /** + * 일계부 임업생산 등록 처리 + * + * @param formVO 입력 데이터 + * @param bindingResult BindingResult + */ + @PostMapping(path = "/save") + ResponseEntity create(@Valid @RequestBody SaveDailyForestryReqVO formVO, BindingResult bindingResult) { + + dailyForestryValidator.validate(formVO, bindingResult); + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getFieldErrors()); + } + + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(formVO.getDailyId()); + + formVO.setSearchMonth(dailyRecord.getRecordMonth()); + formVO.setGroupNo(dailyRecord.getGroupNo()); + formVO.setDailyId(dailyRecord.getId()); + log.debug("formVO: {}", formVO); + + dailyForestryPortIn.create(formVO); + + return ResponseEntity.status(HttpStatus.OK).body(formVO); + } + + /** + * 일계부 유효성 체크 및 데이터 조회 + * + * @param dailyRecordSeq 항목 일련번호 + */ + private DailyRecordDto vaildGetDailyRecord(Long dailyRecordSeq) { + DailyRecordDto dailyRecord = dailyRecordPortIn.detail(dailyRecordSeq); + if (dailyRecord == null || dailyRecord.getId() == null) { + throw new NoRecordDataException(); + } + + return dailyRecord; + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/model/DailyForestryUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/model/DailyForestryUIReqVO.java new file mode 100644 index 00000000..dd89b338 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/model/DailyForestryUIReqVO.java @@ -0,0 +1,30 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class DailyForestryUIReqVO { + /** + * 검색 월(yyyyMM) + */ + private String searchMonth; + /** + * 검색 그룸번호 + */ + private Integer groupNo; + /** + * 임가 일련번호 + */ + private Long householdSeq; + + /** + * 일계부 항목 일련번호 + */ + private Long dailyId; + /** + * 임업생산 일련번호 + */ + private Long id; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/model/SaveDailyForestryReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/model/SaveDailyForestryReqVO.java new file mode 100644 index 00000000..a1238b0b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/model/SaveDailyForestryReqVO.java @@ -0,0 +1,38 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model.DailyPowerUIReqVO; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString(callSuper = true) +public class SaveDailyForestryReqVO extends DailyForestryUIReqVO { + /** + * 생산물 + */ + @NotBlank(message = "생산물을 입력해 주세요.") + private String productName; + /** + * 용도 + */ + private String usage; + /** + * 수량 + */ + private Double quantity; + /** + * 단위 코드 + */ + private String unitCode; + /** + * 단위 직접 입력 + */ + private String unitSelf; + /** + * 현물평가액 + */ + private Long estimatedValue; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/validator/SaveDailyForestryValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/validator/SaveDailyForestryValidator.java new file mode 100644 index 00000000..3d363449 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/validator/SaveDailyForestryValidator.java @@ -0,0 +1,47 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.validator; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model.SaveDailyForestryReqVO; +import app.module.core.config.constants.CommonConstants; +import lombok.RequiredArgsConstructor; +import org.apache.tika.utils.StringUtils; +import org.springframework.stereotype.Component; +import org.springframework.validation.Errors; +import org.springframework.validation.Validator; + +@Component +@RequiredArgsConstructor +public class SaveDailyForestryValidator implements Validator { + @Override + public boolean supports(Class clazz) { + return SaveDailyForestryReqVO.class.equals(clazz); + } + + @Override + public void validate(Object target, Errors errors) { + SaveDailyForestryReqVO vo = (SaveDailyForestryReqVO) target; + + if (vo.getQuantity() == null && !StringUtils.isBlank(vo.getUnitCode())) { + errors.rejectValue( + "quantity", "valid.common.required", + "수량을 입력해 주세요."); + } + + if (vo.getQuantity() != null && StringUtils.isBlank(vo.getUnitCode())) { + errors.rejectValue( + "unitCode", "valid.common.required", + "단위를 선택해 주세요."); + } + + if (CommonConstants.UNIT_CODE_SELF.equals(vo.getUnitCode()) && StringUtils.isBlank(vo.getUnitSelf())) { + errors.rejectValue( + "unitSelf", "valid.common.required", + "단위를 입력해 주세요."); + } + + if (vo.getEstimatedValue() == null) { + errors.rejectValue( + "estimatedValue", "valid.common.required", + "현물평가액을 입력해 주세요."); + } + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/SaveDailyForestryPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/SaveDailyForestryPortIn.java new file mode 100644 index 00000000..1fce46d0 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/SaveDailyForestryPortIn.java @@ -0,0 +1,22 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence.modal.GetDailyForestryDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model.DailyForestryUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model.SaveDailyForestryReqVO; + +public interface SaveDailyForestryPortIn { + /** + * 일계부 임업생산 조회 + * + * @param reqVO 검색 조건 + * @return 임업생산 상세 + */ + GetDailyForestryDto detail(DailyForestryUIReqVO reqVO); + + /** + * 일계부 임업생산 등록 + * + * @param formVO 입력 데이터 + */ + void create(SaveDailyForestryReqVO formVO); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/SaveDailyForestryPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/SaveDailyForestryPortOut.java new file mode 100644 index 00000000..b6f31637 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/SaveDailyForestryPortOut.java @@ -0,0 +1,23 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence.modal.GetDailyForestryDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.GetDailyForestryCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.SaveDailyForestryCmd; + +public interface SaveDailyForestryPortOut { + /** + * 일계부 임업생산 조회 + * + * @param command 검색 조건 + * @return 임업생산 상세 + */ + GetDailyForestryDto detail(GetDailyForestryCmd command); + + /** + * 일계부 임업생산 등록 + * + * @param findCmd 검색 조건 + * @param command 입력 데이터 + */ + void create(GetDailyForestryCmd findCmd, SaveDailyForestryCmd command); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/application/SaveDailyForestryService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/application/SaveDailyForestryService.java new file mode 100644 index 00000000..1a277c62 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/application/SaveDailyForestryService.java @@ -0,0 +1,56 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence.modal.GetDailyForestryDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model.DailyForestryUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model.SaveDailyForestryReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.SaveDailyForestryPortIn; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.SaveDailyForestryPortOut; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.GetDailyForestryCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.SaveDailyForestryCmd; +import app.module.core.config.constants.DailyRecordConstants; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class SaveDailyForestryService implements SaveDailyForestryPortIn { + private final SaveDailyForestryPortOut portOut; + private final DailyRecordPortIn dailyRecordPortIn; + + @Override + public GetDailyForestryDto detail(DailyForestryUIReqVO reqVO) { + GetDailyForestryCmd findCmd = new GetDailyForestryCmd( + reqVO.getSearchMonth(), + reqVO.getGroupNo(), + reqVO.getHouseholdSeq(), + reqVO.getId()); + + return portOut.detail(findCmd); + } + + @Override + public void create(SaveDailyForestryReqVO formVO) { + GetDailyForestryCmd findCmd = new GetDailyForestryCmd( + formVO.getSearchMonth(), + formVO.getGroupNo(), + formVO.getHouseholdSeq(), + formVO.getId()); + + SaveDailyForestryCmd command = + new SaveDailyForestryCmd( + formVO.getId(), + formVO.getDailyId(), + DailyRecordConstants.FORESTRY_EXPENSE_MARK, + formVO.getProductName(), + formVO.getUsage(), + formVO.getQuantity(), + formVO.getUnitCode(), + formVO.getUnitSelf(), + formVO.getEstimatedValue()); + + portOut.create(findCmd, command); + + dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq()); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/application/domain/GetDailyForestryCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/application/domain/GetDailyForestryCmd.java new file mode 100644 index 00000000..bcf91e85 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/application/domain/GetDailyForestryCmd.java @@ -0,0 +1,27 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class GetDailyForestryCmd { + /** + * 검색 월(yyyyMM) + */ + private String searchMonth; + /** + * 검색 그룸번호 + */ + private Integer groupNo; + /** + * 임가 일련번호 + */ + private Long householdSeq; + /** + * 임업생산 일련번호 + */ + private Long id; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/application/domain/SaveDailyForestryCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/application/domain/SaveDailyForestryCmd.java new file mode 100644 index 00000000..298eb548 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/application/domain/SaveDailyForestryCmd.java @@ -0,0 +1,23 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@AllArgsConstructor +@ToString +public class SaveDailyForestryCmd extends AuditCommand { + private Long id; + private Long dailyRecordSeq; + private String expenseMark; + private String productName; + private String usage; + private Double quantity; + private String unitCode; + private String unitSelf; + private Long estimatedValue; +} diff --git a/admin/src/main/resources/mappers/household/daily/SaveDailyForestryMapper.xml b/admin/src/main/resources/mappers/household/daily/SaveDailyForestryMapper.xml new file mode 100644 index 00000000..45018ccc --- /dev/null +++ b/admin/src/main/resources/mappers/household/daily/SaveDailyForestryMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + insert into daily_forestry ( + daily_record_seq, expense_mark + , product_name, usage + , quantity, unit_code, unit_self, estimated_value + , is_deleted + , + ) values ( + #{dailyRecordSeq}, #{expenseMark} + , #{productName}, #{usage} + , #{quantity}, #{unitCode}, #{unitSelf}, #{estimatedValue} + , false + , + ) + + + + update daily_forestry set + , expense_mark = #{expenseMark} + , product_name = #{productName} + , usage = #{usage} + , quantity = #{quantity} + , unit_code = #{unitCode} + , unit_self = #{unitSelf} + , estimated_value = #{estimatedValue} + where is_deleted = false + and daily_record_seq = #{dailyRecordSeq} + and id = #{id} + + + diff --git a/admin/src/main/resources/templates/households/modal/modal-daily-forestry.html b/admin/src/main/resources/templates/households/modal/modal-daily-forestry.html new file mode 100644 index 00000000..bef88ecc --- /dev/null +++ b/admin/src/main/resources/templates/households/modal/modal-daily-forestry.html @@ -0,0 +1,207 @@ + + + +
+
+ + + + + + + +
+ + + + +
+ \ No newline at end of file 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 d40a6534..c450a01b 100644 --- a/admin/src/main/resources/templates/households/tab/daily-record.html +++ b/admin/src/main/resources/templates/households/tab/daily-record.html @@ -676,7 +676,7 @@ - ${ifNullHyphen(item.productName)} + ${ifNullHyphen(item.productName)} ${ifNullHyphen(item.usage)} ${ifNullHyphen(item.quantity)} ${ifNullHyphen(item.unitText)} @@ -816,6 +816,8 @@ showDailyExpenseModal(); } else if (currentStep === 'POWER') { showDailyPowerModal(); + } else if (currentStep === 'FORESTRY') { + showDailyForestryModal(); } else { alert('TODO : 추가'); } diff --git a/admin/src/main/resources/templates/households/{seq}.html b/admin/src/main/resources/templates/households/{seq}.html index 2b2abc75..68e37a95 100644 --- a/admin/src/main/resources/templates/households/{seq}.html +++ b/admin/src/main/resources/templates/households/{seq}.html @@ -180,6 +180,7 @@ + diff --git a/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java b/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java index 4fc81f5a..2cb90d50 100644 --- a/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java +++ b/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java @@ -28,4 +28,10 @@ public class DailyRecordConstants { * [정책] 외상판매 Y 일 경우 수입부호 52210 적재 */ public static final String EXPENSE_INCOME_MARK = "52210"; + + /** + * 임업생산물의 지출부호 + * [정책] 81011 고정 + */ + public static final String FORESTRY_EXPENSE_MARK = "81011"; } diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java b/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java index e3c58989..ec823cc5 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java @@ -1,5 +1,6 @@ package app.module.front.usecase.daily.forestry.ports.application; +import app.module.core.config.constants.DailyRecordConstants; import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; @@ -99,7 +100,7 @@ public class DailyForestryService implements DailyForestryPortIn { new CreateDailyForestryCmd( formVO.getId(), formVO.getDailyRecordSeq(), - "81011", // [정책] 81011 고정 + DailyRecordConstants.FORESTRY_EXPENSE_MARK, formVO.getProductName(), formVO.getUsage(), formVO.getQuantity(), From dce8faa62834ac9585720f960ec000d09b6deda1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 1 Jul 2025 16:53:55 +0900 Subject: [PATCH 10/14] =?UTF-8?q?[BO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20?= =?UTF-8?q?=EB=86=8D=EC=97=85=EC=83=9D=EC=82=B0=EB=AC=BC=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D,=20=EC=88=98=EC=A0=95=20[FO]=20=EB=86=8D=EC=97=85?= =?UTF-8?q?=EC=83=9D=EC=82=B0=EB=AC=BC=20=EC=88=98=EC=9E=85/=EC=A7=80?= =?UTF-8?q?=EC=B6=9C=EB=B6=80=ED=98=B8=20Util=20=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/SaveDailyFarmingDao.java | 40 ++++ .../persistence/SaveDailyFarmingMapper.java | 39 ++++ .../persistence/modal/GetDailyFarmingDto.java | 20 ++ .../web/SaveDailyFarmingController.java | 87 +++++++ .../web/model/DailyFarmingUIReqVO.java | 30 +++ .../web/model/SaveDailyFarmingReqVO.java | 42 ++++ .../validator/SaveDailyFarmingValidator.java | 53 +++++ .../ports/SaveDailyFarmingPortIn.java | 22 ++ .../ports/SaveDailyFarmingPortOut.java | 23 ++ .../application/SaveDailyFarmingService.java | 68 ++++++ .../domain/GetDailyFarmingCmd.java | 27 +++ .../domain/SaveDailyFarmingCmd.java | 25 ++ .../daily/SaveDailyFarmingMapper.xml | 58 +++++ .../households/modal/modal-daily-farming.html | 219 ++++++++++++++++++ .../households/tab/daily-record.html | 6 +- .../resources/templates/households/{seq}.html | 1 + .../config/application/util/DailyUtil.java | 34 +++ .../application/DailyFarmingService.java | 27 +-- 18 files changed, 798 insertions(+), 23 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/SaveDailyFarmingDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/SaveDailyFarmingMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/modal/GetDailyFarmingDto.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/SaveDailyFarmingController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/model/DailyFarmingUIReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/model/SaveDailyFarmingReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/validator/SaveDailyFarmingValidator.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/SaveDailyFarmingPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/SaveDailyFarmingPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/SaveDailyFarmingService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/domain/GetDailyFarmingCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/domain/SaveDailyFarmingCmd.java create mode 100644 admin/src/main/resources/mappers/household/daily/SaveDailyFarmingMapper.xml create mode 100644 admin/src/main/resources/templates/households/modal/modal-daily-farming.html diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/SaveDailyFarmingDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/SaveDailyFarmingDao.java new file mode 100644 index 00000000..15d00e63 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/SaveDailyFarmingDao.java @@ -0,0 +1,40 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.SaveDailyFarmingMapper; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.modal.GetDailyFarmingDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.SaveDailyFarmingPortOut; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.GetDailyFarmingCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.SaveDailyFarmingCmd; +import app.module.core.config.application.annotation.CreateCommand; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +@RequiredArgsConstructor +public class SaveDailyFarmingDao implements SaveDailyFarmingPortOut { + private final SaveDailyFarmingMapper DailyFarmingMapper; + + @Override + public GetDailyFarmingDto detail(GetDailyFarmingCmd command) { + + return DailyFarmingMapper.getDailyFarming(command); + } + + @CreateCommand + @Override + public void create(GetDailyFarmingCmd findCmd, SaveDailyFarmingCmd command) { + Integer existCount = DailyFarmingMapper.getRecordExistCount(findCmd); + if (existCount == 0) { + DailyFarmingMapper.createDailyFarming(command); + + log.debug("[CreateDailyFarming] command={}", command); + } else { + DailyFarmingMapper.updateDailyFarming(command); + + log.debug("[UpdateDailyFarming] command={}", command); + } + } + +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/SaveDailyFarmingMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/SaveDailyFarmingMapper.java new file mode 100644 index 00000000..50976826 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/SaveDailyFarmingMapper.java @@ -0,0 +1,39 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.modal.GetDailyFarmingDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.GetDailyFarmingCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.SaveDailyFarmingCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SaveDailyFarmingMapper { + /** + * 일계부 농업생산 데이터 조회 + * + * @param command 검색 조건 + * @return 농업생산 데이터 + */ + GetDailyFarmingDto getDailyFarming(GetDailyFarmingCmd command); + + /** + * 일계부 농업생산 데이터 존재 여부 + * + * @param command 검색 조건 + * @return 중복 개수 + */ + Integer getRecordExistCount(GetDailyFarmingCmd command); + + /** + * 일계부 농업생산 등록 + * + * @param command 등록 데이터 + */ + void createDailyFarming(SaveDailyFarmingCmd command); + + /** + * 일계부 농업생산 수정 + * + * @param command 수정 데이터 + */ + void updateDailyFarming(SaveDailyFarmingCmd command); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/modal/GetDailyFarmingDto.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/modal/GetDailyFarmingDto.java new file mode 100644 index 00000000..abc00ec2 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/persistence/modal/GetDailyFarmingDto.java @@ -0,0 +1,20 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.modal; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class GetDailyFarmingDto { + private Long id; + private Long dailyRecordSeq; + private String productCode; + private String productLabel; + private String productSelf; + private String usage; + private String quantity; + private String unitCode; + private String unitLabel; + private String unitSelf; + private Long estimatedValue; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/SaveDailyFarmingController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/SaveDailyFarmingController.java new file mode 100644 index 00000000..0dbc290d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/SaveDailyFarmingController.java @@ -0,0 +1,87 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.modal.GetDailyFarmingDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.DailyFarmingUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.SaveDailyFarmingReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.validator.SaveDailyFarmingValidator; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.SaveDailyFarmingPortIn; +import app.module.core.config.application.exception.NoRecordDataException; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +@Slf4j +@RestController +@RequiredArgsConstructor +@RequestMapping(path = "/api/household/daily/farming") +public class SaveDailyFarmingController { + private final DailyRecordPortIn dailyRecordPortIn; + private final SaveDailyFarmingPortIn DailyFarmingPortIn; + private final SaveDailyFarmingValidator DailyFarmingValidator; + + /** + * 일계부 농업생산 조회 + * + * @param id 농업생산 일련번호 + * @param reqVO 검색 조건 + */ + @GetMapping(path = "/{id}") + ResponseEntity detail(@PathVariable("id") String id, @ModelAttribute DailyFarmingUIReqVO reqVO) { + + reqVO.setId(Long.parseLong(id)); + + GetDailyFarmingDto detail = DailyFarmingPortIn.detail(reqVO); + if (detail == null) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); + } + + return ResponseEntity.status(HttpStatus.OK).body(detail); + } + + /** + * 일계부 농업생산 등록 처리 + * + * @param formVO 입력 데이터 + * @param bindingResult BindingResult + */ + @PostMapping(path = "/save") + ResponseEntity create(@Valid @RequestBody SaveDailyFarmingReqVO formVO, BindingResult bindingResult) { + + DailyFarmingValidator.validate(formVO, bindingResult); + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getFieldErrors()); + } + + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(formVO.getDailyId()); + + formVO.setSearchMonth(dailyRecord.getRecordMonth()); + formVO.setGroupNo(dailyRecord.getGroupNo()); + formVO.setDailyId(dailyRecord.getId()); + log.debug("formVO: {}", formVO); + + DailyFarmingPortIn.create(formVO); + + return ResponseEntity.status(HttpStatus.OK).body(formVO); + } + + /** + * 일계부 유효성 체크 및 데이터 조회 + * + * @param dailyRecordSeq 항목 일련번호 + */ + private DailyRecordDto vaildGetDailyRecord(Long dailyRecordSeq) { + DailyRecordDto dailyRecord = dailyRecordPortIn.detail(dailyRecordSeq); + if (dailyRecord == null || dailyRecord.getId() == null) { + throw new NoRecordDataException(); + } + + return dailyRecord; + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/model/DailyFarmingUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/model/DailyFarmingUIReqVO.java new file mode 100644 index 00000000..02f912d6 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/model/DailyFarmingUIReqVO.java @@ -0,0 +1,30 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class DailyFarmingUIReqVO { + /** + * 검색 월(yyyyMM) + */ + private String searchMonth; + /** + * 검색 그룸번호 + */ + private Integer groupNo; + /** + * 임가 일련번호 + */ + private Long householdSeq; + + /** + * 일계부 항목 일련번호 + */ + private Long dailyId; + /** + * 농업생산 일련번호 + */ + private Long id; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/model/SaveDailyFarmingReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/model/SaveDailyFarmingReqVO.java new file mode 100644 index 00000000..e807c96c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/model/SaveDailyFarmingReqVO.java @@ -0,0 +1,42 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.DailyFarmingUIReqVO; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString(callSuper = true) +public class SaveDailyFarmingReqVO extends DailyFarmingUIReqVO { + /** + * 생산물 + */ + @NotBlank(message = "생산물을 선택해 주세요.") + private String productCode; + /** + * 생산물 직접 입력 + */ + private String productSelf; + /** + * 용도 + */ + private String usage; + /** + * 수량 + */ + private Double quantity; + /** + * 단위 코드 + */ + private String unitCode; + /** + * 단위 직접 입력 + */ + private String unitSelf; + /** + * 현물평가액 + */ + private Long estimatedValue; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/validator/SaveDailyFarmingValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/validator/SaveDailyFarmingValidator.java new file mode 100644 index 00000000..eed8bb9b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/adapters/web/validator/SaveDailyFarmingValidator.java @@ -0,0 +1,53 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.validator; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.SaveDailyFarmingReqVO; +import app.module.core.config.constants.CommonConstants; +import lombok.RequiredArgsConstructor; +import org.apache.tika.utils.StringUtils; +import org.springframework.stereotype.Component; +import org.springframework.validation.Errors; +import org.springframework.validation.Validator; + +@Component +@RequiredArgsConstructor +public class SaveDailyFarmingValidator implements Validator { + @Override + public boolean supports(Class clazz) { + return SaveDailyFarmingReqVO.class.equals(clazz); + } + + @Override + public void validate(Object target, Errors errors) { + SaveDailyFarmingReqVO vo = (SaveDailyFarmingReqVO) target; + + if ("code.record.farming.self".equals(vo.getProductCode()) && StringUtils.isBlank(vo.getProductSelf())) { + errors.rejectValue( + "productSelf", "valid.common.required", + "생산물을 입력해 주세요."); + } + + if (vo.getQuantity() == null && !StringUtils.isBlank(vo.getUnitCode())) { + errors.rejectValue( + "quantity", "valid.common.required", + "수량을 입력해 주세요."); + } + + if (vo.getQuantity() != null && StringUtils.isBlank(vo.getUnitCode())) { + errors.rejectValue( + "unitCode", "valid.common.required", + "단위를 선택해 주세요."); + } + + if (CommonConstants.UNIT_CODE_SELF.equals(vo.getUnitCode()) && StringUtils.isBlank(vo.getUnitSelf())) { + errors.rejectValue( + "unitSelf", "valid.common.required", + "단위를 입력해 주세요."); + } + + if (vo.getEstimatedValue() == null) { + errors.rejectValue( + "estimatedValue", "valid.common.required", + "현물평가액을 입력해 주세요."); + } + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/SaveDailyFarmingPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/SaveDailyFarmingPortIn.java new file mode 100644 index 00000000..8114c1f4 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/SaveDailyFarmingPortIn.java @@ -0,0 +1,22 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.modal.GetDailyFarmingDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.DailyFarmingUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.SaveDailyFarmingReqVO; + +public interface SaveDailyFarmingPortIn { + /** + * 일계부 농업생산 조회 + * + * @param reqVO 검색 조건 + * @return 농업생산 상세 + */ + GetDailyFarmingDto detail(DailyFarmingUIReqVO reqVO); + + /** + * 일계부 농업생산 등록 + * + * @param formVO 입력 데이터 + */ + void create(SaveDailyFarmingReqVO formVO); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/SaveDailyFarmingPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/SaveDailyFarmingPortOut.java new file mode 100644 index 00000000..62adf76c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/SaveDailyFarmingPortOut.java @@ -0,0 +1,23 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.modal.GetDailyFarmingDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.GetDailyFarmingCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.SaveDailyFarmingCmd; + +public interface SaveDailyFarmingPortOut { + /** + * 일계부 농업생산 조회 + * + * @param command 검색 조건 + * @return 농업생산 상세 + */ + GetDailyFarmingDto detail(GetDailyFarmingCmd command); + + /** + * 일계부 농업생산 등록 + * + * @param findCmd 검색 조건 + * @param command 입력 데이터 + */ + void create(GetDailyFarmingCmd findCmd, SaveDailyFarmingCmd command); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/SaveDailyFarmingService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/SaveDailyFarmingService.java new file mode 100644 index 00000000..0bcebd7d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/SaveDailyFarmingService.java @@ -0,0 +1,68 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.persistence.modal.GetDailyFarmingDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.DailyFarmingUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.adapters.web.model.SaveDailyFarmingReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.SaveDailyFarmingPortIn; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.SaveDailyFarmingPortOut; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.GetDailyFarmingCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain.SaveDailyFarmingCmd; +import app.module.core.config.application.util.DailyUtil; +import app.module.core.config.constants.DailyRecordConstants; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class SaveDailyFarmingService implements SaveDailyFarmingPortIn { + private final SaveDailyFarmingPortOut portOut; + private final DailyRecordPortIn dailyRecordPortIn; + private final UICodeListPortIn uiCodeListPortIn; + private final DailyUtil dailyUtil; + + @Override + public GetDailyFarmingDto detail(DailyFarmingUIReqVO reqVO) { + GetDailyFarmingCmd findCmd = new GetDailyFarmingCmd( + reqVO.getSearchMonth(), + reqVO.getGroupNo(), + reqVO.getHouseholdSeq(), + reqVO.getId()); + + return portOut.detail(findCmd); + } + + @Override + public void create(SaveDailyFarmingReqVO formVO) { + GetDailyFarmingCmd findCmd = new GetDailyFarmingCmd( + formVO.getSearchMonth(), + formVO.getGroupNo(), + formVO.getHouseholdSeq(), + formVO.getId()); + + HashMap markMap = dailyUtil.getMarkByFarming(uiCodeListPortIn.connect("code.record.farming"), formVO.getProductCode()); + + SaveDailyFarmingCmd command = + new SaveDailyFarmingCmd( + formVO.getId(), + formVO.getDailyId(), + markMap.get("incomeMark"), + markMap.get("expenseMark"), + formVO.getProductCode(), + formVO.getProductSelf(), + formVO.getUsage(), + formVO.getQuantity(), + formVO.getUnitCode(), + formVO.getUnitSelf(), + formVO.getEstimatedValue()); + + portOut.create(findCmd, command); + + dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq()); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/domain/GetDailyFarmingCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/domain/GetDailyFarmingCmd.java new file mode 100644 index 00000000..d16d7914 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/domain/GetDailyFarmingCmd.java @@ -0,0 +1,27 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class GetDailyFarmingCmd { + /** + * 검색 월(yyyyMM) + */ + private String searchMonth; + /** + * 검색 그룸번호 + */ + private Integer groupNo; + /** + * 임가 일련번호 + */ + private Long householdSeq; + /** + * 농업생산 일련번호 + */ + private Long id; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/domain/SaveDailyFarmingCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/domain/SaveDailyFarmingCmd.java new file mode 100644 index 00000000..a3f5a053 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyFarming/ports/application/domain/SaveDailyFarmingCmd.java @@ -0,0 +1,25 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyFarming.ports.application.domain; + +import app.module.core.config.adapters.persistence.component.AuditCommand; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@AllArgsConstructor +@ToString +public class SaveDailyFarmingCmd extends AuditCommand { + private Long id; + private Long dailyRecordSeq; + private String incomeMark; + private String expenseMark; + private String productCode; + private String productSelf; + private String usage; + private Double quantity; + private String unitCode; + private String unitSelf; + private Long estimatedValue; +} diff --git a/admin/src/main/resources/mappers/household/daily/SaveDailyFarmingMapper.xml b/admin/src/main/resources/mappers/household/daily/SaveDailyFarmingMapper.xml new file mode 100644 index 00000000..b6b03947 --- /dev/null +++ b/admin/src/main/resources/mappers/household/daily/SaveDailyFarmingMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + insert into daily_farming ( + daily_record_seq, income_mark, expense_mark + , product_code, product_self, usage + , quantity, unit_code, unit_self, estimated_value + , is_deleted + , + ) values ( + #{dailyRecordSeq}, #{incomeMark}, #{expenseMark} + , #{productCode}, #{productSelf}, #{usage} + , #{quantity}, #{unitCode}, #{unitSelf}, #{estimatedValue} + , false + , + ) + + + + update daily_farming set + , income_mark = #{incomeMark} + , expense_mark = #{expenseMark} + , product_code = #{productCode} + , product_self = #{productSelf} + , usage = #{usage} + , quantity = #{quantity} + , unit_code = #{unitCode} + , unit_self = #{unitSelf} + , estimated_value = #{estimatedValue} + where is_deleted = false + and daily_record_seq = #{dailyRecordSeq} + and id = #{id} + + + diff --git a/admin/src/main/resources/templates/households/modal/modal-daily-farming.html b/admin/src/main/resources/templates/households/modal/modal-daily-farming.html new file mode 100644 index 00000000..639cc04d --- /dev/null +++ b/admin/src/main/resources/templates/households/modal/modal-daily-farming.html @@ -0,0 +1,219 @@ + + + +
+
+ + + + + + + +
+ + + + +
+ \ No newline at end of file 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 c450a01b..7907bfb2 100644 --- a/admin/src/main/resources/templates/households/tab/daily-record.html +++ b/admin/src/main/resources/templates/households/tab/daily-record.html @@ -715,7 +715,7 @@ - ${ifNullHyphen(item.productName)} + ${ifNullHyphen(item.productName)} ${ifNullHyphen(item.usage)} ${ifNullHyphen(item.quantity)} ${ifNullHyphen(item.unitText)} @@ -818,8 +818,8 @@ showDailyPowerModal(); } else if (currentStep === 'FORESTRY') { showDailyForestryModal(); - } else { - alert('TODO : 추가'); + } else if (currentStep === 'FARMING') { + showDailyFarmingModal(); } } diff --git a/admin/src/main/resources/templates/households/{seq}.html b/admin/src/main/resources/templates/households/{seq}.html index 68e37a95..3c18edeb 100644 --- a/admin/src/main/resources/templates/households/{seq}.html +++ b/admin/src/main/resources/templates/households/{seq}.html @@ -181,6 +181,7 @@ + diff --git a/core/src/main/java/app/module/core/config/application/util/DailyUtil.java b/core/src/main/java/app/module/core/config/application/util/DailyUtil.java index 0e4be6a1..4262053d 100644 --- a/core/src/main/java/app/module/core/config/application/util/DailyUtil.java +++ b/core/src/main/java/app/module/core/config/application/util/DailyUtil.java @@ -1,5 +1,6 @@ package app.module.core.config.application.util; +import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -9,6 +10,8 @@ import java.text.DecimalFormat; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.util.Date; +import java.util.HashMap; +import java.util.List; import java.util.Locale; @Slf4j @@ -126,4 +129,35 @@ public class DailyUtil { return new DecimalFormat("###,###").format(Double.parseDouble(value)); } + + /** + * 농업 생산물의 UI Code 데이터의 수입부호, 지출부호 조회 + * + * @param uiCodeList UI Code 목록 + * @param targetCode 조회 코드 + * @return 수입부호, 지출부호 Map + */ + public HashMap getMarkByFarming(List uiCodeList, String targetCode) { + String incomeMark = null; + String expenseMark = null; + if (!"code.record.farming.self".equals(targetCode)) { + String returnValue = null; + for (UICodeElement codeSetup : uiCodeList) { + if (codeSetup.getId().equalsIgnoreCase(targetCode)) { + returnValue = codeSetup.getCodeValue(); + break; + } + } + + if (returnValue != null) { + incomeMark = returnValue.split(",")[0]; + expenseMark = returnValue.split(",")[1]; + } + } + + HashMap returnValue = new HashMap<>(); + returnValue.put("incomeMark", incomeMark); + returnValue.put("expenseMark", expenseMark); + return returnValue; + } } diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java b/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java index d4df0d8c..6aa9110a 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java @@ -1,5 +1,6 @@ package app.module.front.usecase.daily.farming.ports.application; +import app.module.core.config.application.util.DailyUtil; import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; @@ -18,6 +19,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.List; @Slf4j @@ -25,8 +27,9 @@ import java.util.List; @RequiredArgsConstructor public class DailyFarmingService implements DailyFarmingPortIn { private final DailyFarmingPortOut portOut; - private final UICodeListPortIn uiCodeListPortIn; private final DailyRecordPortIn dailyRecordPortIn; + private final UICodeListPortIn uiCodeListPortIn; + private final DailyUtil dailyUtil; @Override public List list(DailyFarmingUIReqVO reqVO) { @@ -101,30 +104,14 @@ public class DailyFarmingService implements DailyFarmingPortIn { formVO.getHouseholdSeq(), formVO.getId()); - String incomeMark = null; - String expenseMark = null; - if (!"code.record.farming.self".equals(formVO.getProductCode())) { - List recordFarming = uiCodeListPortIn.connect("code.record.farming"); - String returnValue = null; - for (UICodeElement codeSetup : recordFarming) { - if (codeSetup.getId().equalsIgnoreCase(formVO.getProductCode())) { - returnValue = codeSetup.getCodeValue(); - break; - } - } - - if (returnValue != null) { - incomeMark = returnValue.split(",")[0]; - expenseMark = returnValue.split(",")[1]; - } - } + HashMap markMap = dailyUtil.getMarkByFarming(uiCodeListPortIn.connect("code.record.farming"), formVO.getProductCode()); CreateDailyFarmingCmd command = AuditUtil.create( new CreateDailyFarmingCmd( formVO.getId(), formVO.getDailyRecordSeq(), - incomeMark, - expenseMark, + markMap.get("incomeMark"), + markMap.get("expenseMark"), formVO.getProductCode(), formVO.getProductSelf(), formVO.getUsage(), From edd33ffcc974e55da058097e18af786159a2c53f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Wed, 2 Jul 2025 16:16:19 +0900 Subject: [PATCH 11/14] =?UTF-8?q?[BO]=20=EC=9E=84=EA=B0=80=ED=98=84?= =?UTF-8?q?=ED=99=A9=20=EB=93=B1=EB=A1=9D=20=EC=83=81=EC=84=B8(=EC=88=98?= =?UTF-8?q?=EC=9E=85,=20=EC=A7=80=EC=B6=9C)=20=EC=97=91=EC=85=80=EB=8B=A4?= =?UTF-8?q?=EC=9A=B4=EB=A1=9C=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GetDailyRecordStatusDetailController.java | 153 +++++++++++++++++- .../GetDailyRecordStatusDetailReqVO.java | 3 + .../domain/GetDailyExpenseRecords.java | 8 +- .../domain/GetDailyIncomeRecords.java | 9 +- .../domain/GetDailyRecordStatusCmd.java | 11 ++ .../GetDailyRecordStatusDetailMapper.xml | 49 +++++- .../resources/templates/households/{seq}.html | 2 +- 7 files changed, 218 insertions(+), 17 deletions(-) diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java index 95f60122..96b31074 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java @@ -1,27 +1,164 @@ package app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.adapters.web; +import app.module.admin.config.application.util.ExcelWriterUtil; +import app.module.admin.config.application.util.model.ExcelSheetDto; +import app.module.admin.usecase.household.getHouseholdStatus.ports.GetHouseholdStatusPortIn; +import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus; +import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.adapters.web.model.GetDailyRecordStatusDetailReqVO; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortIn; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyExpenseRecords; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyIncomeRecords; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.adapters.web.model.GetDailyRecordsStatusReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatus; +import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordsStatus.ports.application.domain.GetDailyRecordsStatusCmd; import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.usermodel.IndexedColors; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import java.math.BigDecimal; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + @RestController @RequiredArgsConstructor class GetDailyRecordStatusDetailController { - private final GetDailyRecordStatusDetailPortIn portIn; + private final GetDailyRecordStatusDetailPortIn portIn; + private final GetHouseholdStatusPortIn getHouseholdStatusPortIn; - @GetMapping(path = "/api/household/dailyRecordStatus") - ResponseEntity operate( - GetDailyRecordStatusDetailReqVO reqVO) { + @GetMapping(path = "/api/household/dailyRecordStatus") + ResponseEntity operate( + GetDailyRecordStatusDetailReqVO reqVO) { - GetDailyRecordStatusDetail recordView = - portIn.operate(new GetDailyRecordStatusCmd(reqVO.getRecordSeq())).orElse(null); + GetDailyRecordStatusDetail recordView = + portIn.operate(new GetDailyRecordStatusCmd(reqVO.getRecordSeq())).orElse(null); - return ResponseEntity.status(HttpStatus.OK).body(recordView); - } + return ResponseEntity.status(HttpStatus.OK).body(recordView); + } + + /** + * 일계부 상세 현황 엑셀 다운로드 + * + * @param reqVO 검색 조건 + * @return 엑셀 파일 다운로드 + */ + @GetMapping("/api/household/dailyRecordStatus/excel") + public ResponseEntity exportHouseholdExcel(GetDailyRecordStatusDetailReqVO reqVO) { + + String householdNum = "-"; + String ownerName = "-"; + GetHouseholdStatus householdInfo = getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(reqVO.getHouseholdSeq())).orElse(null); + if (householdInfo != null) { + householdNum = householdInfo.getHouseholdNum(); + ownerName = householdInfo.getHouseholdName(); + } + + GetDailyRecordStatusDetail recordView = + portIn.operate(new GetDailyRecordStatusCmd(reqVO.getRecordMonth(), reqVO.getHouseholdSeq())).orElse(null); + + + // 시트 1: 등록 현황 목록 + ExcelSheetDto sheet1 = this.getIncomeSheet(recordView, householdNum, ownerName); + ExcelSheetDto sheet2 = this.getExpenseSheet(recordView, householdNum, ownerName); + + // 시트 모음 + List sheets = List.of(sheet1, sheet2); + + byte[] excel = ExcelWriterUtil.writeExcel(sheets); + + String rawFileName = "03. 일계부 등록 내용[" + reqVO.getRecordMonth() + "][" + householdNum + "]_" + LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + ".xlsx"; + String encodedFileName = URLEncoder.encode(rawFileName, StandardCharsets.UTF_8).replaceAll("\\+", "%20"); + + return ResponseEntity.ok() + .contentType(MediaType.APPLICATION_OCTET_STREAM) + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename*=UTF-8''" + encodedFileName) + .body(excel); + } + + private ExcelSheetDto getIncomeSheet(GetDailyRecordStatusDetail recordView, String householdNum, String ownerName) { + List> rows = new ArrayList<>(); + if (recordView != null && !recordView.getIncomes().isEmpty()) { + for (GetDailyIncomeRecords record : recordView.getIncomes()) { + List row = new ArrayList<>(List.of(householdNum, ownerName, + record.getStartDay(), + record.getEndDay(), + StringUtils.defaultString(record.getCategory()), + StringUtils.defaultString(record.getIncomeMark()), + StringUtils.defaultString(record.getExpenseMark()))); + + row.add(StringUtils.defaultString(record.getCropValue())); + row.add(StringUtils.defaultString(record.getIncomeKind())); + row.add(StringUtils.defaultString(record.getIncomeKindMark())); + row.add(StringUtils.defaultString(record.getSourcePurpose())); + row.add(record.getQuantity() != null ? StringUtils.defaultString(record.getQuantity().toString()) : ""); + row.add(StringUtils.defaultString(record.getUnitText())); + row.add(StringUtils.defaultString(record.getPrice())); + row.add(StringUtils.defaultString(record.getEstimatedValue())); + + rows.add(row); + } + } + + return new ExcelSheetDto( + "수입", + List.of("임가번호", "경영주 성명", "날", "짜", "유형", "수입 부호", "지출 부호", "재배형태 코드", "수입의 종류", "종류 부호", "수입원", "수량", "단위", "현금(원)", "현물(평가액)"), + rows, + Set.of(11, 13, 14), + Map.of( + 0, IndexedColors.LIGHT_YELLOW, + 2, IndexedColors.LIGHT_TURQUOISE, + 3, IndexedColors.LIGHT_TURQUOISE + ) + ); + } + + private ExcelSheetDto getExpenseSheet(GetDailyRecordStatusDetail recordView, String householdNum, String ownerName) { + List> rows = new ArrayList<>(); + if (recordView != null && !recordView.getExpenses().isEmpty()) { + for (GetDailyExpenseRecords record : recordView.getExpenses()) { + List row = new ArrayList<>(List.of(householdNum, ownerName, + record.getStartDay(), + record.getEndDay(), + StringUtils.defaultString(record.getCategory()), + StringUtils.defaultString(record.getIncomeMark()), + StringUtils.defaultString(record.getExpenseMark()))); + + row.add(StringUtils.defaultString(record.getExpenseKind())); + row.add(StringUtils.defaultString(record.getExpenseKindMark())); + row.add(StringUtils.defaultString(record.getSourcePurpose())); + row.add(record.getQuantity() != null ? StringUtils.defaultString(record.getQuantity().toString()) : ""); + row.add(StringUtils.defaultString(record.getUnitText())); + row.add(StringUtils.defaultString(record.getPrice())); + row.add(StringUtils.defaultString(record.getEstimatedValue())); + + rows.add(row); + } + } + + return new ExcelSheetDto( + "지출", + List.of("임가번호", "경영주 성명", "날", "짜", "유형", "수입 부호", "지출 부호", "지출의 종류", "종류 부호", "용도", "수량", "단위", "현금(원)", "현물(평가액)"), + rows, + Set.of(10, 12, 13), + Map.of( + 0, IndexedColors.LIGHT_YELLOW, + 2, IndexedColors.LIGHT_TURQUOISE, + 3, IndexedColors.LIGHT_TURQUOISE + ) + ); + } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailReqVO.java index 5a3809b1..30255c8f 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/model/GetDailyRecordStatusDetailReqVO.java @@ -11,4 +11,7 @@ import lombok.Setter; @EqualsAndHashCode public class GetDailyRecordStatusDetailReqVO { private Long recordSeq; + + private String recordMonth; + private Long householdSeq; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java index a8a05235..14b4a35c 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java @@ -7,13 +7,15 @@ import lombok.Setter; @Getter @Setter -@AllArgsConstructor -@EqualsAndHashCode public class GetDailyExpenseRecords { private Long id; private String inputType; + private String category; + private String incomeMark; + private String expenseMark; private Boolean isCredit; private String expenseKind; + private String expenseKindMark; private String sourcePurpose; private String quantity; private String unitCode; @@ -22,4 +24,6 @@ public class GetDailyExpenseRecords { private String estimatedValue; private String updatedBy; private String updatedAt; + private String startDay; + private String endDay; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java index 490c91b4..9b3d568b 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java @@ -8,15 +8,18 @@ import lombok.Setter; @Getter @Setter -@AllArgsConstructor -@EqualsAndHashCode public class GetDailyIncomeRecords { private Long id; private String inputType; + private String category; + private String incomeMark; + private String expenseMark; private Boolean isCredit; private String cropCode; + private String cropValue; private String cropText; private String incomeKind; + private String incomeKindMark; private String sourcePurpose; private BigDecimal quantity; private String unitCode; @@ -25,4 +28,6 @@ public class GetDailyIncomeRecords { private String estimatedValue; private String updatedBy; private String updatedAt; + private String startDay; + private String endDay; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusCmd.java index eba425bf..1f1edbea 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyRecordStatusCmd.java @@ -10,5 +10,16 @@ import lombok.Setter; @AllArgsConstructor @EqualsAndHashCode public class GetDailyRecordStatusCmd { + public GetDailyRecordStatusCmd(Long recordSeq) { + this.recordSeq = recordSeq; + } + + public GetDailyRecordStatusCmd(String recordMonth, Long householdSeq) { + this.recordMonth = recordMonth; + this.householdSeq = householdSeq; + } + private Long recordSeq; + private Long householdSeq; + private String recordMonth; } diff --git a/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml b/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml index 49015667..6b0aaf8e 100644 --- a/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml +++ b/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml @@ -23,10 +23,15 @@ /* getDailyIncomeRecords : 일계부 등록 현황 상세 수입 조회 */ SELECT di.id, /* 수입 id */ di.input_type, /* 입력구분 */ + di.category, + di.income_mark, + di.expense_mark, di.is_credit, /* 외상판매여부 */ di.crop_code, /* 재배형태 코드 */ + ui_crop.code_value AS crop_value, /* 재배형태 코드 값 */ ui_crop.code_text AS crop_text, /* 재배형태 코드 텍스트 */ di.income_kind, /* 수입의 종류 */ + di.income_kind_mark, di.source_purpose, /* 수입원(용도) */ di.quantity, /* 수량 */ di.unit_code, /* 단위 코드 */ @@ -39,6 +44,10 @@ di.estimated_value, /* 현물평가액 */ di.updated_by, /* 최종수정자 */ TO_CHAR(di.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */ + + , ddg.start_day + , ddg.end_day + FROM daily_income di LEFT JOIN uicode ui_crop ON ui_crop.parent_id = 'code.record.crop' @@ -46,9 +55,21 @@ LEFT JOIN uicode ui_unit ON ui_unit.parent_id = 'code.record.unit' AND ui_unit.id = di.unit_code - WHERE di.daily_record_seq = #{recordSeq} - AND di.is_deleted = false + + INNER JOIN daily_record dr + ON dr.id = di.daily_record_seq + AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth} + LEFT JOIN daily_day_group ddg + ON ddg.group_no = dr.day_group_no + + WHERE di.is_deleted = false + + AND di.daily_record_seq = #{recordSeq} ORDER BY di.created_at + + + ORDER BY ddg.start_day asc, di.created_at asc + @@ -77,7 +77,9 @@ /* getDailyWorkRecords : 일계부 등록 현황 상세 임업노동 투입 내역 조회 */ SELECT dw.id, dw.item_name, /* 품목명 */ - dw.work_name, /* 작업명*/ + dw.item_mark, + dw.work_name, /* 작업명*/ + dw.work_mark, dw.work_land_area, /* 작업 면적 */ CASE WHEN dw.area_unit_code = 'code.record.area.self' @@ -102,6 +104,10 @@ dw.volunteer_f_hours, /* 일손돕기(여) */ dw.updated_by, /* 최종수정자 */ dw.updated_at /* 최종수정날짜 */ + + , ddg.start_day + , ddg.end_day + FROM daily_work dw LEFT JOIN uicode ui_area ON ui_area.parent_id = 'code.record.area' @@ -109,9 +115,21 @@ LEFT JOIN uicode ui_harvest ON ui_harvest.parent_id = 'code.record.unit' AND ui_harvest.id = dw.harvest_unit_code - WHERE dw.daily_record_seq = #{recordSeq} - AND dw.is_deleted = false - ORDER BY dw.created_at + + INNER JOIN daily_record dr + ON dr.id = dw.daily_record_seq + AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth} + LEFT JOIN daily_day_group ddg + ON ddg.group_no = dr.day_group_no + + WHERE dw.is_deleted = false + + AND dw.daily_record_seq = #{recordSeq} + ORDER BY dw.created_at + + + ORDER BY ddg.start_day asc, dw.created_at asc + @@ -167,20 +185,39 @@ /* getDailyPowerRecords : 일계부 등록 현황 상세 동력사용시간 조회 */ SELECT dp.id, /* 동력사용시간 id */ dp.equipment_name, /* 명칭 */ + dp.equipment_mark, /* 명칭 부호 */ dp.owned_hours, /* 자가 사용시간 */ dp.leased_hours, /* 임가 사용시간 */ dp.updated_by, /* 최종수정자 */ TO_CHAR(dp.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */ + + , ddg.start_day + , ddg.end_day + FROM daily_power dp - WHERE dp.daily_record_seq = #{recordSeq} - AND dp.is_deleted = false - ORDER BY dp.created_at + + INNER JOIN daily_record dr + ON dr.id = dp.daily_record_seq + AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth} + LEFT JOIN daily_day_group ddg + ON ddg.group_no = dr.day_group_no + + WHERE dp.is_deleted = false + + AND dp.daily_record_seq = #{recordSeq} + ORDER BY dp.created_at + + + ORDER BY ddg.start_day asc, dp.created_at asc + \ No newline at end of file From f92d6f3b80c50e10adc78e6c4be3919f216bc3a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Thu, 3 Jul 2025 15:44:17 +0900 Subject: [PATCH 13/14] =?UTF-8?q?[BO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20?= =?UTF-8?q?=EB=AF=B8=EC=9E=91=EC=84=B1=EA=B1=B4=20=EA=B8=88=EC=9D=BC?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=EC=97=86=EC=9D=8C=EC=9C=BC=EB=A1=9C?= =?UTF-8?q?=20=EB=93=B1=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/CreateDailyRecordController.java | 45 ++++++++++++ .../GetDailyRecordStatusDetailMapper.xml | 68 ++++++++----------- .../households/tab/daily-record.html | 26 ++++++- .../src/main/resources/sql/data/02_uicode.sql | 2 +- 4 files changed, 98 insertions(+), 43 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyRecord/adapters/web/CreateDailyRecordController.java diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyRecord/adapters/web/CreateDailyRecordController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyRecord/adapters/web/CreateDailyRecordController.java new file mode 100644 index 00000000..8be4e3fb --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyRecord/adapters/web/CreateDailyRecordController.java @@ -0,0 +1,45 @@ +package app.module.admin.usecase.household.tab.dailyRecord.createDailyRecord.adapters.web; + +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO; +import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@Slf4j +@RestController +@RequiredArgsConstructor +public class CreateDailyRecordController { + private final DailyRecordPortIn dailyRecordPortIn; + + /** + * 일계부 항목 등록 처리 + * + * @param formVO 입력 데이터 + */ + @PostMapping(path = "/api/household/daily/create") + ResponseEntity create(@RequestBody CreateDailyRecordReqVO formVO) { + + formVO.setTodayNone("Y"); + + DailyUIReqVO reqVO = new DailyUIReqVO(formVO.getRecordMonth(), formVO.getDayGroupNo(), formVO.getHouseholdSeq()); + log.debug("reqVO: {}", reqVO); + + DailyRecordDto detail = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq()); + formVO.setRecordMonth(reqVO.getSearchMonth()); + formVO.setDayGroupNo(reqVO.getGroupNo()); + formVO.setStartDate(detail.getStartDate()); + formVO.setEndDate(detail.getEndDate()); + formVO.setFarming(detail.isFarmingOpen()); + formVO.setHouseholdSeq(reqVO.getHouseholdSeq()); + log.debug("formVO: {}", formVO); + + dailyRecordPortIn.create(formVO); + + return ResponseEntity.status(HttpStatus.OK).body(reqVO); + } +} diff --git a/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml b/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml index 6432f02c..332815c0 100644 --- a/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml +++ b/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml @@ -45,8 +45,8 @@ di.updated_by, /* 최종수정자 */ TO_CHAR(di.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */ - , ddg.start_day - , ddg.end_day + , EXTRACT(DAY FROM CAST(dr.start_date as date)) as start_day + , EXTRACT(DAY FROM CAST(dr.end_date as date)) as end_day FROM daily_income di LEFT JOIN uicode ui_crop @@ -57,10 +57,8 @@ AND ui_unit.id = di.unit_code INNER JOIN daily_record dr - ON dr.id = di.daily_record_seq - AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth} - LEFT JOIN daily_day_group ddg - ON ddg.group_no = dr.day_group_no + ON dr.id = di.daily_record_seq + AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth} WHERE di.is_deleted = false @@ -68,7 +66,7 @@ ORDER BY di.created_at - ORDER BY ddg.start_day asc, di.created_at asc + ORDER BY dr.start_date asc, di.created_at asc @@ -105,8 +103,8 @@ dw.updated_by, /* 최종수정자 */ dw.updated_at /* 최종수정날짜 */ - , ddg.start_day - , ddg.end_day + , EXTRACT(DAY FROM CAST(dr.start_date as date)) as start_day + , EXTRACT(DAY FROM CAST(dr.end_date as date)) as end_day FROM daily_work dw LEFT JOIN uicode ui_area @@ -117,10 +115,8 @@ AND ui_harvest.id = dw.harvest_unit_code INNER JOIN daily_record dr - ON dr.id = dw.daily_record_seq - AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth} - LEFT JOIN daily_day_group ddg - ON ddg.group_no = dr.day_group_no + ON dr.id = dw.daily_record_seq + AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth} WHERE dw.is_deleted = false @@ -128,7 +124,7 @@ ORDER BY dw.created_at - ORDER BY ddg.start_day asc, dw.created_at asc + ORDER BY dr.start_date asc, dw.created_at asc @@ -156,8 +152,8 @@ de.updated_by, /* 최종수정자 */ TO_CHAR(de.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */ - , ddg.start_day - , ddg.end_day + , EXTRACT(DAY FROM CAST(dr.start_date as date)) as start_day + , EXTRACT(DAY FROM CAST(dr.end_date as date)) as end_day FROM daily_expense de LEFT JOIN uicode ui_unit @@ -167,8 +163,6 @@ INNER JOIN daily_record dr ON dr.id = de.daily_record_seq AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth} - LEFT JOIN daily_day_group ddg - ON ddg.group_no = dr.day_group_no WHERE de.is_deleted = false @@ -176,7 +170,7 @@ ORDER BY de.created_at - ORDER BY ddg.start_day asc, de.created_at asc + ORDER BY dr.start_date, de.created_at asc @@ -191,16 +185,14 @@ dp.updated_by, /* 최종수정자 */ TO_CHAR(dp.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */ - , ddg.start_day - , ddg.end_day + , EXTRACT(DAY FROM CAST(dr.start_date as date)) as start_day + , EXTRACT(DAY FROM CAST(dr.end_date as date)) as end_day FROM daily_power dp INNER JOIN daily_record dr - ON dr.id = dp.daily_record_seq - AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth} - LEFT JOIN daily_day_group ddg - ON ddg.group_no = dr.day_group_no + ON dr.id = dp.daily_record_seq + AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth} WHERE dp.is_deleted = false @@ -208,7 +200,7 @@ ORDER BY dp.created_at - ORDER BY ddg.start_day asc, dp.created_at asc + ORDER BY dr.start_date asc, dp.created_at asc @@ -231,8 +223,8 @@ df.updated_by, /* 최종수정자 */ TO_CHAR(df.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */ - , ddg.start_day - , ddg.end_day + , EXTRACT(DAY FROM CAST(dr.start_date as date)) as start_day + , EXTRACT(DAY FROM CAST(dr.end_date as date)) as end_day FROM daily_forestry df LEFT JOIN uicode ui_unit @@ -240,10 +232,8 @@ AND ui_unit.id = df.unit_code INNER JOIN daily_record dr - ON dr.id = df.daily_record_seq - AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth} - LEFT JOIN daily_day_group ddg - ON ddg.group_no = dr.day_group_no + ON dr.id = df.daily_record_seq + AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth} WHERE df.is_deleted = false @@ -251,7 +241,7 @@ ORDER BY df.created_at - ORDER BY ddg.start_day asc, df.created_at asc + ORDER BY dr.start_date asc, df.created_at asc @@ -277,8 +267,8 @@ df.updated_by, /* 최종수정자 */ TO_CHAR(df.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */ - , ddg.start_day - , ddg.end_day + , EXTRACT(DAY FROM CAST(dr.start_date as date)) as start_day + , EXTRACT(DAY FROM CAST(dr.end_date as date)) as end_day FROM daily_farming df LEFT JOIN uicode ui_product @@ -289,10 +279,8 @@ AND ui_unit.id = df.unit_code INNER JOIN daily_record dr - ON dr.id = df.daily_record_seq - AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth} - LEFT JOIN daily_day_group ddg - ON ddg.group_no = dr.day_group_no + ON dr.id = df.daily_record_seq + AND dr.is_deleted = false AND dr.household_seq = #{householdSeq} AND dr.record_month = #{recordMonth} WHERE df.is_deleted = false @@ -300,7 +288,7 @@ ORDER BY df.created_at - ORDER BY ddg.start_day asc, df.created_at asc + ORDER BY dr.start_date asc, df.created_at asc 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 7907bfb2..6a86cedd 100644 --- a/admin/src/main/resources/templates/households/tab/daily-record.html +++ b/admin/src/main/resources/templates/households/tab/daily-record.html @@ -418,8 +418,8 @@ // 일계부 등록 현황 상세 const getDailyRecordsView = (id, groupNo, dayGroupText) => { - if(id == null) { - alert('등록 내역이 없습니다.'); + if (id == null) { + showDailyCreateConfirm(groupNo); return; } @@ -754,6 +754,28 @@ }); } + // 데이터 등록 Confirm + const showDailyCreateConfirm = (groupNo) => { + etUI.dialog.confirm({ + title: '등록 안내', + message: '등록된 내역이 없습니다.
등록하시겠습니까?', + positiveCallback: function () { + let obj = $(document.reqForm).serializeObject(); + obj.dayGroupNo = groupNo; + + ajaxUtil._ajaxAsyncNoWaiting( + '/api/household/daily/create', + obj, + function () { + alert('등록 상태가 변경되었습니다.'); + + getDailyRecordsList(); + }, + ); + }, + }); + } + // 데이터 초기화 Confirm const showDailyNoneConfirm = (el) => { const currentStep = $(el).data('step'); diff --git a/core/src/main/resources/sql/data/02_uicode.sql b/core/src/main/resources/sql/data/02_uicode.sql index ce9184e4..9e2ca894 100644 --- a/core/src/main/resources/sql/data/02_uicode.sql +++ b/core/src/main/resources/sql/data/02_uicode.sql @@ -152,7 +152,7 @@ VALUES ('code.record.farming', 'code.record', '자가농업 생산물 중 자가소비량', NULL, NULL, true, 3, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), ('code.record.farming.11', 'code.record.farming', '쌀', '12111,81012', NULL, true, 0, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), ('code.record.farming.12', 'code.record.farming', '찹쌀', '12111,81012', NULL, true, 1, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), -('code.record.farming.13', 'code.record.farming', '보리', '12111,81012', NULL, true, 2, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), +('code.record.farming.13', 'code.record.farming', '보리', '12112,81012', NULL, true, 2, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), ('code.record.farming.14', 'code.record.farming', '콩', '12114,81012', NULL, true, 3, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), ('code.record.farming.15', 'code.record.farming', '팥', '12114,81012', NULL, true, 4, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), ('code.record.farming.16', 'code.record.farming', '고구마', '12114,81012', NULL, true, 5, NOW(), 'khj', NOW(), 'khj', NULL, NULL, false), From 4e0f59238c16df4d59c04beba9393ad90b54e6bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Thu, 3 Jul 2025 16:36:25 +0900 Subject: [PATCH 14/14] =?UTF-8?q?[BO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20?= =?UTF-8?q?=EC=86=8C=EC=88=98=EC=A0=90=20=ED=8F=AC=ED=95=A8=EB=90=9C=20?= =?UTF-8?q?=EC=88=AB=EC=9E=90=ED=98=95=EC=9D=80=20=EC=BD=A4=EB=A7=88?= =?UTF-8?q?=ED=98=95=EC=8B=9D=EC=97=90=EC=84=9C=20=EC=A0=9C=EC=99=B8=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC,=20=EB=AA=85=EC=B9=AD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GetDailyRecordStatusDetailController.java | 12 ++++---- .../GetDailyRecordStatusDetailMapper.xml | 28 +++++++++---------- .../households/modal/modal-daily-expense.html | 2 +- .../households/modal/modal-daily-farming.html | 2 +- .../modal/modal-daily-forestry.html | 2 +- .../households/modal/modal-daily-income.html | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java index f8557b35..a0c1e47d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/web/GetDailyRecordStatusDetailController.java @@ -125,7 +125,7 @@ class GetDailyRecordStatusDetailController { "수입", List.of("임가번호", "경영주 성명", "날", "짜", "유형", "수입 부호", "지출 부호", "재배형태 코드", "수입의 종류", "종류 부호", "수입원", "수량", "단위", "현금(원)", "현물(평가액)"), rows, - Set.of(11, 13, 14), + Set.of(13, 14), Map.of( 0, IndexedColors.LIGHT_YELLOW, 2, IndexedColors.LIGHT_TURQUOISE, @@ -178,7 +178,7 @@ class GetDailyRecordStatusDetailController { List.of("임가번호", "경영주 성명", "날", "짜", "품목명", "품목부호", "작업명", "작업 부호", "작업면적", "단위", "수확량", "단위", "경영주", "배우자", "가족노동-남", "가족노동-여", "고용노동-남", "고용노동-여", "품앗이-남", "품앗이-여", "일손돕기-남", "일손돕기-여"), rows, - Set.of(8, 10, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21), + null, Map.of( 0, IndexedColors.LIGHT_YELLOW, 2, IndexedColors.LIGHT_TURQUOISE, @@ -222,7 +222,7 @@ class GetDailyRecordStatusDetailController { "지출", List.of("임가번호", "경영주 성명", "날", "짜", "유형", "수입 부호", "지출 부호", "지출의 종류", "종류 부호", "용도", "수량", "단위", "현금(원)", "현물(평가액)"), rows, - Set.of(10, 12, 13), + Set.of(12, 13), Map.of( 0, IndexedColors.LIGHT_YELLOW, 2, IndexedColors.LIGHT_TURQUOISE, @@ -257,7 +257,7 @@ class GetDailyRecordStatusDetailController { "동력사용시간", List.of("임가번호", "경영주 성명", "날", "짜", "명칭", "명칭 부호", "자가 사용시간", "임차 사용시간"), rows, - Set.of(6, 7), + null, Map.of( 0, IndexedColors.LIGHT_YELLOW, 2, IndexedColors.LIGHT_TURQUOISE, @@ -295,7 +295,7 @@ class GetDailyRecordStatusDetailController { "임업_자가소비량", List.of("임가번호", "경영주 성명", "날", "짜", "수입 부호", "지출 부호", "생산물", "용도", "수량", "단위", "현물(평가액)"), rows, - Set.of(8, 10), + Set.of(10), Map.of( 0, IndexedColors.LIGHT_YELLOW, 2, IndexedColors.LIGHT_TURQUOISE, @@ -333,7 +333,7 @@ class GetDailyRecordStatusDetailController { "농업_자가소비량", List.of("임가번호", "경영주 성명", "날", "짜", "수입 부호", "지출 부호", "생산물", "용도", "수량", "단위", "현물(평가액)"), rows, - Set.of(8, 10), + Set.of(10), Map.of( 0, IndexedColors.LIGHT_YELLOW, 2, IndexedColors.LIGHT_TURQUOISE, diff --git a/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml b/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml index 332815c0..3d90ad50 100644 --- a/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml +++ b/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml @@ -23,15 +23,15 @@ /* getDailyIncomeRecords : 일계부 등록 현황 상세 수입 조회 */ SELECT di.id, /* 수입 id */ di.input_type, /* 입력구분 */ - di.category, - di.income_mark, - di.expense_mark, + di.category, /* 유형 */ + di.income_mark, /* 수입 부호 */ + di.expense_mark, /* 지출 부호 */ di.is_credit, /* 외상판매여부 */ di.crop_code, /* 재배형태 코드 */ ui_crop.code_value AS crop_value, /* 재배형태 코드 값 */ ui_crop.code_text AS crop_text, /* 재배형태 코드 텍스트 */ di.income_kind, /* 수입의 종류 */ - di.income_kind_mark, + di.income_kind_mark, /* 종류 부호 */ di.source_purpose, /* 수입원(용도) */ di.quantity, /* 수량 */ di.unit_code, /* 단위 코드 */ @@ -75,9 +75,9 @@ /* getDailyWorkRecords : 일계부 등록 현황 상세 임업노동 투입 내역 조회 */ SELECT dw.id, dw.item_name, /* 품목명 */ - dw.item_mark, + dw.item_mark, /* 품목 부호 */ dw.work_name, /* 작업명*/ - dw.work_mark, + dw.work_mark, /* 작업 부호 */ dw.work_land_area, /* 작업 면적 */ CASE WHEN dw.area_unit_code = 'code.record.area.self' @@ -133,12 +133,12 @@ /* getDailyExpenseRecords : 일계부 등록 현황 상세 지출 조회 */ SELECT de.id, /* 지출 id */ de.input_type, /* 입력구분 */ - de.category, - de.income_mark, - de.expense_mark, + de.category, /* 유형 */ + de.income_mark, /* 수입 부호 */ + de.expense_mark, /* 지출 부호 */ de.is_credit, /* 외상판매여부 */ de.expense_kind, /* 지출 종류 */ - de.expense_kind_mark, + de.expense_kind_mark, /* 종류 부호 */ de.source_purpose, /* 지출원(용도) */ de.quantity, /* 수량 */ de.unit_code, /* 단위 */ @@ -208,8 +208,8 @@ resultType="app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyForestryRecords"> /* getDailyForestryRecords : 일계부 등록 현황 상세 자가임업 생산물 중 자가소비량 조회 */ SELECT df.id, /* 자가임업 id */ - df.income_mark, - df.expense_mark, + df.income_mark, /* 수입 부호 */ + df.expense_mark, /* 지출 부호 */ df.product_name, /* 생산물 */ df.usage, /* 용도 */ df.quantity, /* 수량 */ @@ -249,8 +249,8 @@ resultType="app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyFarmingRecords"> /* getDailyFarmingRecords : 일계부 등록 현황 상세 자가농업 생산물 중 자가소비량 조회 */ SELECT df.id, /* 자가농업 id */ - df.income_mark, - df.expense_mark, + df.income_mark, /* 수입 부호 */ + df.expense_mark, /* 종류 부호 */ CASE WHEN df.product_code = 'code.record.farming.self' THEN df.product_self diff --git a/admin/src/main/resources/templates/households/modal/modal-daily-expense.html b/admin/src/main/resources/templates/households/modal/modal-daily-expense.html index 6906e4c0..273429b2 100644 --- a/admin/src/main/resources/templates/households/modal/modal-daily-expense.html +++ b/admin/src/main/resources/templates/households/modal/modal-daily-expense.html @@ -114,7 +114,7 @@ - 현물평가액(원)* + 현물(평가액)*
diff --git a/admin/src/main/resources/templates/households/modal/modal-daily-farming.html b/admin/src/main/resources/templates/households/modal/modal-daily-farming.html index 639cc04d..2401b925 100644 --- a/admin/src/main/resources/templates/households/modal/modal-daily-farming.html +++ b/admin/src/main/resources/templates/households/modal/modal-daily-farming.html @@ -93,7 +93,7 @@ - 현물평가액(원)* + 현물(평가액)*
diff --git a/admin/src/main/resources/templates/households/modal/modal-daily-forestry.html b/admin/src/main/resources/templates/households/modal/modal-daily-forestry.html index bef88ecc..34e079b8 100644 --- a/admin/src/main/resources/templates/households/modal/modal-daily-forestry.html +++ b/admin/src/main/resources/templates/households/modal/modal-daily-forestry.html @@ -83,7 +83,7 @@ - 현물평가액(원)* + 현물(평가액)*
diff --git a/admin/src/main/resources/templates/households/modal/modal-daily-income.html b/admin/src/main/resources/templates/households/modal/modal-daily-income.html index 071b3dc6..ade463cb 100644 --- a/admin/src/main/resources/templates/households/modal/modal-daily-income.html +++ b/admin/src/main/resources/templates/households/modal/modal-daily-income.html @@ -126,7 +126,7 @@
- 현물평가액(원)* + 현물(평가액)*