diff --git a/core/src/main/resources/sql/schema/02_create-record.sql b/core/src/main/resources/sql/schema/02_create-record.sql index 4f125edb..d83bfbc9 100644 --- a/core/src/main/resources/sql/schema/02_create-record.sql +++ b/core/src/main/resources/sql/schema/02_create-record.sql @@ -143,6 +143,7 @@ CREATE TABLE daily_income ( daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK) input_type varchar(5), -- 입력 구분(SELF, OCR) is_credit boolean, -- 외상판매 여부 + expense_mark_code varchar(10), -- 지출부호 crop_code varchar(255), -- 재배형태 코드 (매핑코드) category_code varchar(255), -- 수입 종류(매핑코드) category_self varchar(30), -- 수입 종류(직접입력) @@ -169,6 +170,7 @@ COMMENT ON COLUMN daily_income.id IS '일계부 수입 ID'; COMMENT ON COLUMN daily_income.daily_record_seq IS '일계부 작성상태 일련번호'; COMMENT ON COLUMN daily_income.input_type IS '입력 구분(SELF, OCR)'; COMMENT ON COLUMN daily_income.is_credit IS '외상판매 여부'; +COMMENT ON COLUMN daily_income.expense_mark_code IS '지출부호'; COMMENT ON COLUMN daily_income.crop_code IS '재배형태 코드 (매핑코드)'; COMMENT ON COLUMN daily_income.category_code IS '수입 종류(매핑코드)'; COMMENT ON COLUMN daily_income.category_self IS '수입 종류(직접입력)'; @@ -195,9 +197,9 @@ CREATE SEQUENCE daily_expense_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; CREATE TABLE daily_expense ( id bigint DEFAULT nextval('daily_expense_seq') NOT NULL, -- 일계부 지출 ID daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK) - input_type varchar(5), -- 입력 구분(SELF, OCR) + input_type varchar(5), -- 입력 구분(SELF, OCR) is_credit boolean, -- 외상판매 여부 - crop_code varchar(255), -- 재배형태 코드 (매핑코드) + income_mark_code varchar(10), -- 수입부호 TODO : 수입종류와 다른것인지 판단 필요. 일단 다르다는 전제조건으로 생성 category_code varchar(255), -- 수입 종류(매핑코드) category_self varchar(30), -- 수입 종류(직접입력) source_purpose varchar(10), -- 수입원(용도) @@ -223,7 +225,7 @@ COMMENT ON COLUMN daily_expense.id IS '일계부 지출 ID'; COMMENT ON COLUMN daily_expense.daily_record_seq IS '일계부 작성상태 일련번호'; COMMENT ON COLUMN daily_expense.input_type IS '입력 구분(SELF, OCR)'; COMMENT ON COLUMN daily_expense.is_credit IS '외상판매 여부'; -COMMENT ON COLUMN daily_expense.crop_code IS '재배형태 코드 (매핑코드)'; +COMMENT ON COLUMN daily_expense.income_mark_code IS '수입부호'; COMMENT ON COLUMN daily_expense.category_code IS '지출 종류(매핑코드)'; COMMENT ON COLUMN daily_expense.category_self IS '지출 종류(직접입력)'; COMMENT ON COLUMN daily_expense.source_purpose IS '지출원(용도)'; diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/persistence/DailyExpenseMapper.java b/front/src/main/java/app/module/front/usecase/daily/expense/persistence/DailyExpenseMapper.java new file mode 100644 index 00000000..377aed59 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/expense/persistence/DailyExpenseMapper.java @@ -0,0 +1,49 @@ +package app.module.front.usecase.daily.expense.persistence; + +import app.module.front.usecase.daily.expense.persistence.model.CreateDailyExpenseCmd; +import app.module.front.usecase.daily.expense.persistence.model.DailyExpenseDto; +import app.module.front.usecase.daily.expense.persistence.model.RemoveDailyExpenseCmd; +import app.module.front.usecase.daily.expense.web.model.DailyExpenseUIReqVO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface DailyExpenseMapper { + /** + * 일계부 지출 목록 조회 + * + * @param reqVO 검색 조건 + * @return 수입 목록 + */ + List getDailyExpenseList(DailyExpenseUIReqVO reqVO); + + /** + * 일계부 지출 데이터 존재 여부 + * + * @param reqVO 검색 조건 + * @return 중복 개수 + */ + Integer getRecordExistCount(DailyExpenseUIReqVO reqVO); + + /** + * 일계부 지출 등록 + * + * @param command 등록 데이터 + */ + void createDailyExpense(CreateDailyExpenseCmd command); + + /** + * 일계부 지출 수정 + * + * @param command 수정 데이터 + */ + void updateDailyExpense(CreateDailyExpenseCmd command); + + /** + * 일계부 지출 삭제 + * + * @param command 삭제 데이터 + */ + void removeDailyExpense(RemoveDailyExpenseCmd command); +} diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/persistence/model/CreateDailyExpenseCmd.java b/front/src/main/java/app/module/front/usecase/daily/expense/persistence/model/CreateDailyExpenseCmd.java new file mode 100644 index 00000000..530cba85 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/expense/persistence/model/CreateDailyExpenseCmd.java @@ -0,0 +1,26 @@ +package app.module.front.usecase.daily.expense.persistence.model; + +import app.module.front.config.adapters.persistence.component.FrontAuditCommand; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@AllArgsConstructor +@ToString +public class CreateDailyExpenseCmd extends FrontAuditCommand { + private Long id; + private Long dailyRecordSeq; + private String inputType; + private Boolean credit; + private String incomeMarkCode; + private String categoryCode; + private String categorySelf; + private String sourcePurpose; + private Integer quantity; + private String unitCode; + private Integer price; + private Integer estimatedValue; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/persistence/model/DailyExpenseDto.java b/front/src/main/java/app/module/front/usecase/daily/expense/persistence/model/DailyExpenseDto.java new file mode 100644 index 00000000..d80e0572 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/expense/persistence/model/DailyExpenseDto.java @@ -0,0 +1,31 @@ +package app.module.front.usecase.daily.expense.persistence.model; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class DailyExpenseDto { + private Long id; + private Long dailyRecordSeq; + // TODO : SELF, OCR + private String inputType; + private Boolean credit; + private String categoryCode; + private String categoryLabel; + private String categorySelf; + private String sourcePurpose; + private Integer quantity; + private String unitCode; + private String unitLabel; + private Integer price; + private Integer estimatedValue; + + /** + * 수정 가능 여부 + * @return true=가능, false=불가능(등록 상태) + */ + public boolean isUpdated() { + return this.id != null && this.id != 0L; + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/persistence/model/RemoveDailyExpenseCmd.java b/front/src/main/java/app/module/front/usecase/daily/expense/persistence/model/RemoveDailyExpenseCmd.java new file mode 100644 index 00000000..ad6e749f --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/expense/persistence/model/RemoveDailyExpenseCmd.java @@ -0,0 +1,18 @@ +package app.module.front.usecase.daily.expense.persistence.model; + +import app.module.front.config.adapters.persistence.component.FrontAuditCommand; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@AllArgsConstructor +@ToString +public class RemoveDailyExpenseCmd extends FrontAuditCommand { + private String searchMonth; + private Integer groupNo; + private Long id; + private Long dailyRecordSeq; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/service/DailyExpenseService.java b/front/src/main/java/app/module/front/usecase/daily/expense/service/DailyExpenseService.java new file mode 100644 index 00000000..90f8f31a --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/expense/service/DailyExpenseService.java @@ -0,0 +1,40 @@ +package app.module.front.usecase.daily.expense.service; + +import app.module.front.usecase.daily.expense.persistence.model.DailyExpenseDto; +import app.module.front.usecase.daily.expense.web.model.CreateDailyExpenseReqVO; +import app.module.front.usecase.daily.expense.web.model.DailyExpenseUIReqVO; +import app.module.front.usecase.daily.expense.web.model.RemoveDailyExpenseReqVO; + +import java.util.List; + +public interface DailyExpenseService { + /** + * 일계부 수입 목록 조회 + * + * @param reqVO 검색 조건 + * @return + */ + List getDailyExpenseList(DailyExpenseUIReqVO reqVO); + + /** + * 일계부 수입 조회 + * + * @param reqVO 검색 조건 + * @return + */ + DailyExpenseDto getDailyExpense(DailyExpenseUIReqVO reqVO); + + /** + * 일계부 수입 등록 + * + * @param formVO 입력 데이터 + */ + void create(CreateDailyExpenseReqVO formVO); + + /** + * 일계부 수입 삭제 + * + * @param formVO 삭제 검색 조건 + */ + void remove(RemoveDailyExpenseReqVO formVO); +} diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/service/DailyExpenseServiceImpl.java b/front/src/main/java/app/module/front/usecase/daily/expense/service/DailyExpenseServiceImpl.java new file mode 100644 index 00000000..5307aabc --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/expense/service/DailyExpenseServiceImpl.java @@ -0,0 +1,124 @@ +package app.module.front.usecase.daily.expense.service; + +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; +import app.module.front.config.application.util.AuditUtil; +import app.module.front.usecase.daily.expense.persistence.DailyExpenseMapper; +import app.module.front.usecase.daily.expense.persistence.model.CreateDailyExpenseCmd; +import app.module.front.usecase.daily.expense.persistence.model.DailyExpenseDto; +import app.module.front.usecase.daily.expense.persistence.model.RemoveDailyExpenseCmd; +import app.module.front.usecase.daily.expense.web.model.CreateDailyExpenseReqVO; +import app.module.front.usecase.daily.expense.web.model.DailyExpenseUIReqVO; +import app.module.front.usecase.daily.expense.web.model.RemoveDailyExpenseReqVO; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Slf4j +@Service +@RequiredArgsConstructor +public class DailyExpenseServiceImpl implements DailyExpenseService { + private final UICodeListPortIn uiCodeListPortIn; + private final DailyExpenseMapper DailyExpenseMapper; + + @Override + public List getDailyExpenseList(DailyExpenseUIReqVO reqVO) { + return this.getRefineIncomeList(reqVO); + } + + @Override + public DailyExpenseDto getDailyExpense(DailyExpenseUIReqVO reqVO) { + List list = this.getRefineIncomeList(reqVO); + if (list.isEmpty()) { + return null; + } + + return list.get(0); + } + + private List getRefineIncomeList(DailyExpenseUIReqVO reqVO) { + List list = DailyExpenseMapper.getDailyExpenseList(reqVO); + + List recordIncome = uiCodeListPortIn.connect("code.record.expense"); + List recordUnit = uiCodeListPortIn.connect("code.record.unit"); + + for (DailyExpenseDto dto : list) { + dto.setCategoryLabel(this.getCodeLabel(dto.getCategoryCode(), recordIncome)); + dto.setUnitLabel(this.getCodeLabel(dto.getUnitCode(), recordUnit)); + } + + return list; + } + + /** + * 코드명 조회 + * @param code 코드 + * @param codeList 공통 코드 목록 + * @return + */ + private String getCodeLabel(String code, List codeList) { + String returnValue = null; + for (UICodeElement codeSetup : codeList) { + if (codeSetup.getCodeValue().equalsIgnoreCase(code)) { + returnValue = codeSetup.getCodeText(); + break; + } + } + return returnValue; + } + + @Override + public void create(CreateDailyExpenseReqVO formVO) { + CreateDailyExpenseCmd command = AuditUtil.create( + new CreateDailyExpenseCmd( + formVO.getId(), + formVO.getDailyRecordSeq(), + formVO.getInputType(), + formVO.getCredit(), + (formVO.getCredit() ? "52210" : null), // [정책] 외상판매 Y 일 경우 수입부호 52210 적재 + formVO.getCategoryCode(), + formVO.getCategorySelf(), + formVO.getSourcePurpose(), + formVO.getQuantity(), + formVO.getUnitCode(), + formVO.getPrice(), + formVO.getEstimatedValue())); + + DailyExpenseUIReqVO existReqVO = new DailyExpenseUIReqVO(formVO.getSearchMonth(), formVO.getGroupNo()); + existReqVO.setId(formVO.getId()); + + Integer existCount = DailyExpenseMapper.getRecordExistCount(existReqVO); + if (existCount == 0) { + DailyExpenseMapper.createDailyExpense(command); + + log.debug("[CreateDailyExpense] record={}", command); + } else { + DailyExpenseMapper.updateDailyExpense(command); + + log.debug("[UpdateDailyExpense] record={}", command); + } + } + + @Override + public void remove(RemoveDailyExpenseReqVO formVO) { + Long id = formVO.getId() != null ? Long.parseLong(formVO.getId()) : null; + RemoveDailyExpenseCmd command = AuditUtil.delete( + new RemoveDailyExpenseCmd( + formVO.getSearchMonth(), + formVO.getGroupNo(), + id, + formVO.getDailyRecordSeq())); + + DailyExpenseUIReqVO existReqVO = new DailyExpenseUIReqVO(formVO.getSearchMonth(), formVO.getGroupNo()); + existReqVO.setId(id); + + Integer existCount = DailyExpenseMapper.getRecordExistCount(existReqVO); + if (existCount != 0) { + DailyExpenseMapper.removeDailyExpense(command); + + log.debug("[RemoveDailyExpense] record={}", command); + } + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/web/DailyExpenseController.java b/front/src/main/java/app/module/front/usecase/daily/expense/web/DailyExpenseController.java new file mode 100644 index 00000000..889061a9 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/expense/web/DailyExpenseController.java @@ -0,0 +1,135 @@ +package app.module.front.usecase.daily.expense.web; + +import app.module.core.config.application.exception.NoRecordDataException; +import app.module.core.config.application.util.CoreUtil; +import app.module.front.usecase.daily.expense.service.DailyExpenseService; +import app.module.front.usecase.daily.expense.web.model.CreateDailyExpenseReqVO; +import app.module.front.usecase.daily.expense.web.model.RemoveDailyExpenseReqVO; +import app.module.front.usecase.daily.expense.web.validator.CreateDailyExpenseValidator; +import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto; +import app.module.front.usecase.daily.record.service.DailyRecordService; +import app.module.front.usecase.daily.record.web.model.DailyRecordUIReqVO; +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/record/expense") +public class DailyExpenseController { + private final CoreUtil coreUtil; + private final DailyRecordService dailyRecordService; + private final DailyExpenseService DailyExpenseService; + private final CreateDailyExpenseValidator createDailyExpenseValidator; + + /** + * 일계부 지출 등록 처리 + * + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @param id 수입 일련번호 + * @param formVO 입력 데이터 + * @param bindingResult BindingResult + * @return + */ + @PostMapping(path = "/{searchMonth}/{groupNo}/form/{id}") + ResponseEntity create(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo + , @PathVariable("id") String id + , @Valid @RequestBody CreateDailyExpenseReqVO formVO, BindingResult bindingResult) { + + createDailyExpenseValidator.validate(formVO, bindingResult); + if (bindingResult.hasErrors()) { + return coreUtil.getErrorInfo(bindingResult); + } + + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); + + formVO.setSearchMonth(searchMonth); + formVO.setGroupNo(Integer.parseInt(groupNo)); + formVO.setId(Long.parseLong(id)); + formVO.setDailyRecordSeq(dailyRecord.getId()); + log.debug("formVO: {}", formVO); + + DailyExpenseService.create(formVO); + + return ResponseEntity.status(HttpStatus.OK).body(formVO); + } + + /** + * 일계부 지출 삭제 처리 + * + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @param formVO 입력 데이터 + * @param bindingResult BindingResult + * @return + */ + @PostMapping(path = "/{searchMonth}/{groupNo}/remove") + ResponseEntity remove(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo + , @Valid @RequestBody RemoveDailyExpenseReqVO formVO, BindingResult bindingResult) { + + log.debug("before formVO: {}", formVO); + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getFieldErrors()); + } + + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); + + formVO.setSearchMonth(dailyRecord.getRecordMonth()); + formVO.setGroupNo(dailyRecord.getGroupNo()); + formVO.setDailyRecordSeq(dailyRecord.getId()); + log.debug("formVO: {}", formVO); + + DailyExpenseService.remove(formVO); + + return ResponseEntity.status(HttpStatus.OK).body(formVO); + } + + /** + * 일계부 지출 전체 삭제 처리 + * + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @return + */ + @PostMapping(path = "/{searchMonth}/{groupNo}/reset") + ResponseEntity removeAll(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo) { + + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); + + RemoveDailyExpenseReqVO formVO = new RemoveDailyExpenseReqVO(); + formVO.setSearchMonth(dailyRecord.getRecordMonth()); + formVO.setGroupNo(dailyRecord.getGroupNo()); + formVO.setDailyRecordSeq(dailyRecord.getId()); + log.debug("formVO: {}", formVO); + + DailyExpenseService.remove(formVO); + + return ResponseEntity.status(HttpStatus.OK).body(formVO); + } + + /** + * 일계부 유효성 체크 및 데이터 조회 + * + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @return + */ + private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) { + DailyRecordUIReqVO reqVO = new DailyRecordUIReqVO(searchMonth, groupNo); + log.debug("getRecordUIReq: {}", reqVO); + + DailyRecordDto dailyRecord = dailyRecordService.getDailyRecord(reqVO); + if (dailyRecord == null || dailyRecord.getId() == null) { + throw new NoRecordDataException(); + } + + return dailyRecord; + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/web/DailyExpenseUIController.java b/front/src/main/java/app/module/front/usecase/daily/expense/web/DailyExpenseUIController.java new file mode 100644 index 00000000..244f4e89 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/expense/web/DailyExpenseUIController.java @@ -0,0 +1,113 @@ +package app.module.front.usecase.daily.expense.web; + +import app.module.core.config.application.exception.NoRecordDataException; +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import app.module.front.usecase.daily.expense.persistence.model.DailyExpenseDto; +import app.module.front.usecase.daily.expense.service.DailyExpenseService; +import app.module.front.usecase.daily.expense.web.model.DailyExpenseUIReqVO; +import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto; +import app.module.front.usecase.daily.record.service.DailyRecordService; +import app.module.front.usecase.daily.record.web.model.DailyRecordUIReqVO; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.thymeleaf.util.StringUtils; + +import java.util.List; + +@Slf4j +@Controller +@RequiredArgsConstructor +@RequestMapping(path = "/record/expense") +public class DailyExpenseUIController { + private final UICodeListPortIn uiCodeListPortIn; + private final DailyRecordService dailyRecordService; + private final DailyExpenseService DailyExpenseService; + + /** + * 일계부 지출 목록 화면 + * + * @param model Model + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @return + */ + @GetMapping(path = "/{searchMonth}/{groupNo}") + public String index(Model model, @PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo) { + + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); + + DailyExpenseUIReqVO reqVO = new DailyExpenseUIReqVO(searchMonth, groupNo); + log.debug("reqVO: {}", reqVO); + + List expenseList = DailyExpenseService.getDailyExpenseList(reqVO); + + model.addAttribute("reqVO", reqVO); + model.addAttribute("dailyRecord", dailyRecord); + model.addAttribute("expenseList", expenseList); + + return "record/expense/index"; + } + + /** + * 일계부 지출 등록 화면 + * + * @param model Model + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @param id 수입 일련번호 + * @return + */ + @GetMapping(path = "/{searchMonth}/{groupNo}/form/{id}") + public String formBySelf(Model model, @PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo + , @PathVariable("id") String id) { + + DailyExpenseUIReqVO reqVO = new DailyExpenseUIReqVO(searchMonth, groupNo); + if (StringUtils.isEmpty(id)) { + reqVO.setId(0L); + } else { + reqVO.setId(Long.parseLong(id)); + } + log.debug("reqVO: {}", reqVO); + + DailyExpenseDto detail = new DailyExpenseDto(); + if (reqVO.getId() != 0L) { + detail = DailyExpenseService.getDailyExpense(reqVO); + if (detail == null || !detail.isUpdated()) { + throw new NoRecordDataException(); + } + } + + model.addAttribute("recordExpense", uiCodeListPortIn.connect("code.record.expense")); + model.addAttribute("recordCrop", uiCodeListPortIn.connect("code.record.crop")); + model.addAttribute("recordUnit", uiCodeListPortIn.connect("code.record.unit")); + + model.addAttribute("reqVO", reqVO); + model.addAttribute("detail", detail); + + return "record/expense/form"; + } + + /** + * 일계부 유효성 체크 및 데이터 조회 + * + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @return + */ + private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) { + DailyRecordUIReqVO reqVO = new DailyRecordUIReqVO(searchMonth, groupNo); + log.debug("getRecordUIReq: {}", reqVO); + + DailyRecordDto dailyRecord = dailyRecordService.getDailyRecord(reqVO); + if (dailyRecord == null || dailyRecord.getId() == null) { + throw new NoRecordDataException(); + } + + return dailyRecord; + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/web/model/CreateDailyExpenseReqVO.java b/front/src/main/java/app/module/front/usecase/daily/expense/web/model/CreateDailyExpenseReqVO.java new file mode 100644 index 00000000..98cfa541 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/expense/web/model/CreateDailyExpenseReqVO.java @@ -0,0 +1,59 @@ +package app.module.front.usecase.daily.expense.web.model; + +import app.module.front.usecase.daily.record.web.model.DailyUIReqVO; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString(callSuper = true) +public class CreateDailyExpenseReqVO extends DailyUIReqVO { + /** + * 수입 일련번호 + */ + private Long id; + /** + * 일계부 일련번호 + */ + private Long dailyRecordSeq; + /** + * 등록 유형(SELF, OCR) + */ + private String inputType; + /** + * 외상판매 여부 + */ + private Boolean credit; + /** + * 지출의 종류 코드 + */ + @NotBlank(message = "지출 종류를 선택해 주세요.") + private String categoryCode; + /** + * 지출의 종류 직접입력 + */ + private String categorySelf; + /** + * 용도 + */ + @NotBlank(message = "용도를 입력해 주세요.") + private String sourcePurpose; + /** + * 수량 + */ + private Integer quantity; + /** + * 단위 코드 + */ + private String unitCode; + /** + * 현금 + */ + private Integer price; + /** + * 현물평가액 + */ + private Integer estimatedValue; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/web/model/DailyExpenseUIReqVO.java b/front/src/main/java/app/module/front/usecase/daily/expense/web/model/DailyExpenseUIReqVO.java new file mode 100644 index 00000000..72e90e16 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/expense/web/model/DailyExpenseUIReqVO.java @@ -0,0 +1,29 @@ +package app.module.front.usecase.daily.expense.web.model; + +import app.module.front.usecase.daily.record.web.model.DailyUIReqVO; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import org.apache.tika.utils.StringUtils; + +@Getter +@Setter +@ToString(callSuper = true) +public class DailyExpenseUIReqVO extends DailyUIReqVO { + public DailyExpenseUIReqVO(String month, String no) { + setSearchMonth(month); + if (!StringUtils.isBlank(no)) { + setGroupNo(Integer.parseInt(no)); + } + } + + public DailyExpenseUIReqVO(String month, Integer no) { + setSearchMonth(month); + setGroupNo(no); + } + + /** + * 수입 일련번호 + */ + private Long id; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/web/model/RemoveDailyExpenseReqVO.java b/front/src/main/java/app/module/front/usecase/daily/expense/web/model/RemoveDailyExpenseReqVO.java new file mode 100644 index 00000000..16bb8b6b --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/expense/web/model/RemoveDailyExpenseReqVO.java @@ -0,0 +1,22 @@ +package app.module.front.usecase.daily.expense.web.model; + +import app.module.front.usecase.daily.record.web.model.DailyUIReqVO; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString(callSuper = true) +public class RemoveDailyExpenseReqVO extends DailyUIReqVO { + /** + * 수입 일련번호 + */ + @NotBlank(message = "{valid.common.required}") + private String id; + /** + * 일계부 일련번호 + */ + private Long dailyRecordSeq; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/web/validator/CreateDailyExpenseValidator.java b/front/src/main/java/app/module/front/usecase/daily/expense/web/validator/CreateDailyExpenseValidator.java new file mode 100644 index 00000000..bcddce87 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/expense/web/validator/CreateDailyExpenseValidator.java @@ -0,0 +1,44 @@ +package app.module.front.usecase.daily.expense.web.validator; + +import app.module.front.usecase.daily.expense.web.model.CreateDailyExpenseReqVO; +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 CreateDailyExpenseValidator implements Validator { + + @Override + public boolean supports(Class clazz) { + return CreateDailyExpenseReqVO.class.equals(clazz); + } + + @Override + public void validate(Object target, Errors errors) { + CreateDailyExpenseReqVO vo = (CreateDailyExpenseReqVO) target; + + if (StringUtils.isBlank(vo.getCategoryCode())) { + errors.rejectValue( + "categoryCode", "valid.common.required", + "지출 종류를 선택해 주세요."); + } + + if ("SELF".equals(vo.getCategoryCode()) && StringUtils.isBlank(vo.getCategorySelf())) { + errors.rejectValue( + "categorySelf", "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/front/src/main/java/app/module/front/usecase/daily/income/persistence/DailyIncomeMapper.java b/front/src/main/java/app/module/front/usecase/daily/income/persistence/DailyIncomeMapper.java index 770431ac..a54a0de4 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/persistence/DailyIncomeMapper.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/persistence/DailyIncomeMapper.java @@ -11,42 +11,39 @@ import java.util.List; @Mapper public interface DailyIncomeMapper { /** - * 수입내역 목록 조회 + * 일계부 수입 목록 조회 * - * @param reqVO - * @return + * @param reqVO 검색 조건 + * @return 수입 목록 */ List getDailyIncomeList(DailyIncomeUIReqVO reqVO); /** - * 수입내역 데이터 존재 여부 + * 일계부 수입 데이터 존재 여부 * - * @param reqVO - * @return + * @param reqVO 검색 조건 + * @return 중복 개수 */ Integer getRecordExistCount(DailyIncomeUIReqVO reqVO); /** - * 수입내역 등록 + * 일계부 수입 등록 * - * @param command - * @return + * @param command 등록 데이터 */ void createDailyIncome(CreateDailyIncomeCmd command); /** - * 수입내역 수정 + * 일계부 수입 수정 * - * @param command - * @return + * @param command 수정 데이터 */ - int updateDailyIncome(CreateDailyIncomeCmd command); + void updateDailyIncome(CreateDailyIncomeCmd command); /** - * 수입내역 삭제 + * 일계부 수입 삭제 * - * @param command - * @return + * @param command 삭제 데이터 */ - int removeDailyIncome(RemoveDailyIncomeCmd command); + void removeDailyIncome(RemoveDailyIncomeCmd command); } diff --git a/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/CreateDailyIncomeCmd.java b/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/CreateDailyIncomeCmd.java index 472d0314..9128fed2 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/CreateDailyIncomeCmd.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/CreateDailyIncomeCmd.java @@ -14,15 +14,13 @@ import lombok.ToString; public class CreateDailyIncomeCmd extends FrontAuditCommand { private Long id; private Long dailyRecordSeq; - // SELF, OCR private String inputType; private Boolean credit; private String cropCode; - // TODO : 수입종류의 코드맵핑 여부 판단 + private String expenseMarkCode; private String categoryCode; private String categorySelf; private String sourcePurpose; - // TODO : 데이터 타입 재정의 여부 private Integer quantity; private String unitCode; private Integer price; diff --git a/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/DailyIncomeDto.java b/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/DailyIncomeDto.java index c08050af..239a2814 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/DailyIncomeDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/DailyIncomeDto.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; public class DailyIncomeDto { private Long id; private Long dailyRecordSeq; - // SELF, OCR + // TODO : SELF, OCR private String inputType; private Boolean credit; private String cropCode; @@ -25,7 +25,11 @@ public class DailyIncomeDto { private Integer price; private Integer estimatedValue; + /** + * 수정 가능 여부 + * @return true=가능, false=불가능(등록 상태) + */ public boolean isUpdated() { - return this.id != null; + return this.id != null && this.id != 0L; } } diff --git a/front/src/main/java/app/module/front/usecase/daily/income/service/DailyIncomeService.java b/front/src/main/java/app/module/front/usecase/daily/income/service/DailyIncomeService.java index b9654739..5415034d 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/service/DailyIncomeService.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/service/DailyIncomeService.java @@ -9,7 +9,7 @@ import java.util.List; public interface DailyIncomeService { /** - * 수입내역 목록 조회 + * 일계부 수입 목록 조회 * * @param reqVO 검색 조건 * @return @@ -17,7 +17,7 @@ public interface DailyIncomeService { List getDailyIncomeList(DailyIncomeUIReqVO reqVO); /** - * 수입내역 조회 + * 일계부 수입 조회 * * @param reqVO 검색 조건 * @return @@ -25,16 +25,16 @@ public interface DailyIncomeService { DailyIncomeDto getDailyIncome(DailyIncomeUIReqVO reqVO); /** - * 수입내역 등록 + * 일계부 수입 등록 * - * @param formVO 등록 데이터 + * @param formVO 입력 데이터 */ void create(CreateDailyIncomeReqVO formVO); /** - * 수입내역 삭제 + * 일계부 수입 삭제 * - * @param formVO 검색 조건 + * @param formVO 삭제 검색 조건 */ void remove(RemoveDailyIncomeReqVO formVO); } diff --git a/front/src/main/java/app/module/front/usecase/daily/income/service/DailyIncomeServiceImpl.java b/front/src/main/java/app/module/front/usecase/daily/income/service/DailyIncomeServiceImpl.java index f176588a..ff2d1833 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/service/DailyIncomeServiceImpl.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/service/DailyIncomeServiceImpl.java @@ -80,6 +80,7 @@ public class DailyIncomeServiceImpl implements DailyIncomeService { formVO.getInputType(), formVO.getCredit(), formVO.getCropCode(), + (formVO.getCredit() ? "91206" : null), // [정책] 외상판매 Y 일 경우 지출부호 91206 적재 formVO.getCategoryCode(), formVO.getCategorySelf(), formVO.getSourcePurpose(), diff --git a/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java b/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java index 28a75a9c..6fff3ed9 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java @@ -23,19 +23,19 @@ import org.springframework.web.bind.annotation.*; @RequiredArgsConstructor @RequestMapping(path = "/api/record/income") public class DailyIncomeController { + private final CoreUtil coreUtil; private final DailyRecordService dailyRecordService; private final DailyIncomeService dailyIncomeService; private final CreateDailyIncomeValidator createDailyIncomeValidator; - private final CoreUtil coreUtil; /** - * 일계부 수입내역 등록 처리 + * 일계부 수입 등록 처리 * - * @param searchMonth - * @param groupNo - * @param id - * @param formVO - * @param bindingResult + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @param id 수입 일련번호 + * @param formVO 입력 데이터 + * @param bindingResult BindingResult * @return */ @PostMapping(path = "/{searchMonth}/{groupNo}/form/{id}") @@ -45,8 +45,6 @@ public class DailyIncomeController { createDailyIncomeValidator.validate(formVO, bindingResult); if (bindingResult.hasErrors()) { -// return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) -// .body(bindingResult.getFieldErrors()); return coreUtil.getErrorInfo(bindingResult); } @@ -63,43 +61,27 @@ public class DailyIncomeController { return ResponseEntity.status(HttpStatus.OK).body(formVO); } - @PostMapping(path = "/{searchMonth}/{groupNo}/none") - ResponseEntity updateByTodayNone(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo) { - - DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); - - RemoveDailyIncomeReqVO formVO = new RemoveDailyIncomeReqVO(); - formVO.setSearchMonth(dailyRecord.getRecordMonth()); - formVO.setGroupNo(dailyRecord.getGroupNo()); - formVO.setDailyRecordSeq(dailyRecord.getId()); - log.debug("formVO: {}", formVO); - - dailyRecordService.updateDailyRecordStatus(dailyRecord.getRecordMonth(), dailyRecord.getGroupNo(), - "INCOME", DailyTargetStatus.TODAY_NONE.name()); - - return ResponseEntity.status(HttpStatus.OK).body(null); - } - /** - * 일계부 수입내역 삭제 처리 + * 일계부 수입 삭제 처리 * - * @param searchMonth - * @param groupNo - * @param formVO - * @param bindingResult + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @param formVO 입력 데이터 + * @param bindingResult BindingResult * @return */ @PostMapping(path = "/{searchMonth}/{groupNo}/remove") ResponseEntity remove(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo , @Valid @RequestBody RemoveDailyIncomeReqVO formVO, BindingResult bindingResult) { - log.debug("formVO: {}", formVO); + log.debug("before formVO: {}", formVO); if (bindingResult.hasErrors()) { return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) .body(bindingResult.getFieldErrors()); } DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); + formVO.setSearchMonth(dailyRecord.getRecordMonth()); formVO.setGroupNo(dailyRecord.getGroupNo()); formVO.setDailyRecordSeq(dailyRecord.getId()); @@ -111,10 +93,10 @@ public class DailyIncomeController { } /** - * 일계부 수입내역 전체 삭제 처리 + * 일계부 수입 전체 삭제 처리 * - * @param searchMonth - * @param groupNo + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 * @return */ @PostMapping(path = "/{searchMonth}/{groupNo}/reset") @@ -136,8 +118,8 @@ public class DailyIncomeController { /** * 일계부 유효성 체크 및 데이터 조회 * - * @param searchMonth - * @param groupNo + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 * @return */ private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) { diff --git a/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeUIController.java b/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeUIController.java index 474bdf30..0871c772 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeUIController.java @@ -27,7 +27,7 @@ public class DailyIncomeUIController { private final DailyIncomeService dailyIncomeService; /** - * 일계부 수입내역 목록 화면 + * 일계부 수입 목록 화면 * * @param model Model * @param searchMonth 검색 월(yyyyMM) @@ -52,12 +52,12 @@ public class DailyIncomeUIController { } /** - * 일계부 수입내역 등록 화면 + * 일계부 수입 등록 화면 * - * @param model - * @param searchMonth - * @param groupNo - * @param id + * @param model Model + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @param id 수입 일련번호 * @return */ @GetMapping(path = "/{searchMonth}/{groupNo}/form/{id}") @@ -93,8 +93,8 @@ public class DailyIncomeUIController { /** * 일계부 유효성 체크 및 데이터 조회 * - * @param searchMonth - * @param groupNo + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 * @return */ private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) { diff --git a/front/src/main/java/app/module/front/usecase/daily/income/web/validator/CreateDailyIncomeValidator.java b/front/src/main/java/app/module/front/usecase/daily/income/web/validator/CreateDailyIncomeValidator.java index 545ff485..7f632e69 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/web/validator/CreateDailyIncomeValidator.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/web/validator/CreateDailyIncomeValidator.java @@ -13,7 +13,6 @@ import org.springframework.validation.Validator; @Component @RequiredArgsConstructor public class CreateDailyIncomeValidator implements Validator { - private final MessageUtil messageUtil; @Override public boolean supports(Class clazz) { @@ -27,7 +26,7 @@ public class CreateDailyIncomeValidator implements Validator { if (StringUtils.isBlank(vo.getCategoryCode())) { errors.rejectValue( "categoryCode", "valid.common.required", - "수입 종류를 입력해 주세요."); + "수입 종류를 선택해 주세요."); } if ("SELF".equals(vo.getCategoryCode()) && StringUtils.isBlank(vo.getCategorySelf())) { @@ -44,7 +43,5 @@ public class CreateDailyIncomeValidator implements Validator { "estimatedValue", "valid.common.required", "현금 또는 현물평가액을 입력 해주세요."); } - - // TODO : valid } } diff --git a/front/src/main/java/app/module/front/usecase/daily/record/persistence/DailyRecordMapper.java b/front/src/main/java/app/module/front/usecase/daily/record/persistence/DailyRecordMapper.java index ad14e383..dc05c233 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/persistence/DailyRecordMapper.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/persistence/DailyRecordMapper.java @@ -12,7 +12,7 @@ public interface DailyRecordMapper { DailyRecordDto getDailyRecord(DailyRecordUIReqVO reqVO); /** - * 일계부 등록 여부 + * 일계부 항목 등록 여부 * * @param reqVO * @return @@ -20,14 +20,21 @@ public interface DailyRecordMapper { Integer getDailyRecordExistCount(DailyRecordUIReqVO reqVO); /** - * 일계부 등록(생성) + * 일계부 항목 등록(생성) * * @param command */ void createDailyRecord(CreateDailyRecordCmd command); /** - * 일계부 상태 수정 + * 일계부 항목 수정 + * + * @param command + */ + void updateDailyRecord(CreateDailyRecordCmd command); + + /** + * 일계부 항목의 상태 수정 * * @param command * @return diff --git a/front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordServiceImpl.java b/front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordServiceImpl.java index d9cf1622..c47dd355 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordServiceImpl.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordServiceImpl.java @@ -66,6 +66,9 @@ public class DailyRecordServiceImpl implements DailyRecordService { log.debug("[CreateDailyRecord] record={}", command); } else { + // TODO : NONE 으로 변경시 연관 테이블 데이터 삭제할 것인가? + dailyRecordMapper.updateDailyRecord(command); + log.warn("[DailyRecordCreate] existCount={}, recordMonth={}, dayGroupNo={}", existCount, reqVO.getRecordMonth(), reqVO.getDayGroupNo()); } } diff --git a/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyTargetStatus.java b/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyTargetStatus.java index 2f3c35d9..0521cd27 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyTargetStatus.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyTargetStatus.java @@ -13,9 +13,9 @@ public enum DailyTargetStatus { * 등록 없음 */ NONE, - /** - * 등록 완료 - */ - DONE, +// /** +// * 등록 완료 +// */ +// DONE, ; } diff --git a/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml b/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml new file mode 100644 index 00000000..250daf14 --- /dev/null +++ b/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + insert into daily_expense ( + daily_record_seq, input_type, is_credit, income_mark_code, category_code, category_self, source_purpose + , quantity, unit_code, price, estimated_value + , is_deleted + , + ) values ( + #{dailyRecordSeq} + , #{inputType}, #{credit}, #{incomeMarkCode}, #{categoryCode}, #{categorySelf}, #{sourcePurpose} + , #{quantity}, #{unitCode}, #{price}, #{estimatedValue} + , false + , + ) + + + + update daily_expense set + , is_credit = #{credit} + , income_mark_code = #{incomeMarkCode} + , category_code = #{categoryCode} + , category_self = #{categorySelf} + , source_purpose = #{sourcePurpose} + , quantity = #{quantity} + , unit_code = #{unitCode} + , price = #{price} + , estimated_value = #{estimatedValue} + where is_deleted = false + and daily_record_seq = #{dailyRecordSeq} + and id = #{id} + + + + update daily_expense set + + where is_deleted = false + and daily_record_seq = #{dailyRecordSeq} + + and id = #{id} + + + + diff --git a/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml b/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml index 4f2b593e..47d9208f 100644 --- a/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml @@ -29,13 +29,13 @@ insert into daily_income ( - daily_record_seq, input_type, is_credit, crop_code, category_code, category_self, source_purpose + daily_record_seq, input_type, is_credit, expense_mark_code, crop_code, category_code, category_self, source_purpose , quantity, unit_code, price, estimated_value , is_deleted , ) values ( #{dailyRecordSeq} - , #{inputType}, #{credit}, #{cropCode}, #{categoryCode}, #{categorySelf}, #{sourcePurpose} + , #{inputType}, #{credit}, #{expenseMarkCode}, #{cropCode}, #{categoryCode}, #{categorySelf}, #{sourcePurpose} , #{quantity}, #{unitCode}, #{price}, #{estimatedValue} , false , @@ -45,6 +45,7 @@ update daily_income set , is_credit = #{credit} + , expense_mark_code = #{expenseMarkCode} , crop_code = #{cropCode} , category_code = #{categoryCode} , category_self = #{categorySelf} diff --git a/front/src/main/resources/mappers/daily/DailyRecordMapper.xml b/front/src/main/resources/mappers/daily/DailyRecordMapper.xml index 2ddc15f7..cd724557 100644 --- a/front/src/main/resources/mappers/daily/DailyRecordMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyRecordMapper.xml @@ -40,6 +40,21 @@ ) + + update daily_record set + , all_status = #{allStatus} + , income_status = #{incomeStatus} + , work_status = #{workStatus} + , expense_status = #{expenseStatus} + , power_status = #{powerStatus} + , forestry_status = #{forestryStatus} + , farming_status = #{farmingStatus} + where is_deleted = false + and record_month = #{recordMonth} + and day_group_no = #{dayGroupNo} + and household_seq = #{householdSeq} + + update daily_record set diff --git a/front/src/main/resources/messages/uri.properties b/front/src/main/resources/messages/uri.properties index 663c70b6..d336efca 100644 --- a/front/src/main/resources/messages/uri.properties +++ b/front/src/main/resources/messages/uri.properties @@ -31,8 +31,8 @@ uri.front.record.calendar=\uC784\uAC00\uACBD\uC81C\uC870\uC0AC \uC77C\uACC4\uBD8 uri.front.record.calendar.{{pathVar}}.{{pathVar}}=\uC77C\uACC4\uBD80 \uC6D4\uBCC4 \uD604\uD669 uri.front.record.daily=\uC77C\uACC4\uBD80 \uB4F1\uB85D uri.front.record.daily.{{pathVar}}=\uC77C\uACC4\uBD80 \uB4F1\uB85D -uri.front.record.income.{{pathVar}}=\uC218\uC785\uB0B4\uC5ED \uB4F1\uB85D -uri.front.record.expense.{{pathVar}}=\uC9C0\uCD9C\uB0B4\uC5ED \uB4F1\uB85D -uri.front.record.work.{{pathVar}}=\uB178\uB3D9\uC2DC\uAC04 \uB4F1\uB85D -uri.front.record.power.{{pathVar}}=\uB3D9\uB825 \uC0AC\uC6A9\uC2DC\uAC04 \uB4F1\uB85D -uri.front.record.forestry.{{pathVar}}=\uC790\uAC00\uC784\uC5C5 \uC0DD\uC0B0\uBB3C \uC911 \uC790\uAC00\uC18C\uBE44\uB7C9 \uB4F1\uB85D +uri.front.record.income.{{pathVar}}=\uC77C\uACC4\uBD80 \uB4F1\uB85D +uri.front.record.expense.{{pathVar}}=\uC77C\uACC4\uBD80 \uB4F1\uB85D +uri.front.record.work.{{pathVar}}=\uC77C\uACC4\uBD80 \uB4F1\uB85D +uri.front.record.power.{{pathVar}}=\uC77C\uACC4\uBD80 \uB4F1\uB85D +uri.front.record.forestry.{{pathVar}}=\uC77C\uACC4\uBD80 \uB4F1\uB85D diff --git a/front/src/main/resources/static/ui/page/daily-record.js b/front/src/main/resources/static/ui/page/daily-record.js index 454999f6..df351964 100644 --- a/front/src/main/resources/static/ui/page/daily-record.js +++ b/front/src/main/resources/static/ui/page/daily-record.js @@ -25,14 +25,18 @@ krip.daily.goToPrev = function(target, searchMonth, groupNo) { console.log(url); } +krip.daily.goToPrev = function() { + // TODO : history.back 으로 해결 되는가? + history.back(); +} + krip.daily.goToNext = function(target, searchMonth, groupNo) { let url = krip.daily.httpUrl.target; url = url.replace('{month}', searchMonth); url = url.replace('{groupNo}', groupNo); url = url.replace('{target}', target); - console.log(url); - //location.href = url; + location.href = url; }; /** @@ -52,6 +56,8 @@ krip.daily.todayNone = function(month, groupNo, target, checked) { {}, function (rstData, status) { console.log('rstData', rstData) + + $('.component-btns').find('.btn-primary').attr('disabled', !checked); }, ); }; \ No newline at end of file diff --git a/front/src/main/resources/templates/record/daily.html b/front/src/main/resources/templates/record/daily.html index fd93ecfb..43b644d3 100644 --- a/front/src/main/resources/templates/record/daily.html +++ b/front/src/main/resources/templates/record/daily.html @@ -32,7 +32,9 @@