Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
@@ -34,7 +34,7 @@ class GetBankInputUIController {
|
||||
|
||||
|
||||
@GetMapping(path = "/info/bank/create/input/{id}")
|
||||
String operate(Model model,
|
||||
public String operate(Model model,
|
||||
@PathVariable Long id) {
|
||||
|
||||
String currentMonth = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMM"));
|
||||
@@ -76,4 +76,16 @@ class GetBankInputUIController {
|
||||
|
||||
return "info/bank/input";
|
||||
}
|
||||
|
||||
|
||||
@GetMapping(path = "/api/front/info/bank/create/input/from")
|
||||
public String operateForm(Model model) {
|
||||
|
||||
|
||||
model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.input"));
|
||||
model.addAttribute("codeRecordCropList", uiCodeListPortIn.connect("code.record.crop"));
|
||||
model.addAttribute("unitList", uiCodeListPortIn.connect("code.record.unit"));
|
||||
|
||||
return "info/bank/inputForm";
|
||||
}
|
||||
}
|
||||
@@ -126,4 +126,13 @@ class CreateMonthlyUIController {
|
||||
|
||||
return "info/monthly/{id}";
|
||||
}
|
||||
|
||||
|
||||
@GetMapping(path = "/api/front/info/monthly/create/from")
|
||||
public String operateForm(Model model) {
|
||||
model.addAttribute("purposeList", uiCodeListPortIn.connect("code.purpose"));
|
||||
model.addAttribute("unitList", uiCodeListPortIn.connect("code.record.unit"));
|
||||
|
||||
return "info/monthly/form";
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user