diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java index b291a07..f257697 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java @@ -69,11 +69,17 @@ public class CommonApiController { //个人记工-账本信息修改 @ApiOperation(value="记工记账-账本信息修改", notes="记工记账-账本信息修改") - @RequestMapping(value = "/addBill", method = {RequestMethod.POST}) - public Result addBill(@RequestHeader("X-Access-Token") String token, EmployNotebook employNotebook){ + @RequestMapping(value = "/updateNoteBook", method = {RequestMethod.POST}) + public Result updateNoteBook(@RequestHeader("X-Access-Token") String token, EmployNotebook employNotebook){ return commonApiService.updateNoteBook(token, employNotebook); } + @ApiOperation(value="记工记账-在建/结束项目", notes="Type:0-个人 1-班组, status: 0-在建项目 1-结束项目") + @RequestMapping(value = "/queryNotebookList", method = {RequestMethod.GET}) + public Result queryNotebookList(@RequestHeader("X-Access-Token") String token, String type, String status, PageBean pageBean){ + return commonApiService.queryNotebookList(token, type, status, pageBean); + } + //个人记工-全年收支 @ApiOperation(value="记工记账-全年收支", notes="记工记账-全年收支") @RequestMapping(value = "/queryBill", method = {RequestMethod.GET}) @@ -88,12 +94,6 @@ public class CommonApiController { return commonApiService.addQuestion(token, employFeedback); } - @ApiOperation(value="记工记账-在建/结束项目", notes="Type:0-个人 1-班组, status: 0-在建项目 1-结束项目") - @RequestMapping(value = "/queryNotebookList", method = {RequestMethod.GET}) - public Result queryNotebookList(@RequestHeader("X-Access-Token") String token, String type, String status, PageBean pageBean){ - return commonApiService.queryNotebookList(token, type, status, pageBean); - } - @ApiOperation(value="记工记账-项目记账", notes="记工记账-项目记账") @RequestMapping(value = "/addBillInfo", method = {RequestMethod.POST}) public Result addBillInfo(@RequestHeader("X-Access-Token") String token, EmployBillInfo employBillInfo){