diff --git a/README.md b/README.md index 38513630..d8352145 100644 --- a/README.md +++ b/README.md @@ -154,12 +154,13 @@ InitAdminData, InitUriFrontData 등 *ApplicationRunner* 구현체에서 내용 - #### 📡 Ajax 호출 방식 (REST API, JSON 응답) 다음 기능은 Ajax를 통해 REST API(JSON)를 호출합니다 -| 기능 | 메서드 | URI | 예시 | -|------------|------------|------------------------------------|------------------------| -| 목록 조회 | GET | `/api/{resource-name}/list` | `/api/articles/list` | -| 등록 | POST | `/api/{resource-name}/create` | `/api/articles/create` | -| 수정 | PUT/PATCH | `/api/{resource-name}/update` | `/api/articles/update` | -| 삭제 | DELETE | `/api/{resource-name}/remove` | `/api/articles/remove` | +| 기능 | 메서드 | URI | 예시 | +|----------|----------|------------------------------------|------------------------| +| 목록 조회 | GET | `/api/{resource-name}/list` | `/api/articles/list` | +| 등록 | POST | `/api/{resource-name}/create` | `/api/articles/create` | +| 수정 | PUT/PATCH | `/api/{resource-name}/update` | `/api/articles/update` | +| 삭제 | DELETE | `/api/{resource-name}/remove` | `/api/articles/remove` | +| 등록 & 수정 |POST | `/api/{resource-name}/save` | `/api/articles/save` | - #### 🖥️ 서버 렌더링 방식 (SSR) diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java index 7163d830..11a831da 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java @@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Optional; @@ -42,6 +43,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut @Transactional public ExcelUploadResultVO operate(MultipartFile file) throws IOException { // 엑셀 파일 읽기 + Workbook workbook = WorkbookFactory.create(file.getInputStream()); Sheet sheet = workbook.getSheetAt(0); Integer success = 0; @@ -52,6 +54,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut List IndustryLargeCodeList = uiCodeListMapper.findByParentId("code.industry.large"); List IndustryMiddleCodeList = uiCodeListMapper.findByParentId("code.industry.middle"); + List errorList = new ArrayList<>(); // 첫 번째 행은 헤더로 간주하고 스킵 for (int i = 1; i <= sheet.getLastRowNum(); i++) { Row row = sheet.getRow(i); @@ -60,9 +63,9 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut CheckHouseholdNum checkHouseholdNum = checkHouseholdNumMapper.checkHouseholdNum(new CheckHouseholdNumCmd(getCellValue(row.getCell(0)))).orElse(null); ExcelUploadContactVO contactVO = getDivisionContact(row.getCell(3)); - + // 데이터 누락 warn if(!checkHouseholdNum.getIsDuplicated() && contactVO != null) { - + int flag = 0; ExcelCreateHouseholdVO household = new ExcelCreateHouseholdVO(); household.setHouseholdNum(getCellValue(row.getCell(0))); // 임가번호 household.setOwnerName(getCellValue(row.getCell(1))); // 경영주명 @@ -80,7 +83,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut household.setIndustryDetail(getCellValue(row.getCell(11))); // 규모 / 세부품목 household.setResearcherSeq(getResearcherSeq(row.getCell(12))); // 조사원 household.setIsPanel(getIsPanel(row.getCell(13))); // 유지여부 - + household.setMemo(getCellValue(row.getCell(14))); // 비고 CreateHouseholdOutCmd cmd = new CreateHouseholdOutCmd( null, @@ -100,11 +103,17 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut household.getIndustryDetail(), household.getResearcherSeq(), household.getIsPanel(), - null, + household.getMemo(), List.of("ROLE_GENERAL") ); - success += createHouseholdMapper.createHousehold(AuditUtil.create(cmd)); + flag = createHouseholdMapper.createHousehold(AuditUtil.create(cmd)); + + success += flag; + + if(flag == 0){ + errorList.add(household.getHouseholdNum()); + } if(cmd.getRoleIds() != null && !cmd.getRoleIds().isEmpty()) { createHouseholdMapper.createHouseholdHasRole(AuditUtil.create(new CreateHouseholdHasRoleCmd(cmd.getSeq(), cmd.getRoleIds()))); @@ -116,7 +125,7 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut } } workbook.close(); - return new ExcelUploadResultVO(sheet.getLastRowNum()-1 , success); + return new ExcelUploadResultVO(sheet.getLastRowNum()-1 , success, errorList); } // 셀 값을 문자열로 변환 diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelCreateHouseholdVO.java b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelCreateHouseholdVO.java index b9f61a6d..fd3cef9b 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelCreateHouseholdVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelCreateHouseholdVO.java @@ -24,4 +24,5 @@ public class ExcelCreateHouseholdVO { private String industryDetail; private Long researcherSeq; private Boolean isPanel; + private String memo; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelUploadResultVO.java b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelUploadResultVO.java index e8403fe7..227400c2 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelUploadResultVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/web/model/ExcelUploadResultVO.java @@ -4,10 +4,13 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Getter @Setter @AllArgsConstructor public class ExcelUploadResultVO { private Integer total; private Integer success; + private List errorList; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/adapters/web/GetHouseholdStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/adapters/web/GetHouseholdStatusUIController.java index b003eb9b..45b08fc1 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/adapters/web/GetHouseholdStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/adapters/web/GetHouseholdStatusUIController.java @@ -17,27 +17,31 @@ import org.springframework.web.bind.annotation.RequestParam; @Controller @RequiredArgsConstructor class GetHouseholdStatusUIController { - private final GetHouseholdStatusPortIn getHouseholdStatusPortIn; - private final UICodeListPortIn uiCodeListPortIn; + private final GetHouseholdStatusPortIn getHouseholdStatusPortIn; + private final UICodeListPortIn uiCodeListPortIn; - @GetMapping(path = "/households/{seq}") - String operate( - @PathVariable Long seq, - @RequestParam(required = false) String recordMonth, - Model model, - @ModelAttribute("reqVO") GetHouseholdStatusUIReqVO reqVO) { + @GetMapping(path = "/households/{seq}") + String operate( + @PathVariable Long seq, + @RequestParam(required = false) String recordMonth, + Model model, + @ModelAttribute("reqVO") GetHouseholdStatusUIReqVO reqVO) { - model.addAttribute("seq", seq); - model.addAttribute("monthList", DateUiUtil.getRecentMonths(13)); - model.addAttribute("recordMonth", recordMonth); - model.addAttribute("userRole", AdminUtil.getLoginUserRole()); + model.addAttribute("seq", seq); + model.addAttribute("monthList", DateUiUtil.getRecentMonths(13)); + model.addAttribute("recordMonth", recordMonth); + model.addAttribute("userRole", AdminUtil.getLoginUserRole()); - model.addAttribute("unitCodes", uiCodeListPortIn.connect("code.record.unit")); + model.addAttribute("unitCodes", uiCodeListPortIn.connect("code.record.unit")); + model.addAttribute("recordCrop", uiCodeListPortIn.connect("code.record.crop")); + model.addAttribute("recordUnit", uiCodeListPortIn.connect("code.record.unit")); + model.addAttribute("recordArea", uiCodeListPortIn.connect("code.record.area")); + model.addAttribute("recordFarming", uiCodeListPortIn.connect("code.record.farming")); - // 임가 상세 정보 - model.addAttribute("householdInfo", - getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null)); + // 임가 상세 정보 + model.addAttribute("householdInfo", + getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null)); - return "households/{seq}"; - } + return "households/{seq}"; + } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java index a1a64984..72db805a 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferExpenseRecords.java @@ -13,7 +13,7 @@ public class GetBankAutoTransferExpenseRecords { private Long id; private String categoryText; private String sourcePurpose; - private Integer count; + private String count; private String unitText; private Integer price; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java index 2ba5b126..8802f84d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/bankAutoTransfer/getBankAutoTransferRecords/ports/application/domain/GetBankAutoTransferIncomeRecords.java @@ -15,7 +15,7 @@ public class GetBankAutoTransferIncomeRecords { private String categoryText; private String target; private String sourcePurpose; - private Integer count; + private String count; private String unitText; private Integer price; } 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 new file mode 100644 index 00000000..ad37cec4 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeDao.java @@ -0,0 +1,37 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; +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 lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +@RequiredArgsConstructor +public class SaveDailyIncomeDao implements SaveDailyIncomePortOut { + private final SaveDailyIncomeMapper dailyIncomeMapper; + + @Override + public GetDailyIncomeDto detail(GetDailyIncomeCmd command) { + + return dailyIncomeMapper.getDailyIncome(command); + } + + @Override + public void create(GetDailyIncomeCmd findCmd, SaveDailyIncomeCmd command) { + Integer existCount = dailyIncomeMapper.getRecordExistCount(findCmd); + if (existCount == 0) { + dailyIncomeMapper.createDailyIncome(command); + + log.debug("[CreateDailyIncome] command={}", command); + } else { + dailyIncomeMapper.updateDailyIncome(command); + + log.debug("[UpdateDailyIncome] command={}", command); + } + } + +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeMapper.java new file mode 100644 index 00000000..c90cbb6d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeMapper.java @@ -0,0 +1,39 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; +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 org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SaveDailyIncomeMapper { + /** + * 일계부 수입 데이터 조회 + * + * @param command 검색 조건 + * @return 수입 데이터 + */ + GetDailyIncomeDto getDailyIncome(GetDailyIncomeCmd command); + + /** + * 일계부 수입 데이터 존재 여부 + * + * @param command 검색 조건 + * @return 중복 개수 + */ + Integer getRecordExistCount(GetDailyIncomeCmd command); + + /** + * 일계부 수입 등록 + * + * @param command 등록 데이터 + */ + void createDailyIncome(SaveDailyIncomeCmd command); + + /** + * 일계부 수입 수정 + * + * @param command 수정 데이터 + */ + void updateDailyIncome(SaveDailyIncomeCmd command); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java new file mode 100644 index 00000000..2a8dc88e --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java @@ -0,0 +1,24 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal; + +import app.module.core.config.application.enums.DailyInputType; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class GetDailyIncomeDto { + private Long id; + private Long dailyRecordSeq; + private DailyInputType inputType; + private Boolean credit; + private String cropCode; + private String cropLabel; + private String incomeKind; + 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/saveDailyIncome/adapters/web/SaveDailyIncomeController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/SaveDailyIncomeController.java new file mode 100644 index 00000000..ee98794c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/SaveDailyIncomeController.java @@ -0,0 +1,87 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.SaveDailyIncomeReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.DailyIncomeUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.validator.SaveDailyIncomeValidator; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.SaveDailyIncomePortIn; +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/income") +public class SaveDailyIncomeController { + private final DailyRecordPortIn dailyRecordPortIn; + private final SaveDailyIncomePortIn dailyIncomePortIn; + private final SaveDailyIncomeValidator sailyIncomeValidator; + + /** + * 일계부 수입 조회 + * + * @param id 수입 일련번호 + * @param reqVO 검색 조건 + */ + @GetMapping(path = "/{id}") + ResponseEntity detail(@PathVariable("id") String id, @ModelAttribute DailyIncomeUIReqVO reqVO) { + + reqVO.setId(Long.parseLong(id)); + + GetDailyIncomeDto detail = dailyIncomePortIn.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 SaveDailyIncomeReqVO formVO, BindingResult bindingResult) { + + sailyIncomeValidator.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); + + dailyIncomePortIn.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/saveDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java new file mode 100644 index 00000000..71bffa92 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java @@ -0,0 +1,31 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class DailyIncomeUIReqVO { + /** + * 검색 월(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/saveDailyIncome/adapters/web/model/SaveDailyIncomeReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/model/SaveDailyIncomeReqVO.java new file mode 100644 index 00000000..cdb49a64 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/model/SaveDailyIncomeReqVO.java @@ -0,0 +1,55 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.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 SaveDailyIncomeReqVO extends DailyIncomeUIReqVO { + /** + * 등록 유형 + */ + private DailyInputType inputType; + /** + * 외상판매 여부 + */ + private Boolean credit; + /** + * 재배형태 코드 + */ + private String cropCode; + /** + * 수입의 종류 직접입력 + */ + @NotBlank(message = "수입 종류를 입력해 주세요.") + private String incomeKind; + /** + * 수입원 + */ + @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/saveDailyIncome/adapters/web/validator/SaveDailyIncomeValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/validator/SaveDailyIncomeValidator.java new file mode 100644 index 00000000..5783baca --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/validator/SaveDailyIncomeValidator.java @@ -0,0 +1,50 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.validator; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.SaveDailyIncomeReqVO; +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 SaveDailyIncomeValidator implements Validator { + + @Override + public boolean supports(Class clazz) { + return SaveDailyIncomeReqVO.class.equals(clazz); + } + + @Override + public void validate(Object target, Errors errors) { + SaveDailyIncomeReqVO vo = (SaveDailyIncomeReqVO) 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 ("code.record.unit.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/saveDailyIncome/ports/SaveDailyIncomePortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortIn.java new file mode 100644 index 00000000..a4136a0f --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortIn.java @@ -0,0 +1,23 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports; + + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.SaveDailyIncomeReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.DailyIncomeUIReqVO; + +public interface SaveDailyIncomePortIn { + /** + * 일계부 수입 조회 + * + * @param reqVO 검색 조건 + * @return 수입 상세 + */ + GetDailyIncomeDto detail(DailyIncomeUIReqVO reqVO); + + /** + * 일계부 수입 등록 + * + * @param formVO 입력 데이터 + */ + void create(SaveDailyIncomeReqVO formVO); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortOut.java new file mode 100644 index 00000000..22d7a0ac --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortOut.java @@ -0,0 +1,24 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports; + + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; +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; + +public interface SaveDailyIncomePortOut { + /** + * 일계부 수입 조회 + * + * @param command 검색 조건 + * @return 수입 상세 + */ + GetDailyIncomeDto detail(GetDailyIncomeCmd command); + + /** + * 일계부 수입 등록 + * + * @param findCmd 검색 조건 + * @param command 입력 데이터 + */ + void create(GetDailyIncomeCmd findCmd, SaveDailyIncomeCmd command); +} 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 new file mode 100644 index 00000000..28a06502 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/SaveDailyIncomeService.java @@ -0,0 +1,62 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.SaveDailyIncomeReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.DailyIncomeUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.SaveDailyIncomePortIn; +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.util.AuditUtil; +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 SaveDailyIncomeService implements SaveDailyIncomePortIn { + private final SaveDailyIncomePortOut portOut; + private final DailyRecordPortIn dailyRecordPortIn; + + @Override + public GetDailyIncomeDto detail(DailyIncomeUIReqVO reqVO) { + GetDailyIncomeCmd findCmd = new GetDailyIncomeCmd( + reqVO.getSearchMonth(), + reqVO.getGroupNo(), + reqVO.getHouseholdSeq(), + reqVO.getId()); + + return portOut.detail(findCmd); + } + + @Override + public void create(SaveDailyIncomeReqVO formVO) { + GetDailyIncomeCmd findCmd = new GetDailyIncomeCmd( + formVO.getSearchMonth(), + formVO.getGroupNo(), + formVO.getHouseholdSeq(), + formVO.getId()); + + SaveDailyIncomeCmd command = AuditUtil.create( + new SaveDailyIncomeCmd( + formVO.getId(), + formVO.getDailyId(), + formVO.getInputType(), + DailyRecordConstants.INCOME_CATEGORY, + (formVO.getCredit() ? DailyRecordConstants.INCOME_EXPENSE_MARK : null), + formVO.getCredit(), + formVO.getCropCode(), + formVO.getIncomeKind(), + 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/saveDailyIncome/ports/application/domain/GetDailyIncomeCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/domain/GetDailyIncomeCmd.java new file mode 100644 index 00000000..f55cc420 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/domain/GetDailyIncomeCmd.java @@ -0,0 +1,27 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class GetDailyIncomeCmd { + /** + * 검색 월(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/saveDailyIncome/ports/application/domain/SaveDailyIncomeCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/domain/SaveDailyIncomeCmd.java new file mode 100644 index 00000000..3658483c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/domain/SaveDailyIncomeCmd.java @@ -0,0 +1,35 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.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 SaveDailyIncomeCmd extends AuditCommand { + private Long id; + private Long dailyRecordSeq; + private DailyInputType inputType; + /** + * 유형 + */ + private String category; + /** + * 지출 부호 + */ + private String expenseMark; + private Boolean credit; + private String cropCode; + private String incomeKind; + 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/application.yml b/admin/src/main/resources/application.yml index 5162f6b6..20e1af8a 100644 --- a/admin/src/main/resources/application.yml +++ b/admin/src/main/resources/application.yml @@ -42,6 +42,10 @@ server: mime-types: text/html,text/xml,text/plain,text/css,text/javascript,application/javascript # 압축 적용 최소 응답 크기(바이트) min-response-size: 2048 + servlet: + session: + cookie: + name: ADMIN_SESSION # ============================================== # 관리자 관련 설정 diff --git a/admin/src/main/resources/mappers/household/RemoveDailyMapper.xml b/admin/src/main/resources/mappers/household/daily/RemoveDailyMapper.xml similarity index 100% rename from admin/src/main/resources/mappers/household/RemoveDailyMapper.xml rename to admin/src/main/resources/mappers/household/daily/RemoveDailyMapper.xml diff --git a/admin/src/main/resources/mappers/household/daily/SaveDailyIncomeMapper.xml b/admin/src/main/resources/mappers/household/daily/SaveDailyIncomeMapper.xml new file mode 100644 index 00000000..56ad9c7c --- /dev/null +++ b/admin/src/main/resources/mappers/household/daily/SaveDailyIncomeMapper.xml @@ -0,0 +1,59 @@ + + + + + + + + + + insert into daily_income ( + daily_record_seq, input_type, category, expense_mark + , is_credit, crop_code, income_kind, source_purpose + , quantity, unit_code, unit_self, price, estimated_value + , is_deleted + , + ) values ( + #{dailyRecordSeq}, #{inputType}, #{category}, #{expenseMark} + , #{credit}, #{cropCode}, #{incomeKind}, #{sourcePurpose} + , #{quantity}, #{unitCode}, #{unitSelf}, #{price}, #{estimatedValue} + , false + , + ) + + + + update daily_income set + , is_credit = #{credit} + , expense_mark = #{expenseMark} + , crop_code = #{cropCode} + , income_kind = #{incomeKind} + , 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/mappers/household/UpdateDailyNoneMapper.xml b/admin/src/main/resources/mappers/household/daily/UpdateDailyNoneMapper.xml similarity index 100% rename from admin/src/main/resources/mappers/household/UpdateDailyNoneMapper.xml rename to admin/src/main/resources/mappers/household/daily/UpdateDailyNoneMapper.xml diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index ed886c3f..ebaedeb8 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -39,17 +39,25 @@ + + + + + + + + + + + + + \ 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 1bacad11..6653bb1d 100644 --- a/admin/src/main/resources/templates/households/tab/daily-record.html +++ b/admin/src/main/resources/templates/households/tab/daily-record.html @@ -508,7 +508,7 @@ ${item.isCredit ? "Y" : "N"} ${ifNullHyphen(item.cropText)} - ${ifNullHyphen(item.incomeKind)} + ${ifNullHyphen(item.incomeKind)} ${ifNullHyphen(item.sourcePurpose)} ${formatNumberWithComma(item.quantity)} ${ifNullHyphen(item.unitText)} @@ -806,9 +806,13 @@ const saveDaily = (el) => { const currentStep = $(el).data('step'); const currentModalId = $(el).data('modalId'); - console.log('removeDaily', currentStep, currentModalId); + console.log('saveDaily', currentStep, currentModalId); - alert('TODO : 추가') + if (currentStep === 'INCOME') { + showDailyIncomeModal(); + } else { + alert('TODO : 추가'); + } } // 일계부 삭제 처리 diff --git a/admin/src/main/resources/templates/households/{seq}.html b/admin/src/main/resources/templates/households/{seq}.html index de2ce186..9d4bd5ea 100644 --- a/admin/src/main/resources/templates/households/{seq}.html +++ b/admin/src/main/resources/templates/households/{seq}.html @@ -175,6 +175,9 @@ + + + @@ -321,6 +324,22 @@ unitArea.classList.add('input-disabled'); } } + + // 금액 1개 입력시 다른 금액 input disable + const priceDisabled = (el, disableEl) => { + const wrap = disableEl.closest('td'); + const disableArea = wrap.querySelector('.component-input'); + const disableInput = wrap.querySelector('input'); + + if (el.value === '') { + disableInput.disabled = false; + disableArea.classList.remove('input-disabled'); + } else { + disableInput.disabled = true; + disableInput.value = ''; + disableArea.classList.add('input-disabled'); + } + } diff --git a/core/src/main/java/app/module/core/config/application/enums/DailyInputType.java b/core/src/main/java/app/module/core/config/application/enums/DailyInputType.java new file mode 100644 index 00000000..cd10554a --- /dev/null +++ b/core/src/main/java/app/module/core/config/application/enums/DailyInputType.java @@ -0,0 +1,13 @@ +package app.module.core.config.application.enums; + +public enum DailyInputType { + /** + * 직접 입력 + */ + SELF, + /** + * 영수증 입력 + */ + OCR, + ; +} diff --git a/core/src/main/java/app/module/core/config/constants/CommonConstants.java b/core/src/main/java/app/module/core/config/constants/CommonConstants.java new file mode 100644 index 00000000..ae3392b3 --- /dev/null +++ b/core/src/main/java/app/module/core/config/constants/CommonConstants.java @@ -0,0 +1,17 @@ +package app.module.core.config.constants; + +public class CommonConstants { + private CommonConstants() { + throw new IllegalAccessError("어플리케이션에서 공통으로 사용되는 상수 클래스로 생성자를 사용할 수 없습니다."); + } + + /** + * 단위의 직접입력 코드 + */ + public static final String UNIT_CODE_SELF = "code.record.unit.self"; + + /** + * 작업 면적의 직접입력 코드 + */ + public static final String AREA_CODE_OTHER = "code.record.area.self"; +} 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 new file mode 100644 index 00000000..43a7686f --- /dev/null +++ b/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java @@ -0,0 +1,19 @@ +package app.module.core.config.constants; + +public class DailyRecordConstants { + private DailyRecordConstants() { + throw new IllegalAccessError("어플리케이션에서 일계부에서 사용되는 상수 클래스로 생성자를 사용할 수 없습니다."); + } + + /** + * 수입의 유형 + * [정책] 1 고정 + */ + public static final String INCOME_CATEGORY = "1"; + + /** + * 수입의 지출부호 + * [정책] 외상판매 Y 일 경우 지출부호 91206 적재 + */ + public static final String INCOME_EXPENSE_MARK = "91206"; +} diff --git a/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/DailyRecordDao.java b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/DailyRecordDao.java index fb7df769..2a43dbe2 100644 --- a/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/DailyRecordDao.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/DailyRecordDao.java @@ -76,6 +76,8 @@ public class DailyRecordDao implements DailyRecordPortOut { ) ); + log.debug("[updateByStatus] command: {}", command); + if ("ALL".equals(targetType)) { // 전체 입력상태 변경 String allStatus = this.getUpdateAllStatus(recordMonth, dayGroupNo, householdSeq); @@ -119,10 +121,9 @@ public class DailyRecordDao implements DailyRecordPortOut { ); dailyRecordMapper.updateDailyRecordStatus(command); - - } else { - log.debug("[updateByAllStatus] do nothing. findCmd: {}"); } + + log.debug("[updateByAllStatus] allStatus: {}", allStatus); } /** @@ -134,7 +135,7 @@ public class DailyRecordDao implements DailyRecordPortOut { * @return 변경할 전체 입력상태 */ private String getUpdateAllStatus(String searchMonth, Integer dayGroupNo, Long householdSeq) { - GetDailyRecordCmd findCmd = new GetDailyRecordCmd(searchMonth, dayGroupNo, householdSeq); + GetDailyRecordCmd findCmd = new GetDailyRecordCmd(searchMonth, dayGroupNo, householdSeq, null); DailyRecordStatusDto statusDetail = null; List statusList = dailyRecordMapper.getDailyRecordStatus(findCmd); diff --git a/core/src/main/java/app/module/core/usecase/daily/record/adapters/web/model/DailyUIReqVO.java b/core/src/main/java/app/module/core/usecase/daily/record/adapters/web/model/DailyUIReqVO.java index 1470359d..6afd046b 100644 --- a/core/src/main/java/app/module/core/usecase/daily/record/adapters/web/model/DailyUIReqVO.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/adapters/web/model/DailyUIReqVO.java @@ -24,6 +24,11 @@ public class DailyUIReqVO { this.householdSeq = householdSeq; } + public DailyUIReqVO(String searchMonth, Integer groupNo) { + this.searchMonth = searchMonth; + this.groupNo = groupNo; + } + /** * 검색 월(yyyyMM) */ diff --git a/core/src/main/java/app/module/core/usecase/daily/record/ports/DailyRecordPortIn.java b/core/src/main/java/app/module/core/usecase/daily/record/ports/DailyRecordPortIn.java index 4e244240..fa7010fa 100644 --- a/core/src/main/java/app/module/core/usecase/daily/record/ports/DailyRecordPortIn.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/ports/DailyRecordPortIn.java @@ -15,6 +15,13 @@ public interface DailyRecordPortIn { */ DailyRecordDto detail(String recordMonth, Integer dayGroupNo, Long householdSeq); + /** + * 일계부 항목 조회 + * + * @param dailyRecordSeq + */ + DailyRecordDto detail(Long dailyRecordSeq); + /** * 일계부 항목 등록 * diff --git a/core/src/main/java/app/module/core/usecase/daily/record/ports/application/DailyRecordService.java b/core/src/main/java/app/module/core/usecase/daily/record/ports/application/DailyRecordService.java index 917610d3..6a4c6297 100644 --- a/core/src/main/java/app/module/core/usecase/daily/record/ports/application/DailyRecordService.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/ports/application/DailyRecordService.java @@ -53,6 +53,36 @@ public class DailyRecordService implements DailyRecordPortIn { return dailyRecord; } + @Override + public DailyRecordDto detail(Long dailyRecordSeq) { + DailyRecordDto dailyRecord = portOut.detail(new GetDailyRecordCmd(dailyRecordSeq)); + + if (dailyRecord != null) { + List targetList = new ArrayList<>(); + if (this.isTarget(dailyRecord.getIncomeStatus())) { + targetList.add(DailySort.INCOME); + } + if (this.isTarget(dailyRecord.getWorkStatus())) { + targetList.add(DailySort.WORK); + } + if (this.isTarget(dailyRecord.getExpenseStatus())) { + targetList.add(DailySort.EXPENSE); + } + if (this.isTarget(dailyRecord.getPowerStatus())) { + targetList.add(DailySort.POWER); + } + if (this.isTarget(dailyRecord.getForestryStatus())) { + targetList.add(DailySort.FORESTRY); + } + if (this.isTarget(dailyRecord.getFarmingStatus())) { + targetList.add(DailySort.FARMING); + } + dailyRecord.setTargetList(targetList); + } + + return dailyRecord; + } + /** * 데이터 등록 대상 여부 * @@ -68,7 +98,8 @@ public class DailyRecordService implements DailyRecordPortIn { GetDailyRecordCmd findCmd = new GetDailyRecordCmd( formVO.getRecordMonth(), formVO.getDayGroupNo(), - formVO.getHouseholdSeq()); + formVO.getHouseholdSeq(), + null); CreateDailyRecordCmd command = AuditUtil.create( new CreateDailyRecordCmd( diff --git a/core/src/main/java/app/module/core/usecase/daily/record/ports/application/domain/GetDailyRecordCmd.java b/core/src/main/java/app/module/core/usecase/daily/record/ports/application/domain/GetDailyRecordCmd.java index 53d58980..f4bc7ed2 100644 --- a/core/src/main/java/app/module/core/usecase/daily/record/ports/application/domain/GetDailyRecordCmd.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/ports/application/domain/GetDailyRecordCmd.java @@ -8,6 +8,16 @@ import lombok.Setter; @Setter @AllArgsConstructor public class GetDailyRecordCmd { + public GetDailyRecordCmd(String searchMonth, Integer groupNo, Long householdSeq) { + this.searchMonth = searchMonth; + this.groupNo = groupNo; + this.householdSeq = householdSeq; + } + + public GetDailyRecordCmd(Long dailyRecordSeq) { + this.dailyRecordSeq = dailyRecordSeq; + } + /** * 검색 월(yyyyMM) */ @@ -20,4 +30,8 @@ public class GetDailyRecordCmd { * 임가 일련번호 */ private Long householdSeq; + /** + * 일계부 항목 일련번호 + */ + private Long dailyRecordSeq; } diff --git a/core/src/main/resources/mappers/daily/DailyRecordMapper.xml b/core/src/main/resources/mappers/daily/DailyRecordMapper.xml index fe6caa9d..87d5abd2 100644 --- a/core/src/main/resources/mappers/daily/DailyRecordMapper.xml +++ b/core/src/main/resources/mappers/daily/DailyRecordMapper.xml @@ -8,12 +8,20 @@ , dr.id, dr.record_month, dr.day_group_no, dr.start_date, dr.end_date , dr.all_status, dr.income_status, dr.work_status, dr.expense_status, dr.power_status, dr.forestry_status, dr.farming_status from daily_day_group ddg + left join daily_record dr on dr.day_group_no = ddg.group_no and dr.is_deleted = false and dr.record_month = #{searchMonth} and dr.household_seq = #{householdSeq} where ddg.is_deleted = false and ddg.group_no = #{groupNo} + + + inner join + daily_record dr on dr.day_group_no = ddg.group_no and dr.is_deleted = false + and dr.id = #{dailyRecordSeq} + where ddg.is_deleted = false + diff --git a/front/src/main/resources/mappers/daily/DailyFarmingMapper.xml b/front/src/main/resources/mappers/daily/DailyFarmingMapper.xml index 1b64984c..aa996353 100644 --- a/front/src/main/resources/mappers/daily/DailyFarmingMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyFarmingMapper.xml @@ -11,7 +11,7 @@ where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} order by ds.id desc @@ -23,7 +23,7 @@ where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} diff --git a/front/src/main/resources/mappers/daily/DailyForestryMapper.xml b/front/src/main/resources/mappers/daily/DailyForestryMapper.xml index dc4bbba6..a8a626ca 100644 --- a/front/src/main/resources/mappers/daily/DailyForestryMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyForestryMapper.xml @@ -11,7 +11,7 @@ where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} order by ds.id desc @@ -23,7 +23,7 @@ where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} diff --git a/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml b/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml index 3dca633c..a1383321 100644 --- a/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml @@ -11,7 +11,7 @@ where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} order by ds.id desc @@ -23,7 +23,7 @@ where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} diff --git a/front/src/main/resources/mappers/daily/DailyPowerMapper.xml b/front/src/main/resources/mappers/daily/DailyPowerMapper.xml index 482fb168..50c6b323 100644 --- a/front/src/main/resources/mappers/daily/DailyPowerMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyPowerMapper.xml @@ -10,7 +10,7 @@ where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} order by ds.id desc @@ -22,7 +22,7 @@ where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} diff --git a/front/src/main/resources/mappers/daily/DailyWorkMapper.xml b/front/src/main/resources/mappers/daily/DailyWorkMapper.xml index 19a46e6b..2dd2b588 100644 --- a/front/src/main/resources/mappers/daily/DailyWorkMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyWorkMapper.xml @@ -14,7 +14,7 @@ where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} order by ds.id desc @@ -26,7 +26,7 @@ where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} diff --git a/front/src/main/resources/mappers/userFront/UpdateUserMapper.xml b/front/src/main/resources/mappers/userFront/UpdateUserMapper.xml index 436d59c7..5e1afdf6 100644 --- a/front/src/main/resources/mappers/userFront/UpdateUserMapper.xml +++ b/front/src/main/resources/mappers/userFront/UpdateUserMapper.xml @@ -11,8 +11,8 @@ owner_age = #{ownerAge}, tel = #{tel}, phone = #{phone}, - region_main_code = #{regionMainCode}, region_sub_code = #{regionSubCode}, + region_detail_code = #{regionDetailCode}, address = #{address}, WHERE seq = ${seq} diff --git a/front/src/main/resources/static/ui/commonUtil.js b/front/src/main/resources/static/ui/commonUtil.js index a3051b5b..5650cf54 100644 --- a/front/src/main/resources/static/ui/commonUtil.js +++ b/front/src/main/resources/static/ui/commonUtil.js @@ -258,4 +258,93 @@ $(function() { $el.val($el.val().replace('.', '')); } }) -}) \ No newline at end of file +}) + +/** + * 공통코드 기반의 2단계 셀렉트박스(부모/자식) UI를 구성하는 함수 + * + * @param {Object} codeList - 공통코드 리스트 객체 + * @param {string} parentSelector - 부모 셀렉트박스 셀렉터 (ex. '#regionSubCode') + * @param {string} childSelector - 자식 셀렉트박스 셀렉터 (ex. '#regionDetailCode') + * @param {string} selectedParentCode - 초기 선택할 부모 코드값 (ex. 'code.region.sub.31') + * @param {string} selectedChildCode - 초기 선택할 자식 코드값 (ex. 'code.region.detail.9') + */ +kri.form.setSelectBoxUiCode = function({ + codeList, + parentSelector, + childSelector, + selectedParentCode = '', + selectedChildCode = '' +}) { + const $parent = $(parentSelector); + const $child = $(childSelector); + + if (!codeList?.nodes || !$parent.length || !$child.length) return; + + const renderOptions = ($el, list, selected, inputSelector) => { + let html = ''; + list.forEach(item => { + const isCurrent = item.id === selected ? 'current' : ''; + html += `
  • ${item.codeText}
  • `; + }); + $el.html(html); + + // 항목 클릭 시 hidden input에 값 반영 + $el.find('li.option').off('click').on('click', function () { + const value = $(this).data('value'); + const text = $(this).text(); + + // 표시 텍스트 업데이트 + $el.closest('.component-select').find('.select-txt').text(text); + + // 선택 클래스 처리 + $el.find('li.option').removeClass('current'); + $(this).addClass('current'); + + // hidden input 값 반영 + $el.closest('.component-select').find('input[data-type="select"]').val(value).trigger('change'); + }); + }; + + let childSelectUI = null; + const loadChildren = (parentId, selectedChild = '') => { + if (!parentId) return; + + const $childEl = document.querySelector(childSelector); + if($childEl.ui){ + $childEl.ui.core.destroy(); + } + + const parent = codeList.nodes.find(n => n.id === parentId); + if (!parent?.nodes) return; + + const $childList = $child.find('ul'); + renderOptions($childList, parent.nodes, selectedChild); + + childSelectUI = etUI.components.SelectBox(); + childSelectUI.core.init($childEl, {}) + }; + + // 초기 렌더링 + const $parentList = $parent.find('ul'); + renderOptions($parentList, codeList.nodes, selectedParentCode); + + const $parentEl = document.querySelector(parentSelector); + const parentSelectUI = new etUI.components.SelectBox(); + parentSelectUI.core.init($parentEl, {}); + + if (selectedParentCode) { + loadChildren(selectedParentCode, selectedChildCode); + } + + // 부모 셀렉션 변경 시 자식 재로드 + $parent.find('ul').on('click', 'li.option', function () { + const newParentCode = $(this).data('value'); + loadChildren(newParentCode); + }); + + return { + getParentValue: () => parentSelectUI.getValue(), + getChildValue: () => childSelectUI?.getValue() ?? '' + }; +} \ No newline at end of file diff --git a/front/src/main/resources/templates/info/user/user.html b/front/src/main/resources/templates/info/user/user.html index 5671e4ae..9b71b46e 100644 --- a/front/src/main/resources/templates/info/user/user.html +++ b/front/src/main/resources/templates/info/user/user.html @@ -48,7 +48,7 @@
    - + @@ -130,15 +130,15 @@

    - 도로명 주소 + 주소 *

    -
    - + @@ -152,12 +152,12 @@
      - -
    • option1 -
    • -
      + + + + + +
    @@ -167,29 +167,29 @@
    -
    - +
    + +
    -

    세부지역 선택

    +

    세부 지역 선택

      - -
    • option1 -
    • -
      - + + + + + + +
    @@ -262,6 +262,21 @@