From adb32a2439892ef732039d53625e69e225826d5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B2=85?= <907037276@qq.com> Date: Wed, 27 Dec 2023 14:14:27 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81swagger=E6=8E=A5=E5=8F=A3=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StudentAccountAssetAllocationService.java | 2 +- ...ntAccountTradingRecordSheetController.java | 89 ++++++++++--------- ...StudentAccountTradingRecordSheetQuery.java | 19 ++++ 3 files changed, 69 insertions(+), 41 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentAccountAssetAllocationService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentAccountAssetAllocationService.java index 0b4d555f..86d88937 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentAccountAssetAllocationService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentAccountAssetAllocationService.java @@ -623,7 +623,7 @@ public class StudentAccountAssetAllocationService extends CoreBaseService getPageList(StudentAccountTradingRecordSheetQuery condition,@SCoreUser CoreUser coreUser){ - if(null == coreUser){ + public JsonResult getPageList(StudentAccountTradingRecordSheetQuery condition, @SCoreUser CoreUser coreUser) { + if (null == coreUser) { return JsonResult.failMessage("请登录后再操作"); - }else{ + } else { PageQuery page = condition.getPageQuery(); + if (condition.getStartTimeLong() != null && condition.getEndTimeLong() != null) { + condition.setStartTime(new Date(condition.getStartTimeLong())); + condition.setEndTime(new Date(condition.getEndTimeLong())); + page.setPara("startTime", condition.getStartTime()); + page.setPara("endTime", condition.getEndTime()); + } + studentAccountTradingRecordSheetService.queryByConditionQuery(page); return JsonResult.success(page); } @@ -96,24 +105,24 @@ public class StudentAccountTradingRecordSheetController{ @GetMapping(API + "/getInfo.do") @ApiOperation("获取数据") - public JsonResultgetInfo(StudentAccountTradingRecordSheetQuery param,@SCoreUser CoreUser coreUser) { - if(null == coreUser){ + public JsonResult getInfo(StudentAccountTradingRecordSheetQuery param, @SCoreUser CoreUser coreUser) { + if (null == coreUser) { return JsonResult.failMessage("请登录后再操作"); - }else{ + } else { StudentAccountTradingRecordSheet studentAccountTradingRecordSheet = studentAccountTradingRecordSheetService.getInfo(param); - return JsonResult.success(studentAccountTradingRecordSheet); + return JsonResult.success(studentAccountTradingRecordSheet); } } @GetMapping(API + "/getList.do") @ApiOperation("列表") - public JsonResult>getList(StudentAccountTradingRecordSheetQuery param,@SCoreUser CoreUser coreUser) { - if(null == coreUser){ + public JsonResult> getList(StudentAccountTradingRecordSheetQuery param, @SCoreUser CoreUser coreUser) { + if (null == coreUser) { return JsonResult.failMessage("请登录后再操作"); - }else{ - Listlist = studentAccountTradingRecordSheetService.getValuesByQuery(param); - return JsonResult.success(list); + } else { + List list = studentAccountTradingRecordSheetService.getValuesByQuery(param); + return JsonResult.success(list); } } @@ -124,7 +133,7 @@ public class StudentAccountTradingRecordSheetController{ @Function("studentAccountTradingRecordSheet.query") @ApiOperation("后台系统管理界面") public ModelAndView index() { - ModelAndView view = new ModelAndView("/jlw/studentAccountTradingRecordSheet/index.html") ; + ModelAndView view = new ModelAndView("/jlw/studentAccountTradingRecordSheet/index.html"); view.addObject("search", StudentAccountTradingRecordSheetQuery.class.getName()); return view; } @@ -144,10 +153,10 @@ public class StudentAccountTradingRecordSheetController{ @ApiOperation("后台系统管理界面-添加") public ModelAndView add(Long id) { ModelAndView view = new ModelAndView("/jlw/studentAccountTradingRecordSheet/add.html"); - if(null != id){ + if (null != id) { StudentAccountTradingRecordSheet studentAccountTradingRecordSheet = studentAccountTradingRecordSheetService.queryById(id); view.addObject("studentAccountTradingRecordSheet", studentAccountTradingRecordSheet); - }else { + } else { view.addObject("studentAccountTradingRecordSheet", new StudentAccountTradingRecordSheet()); } return view; @@ -158,7 +167,7 @@ public class StudentAccountTradingRecordSheetController{ @PostMapping(MODEL + "/list.json") @Function("studentAccountTradingRecordSheet.query") @ApiOperation("分页列表") - public JsonResult list(StudentAccountTradingRecordSheetQuery condition){ + public JsonResult list(StudentAccountTradingRecordSheetQuery condition) { PageQuery page = condition.getPageQuery(); studentAccountTradingRecordSheetService.queryByCondition(page); return JsonResult.success(page); @@ -167,16 +176,16 @@ public class StudentAccountTradingRecordSheetController{ @PostMapping(MODEL + "/addAll.json") @Function("studentAccountTradingRecordSheet.add") @ApiOperation("批量添加") - public JsonResult addAll(StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery,@SCoreUser CoreUser coreUser){ - if(null == coreUser){ + public JsonResult addAll(StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery, @SCoreUser CoreUser coreUser) { + if (null == coreUser) { return JsonResult.failMessage("请登录后再操作"); - }else{ - studentAccountTradingRecordSheetQuery.setOrgId(coreUser.getOrgId()); + } else { + studentAccountTradingRecordSheetQuery.setOrgId(coreUser.getOrgId()); String msg = studentAccountTradingRecordSheetService.addAll(studentAccountTradingRecordSheetQuery); if (StringUtils.isBlank(msg)) { return JsonResult.success(); } else { - return JsonResult.failMessage("新增失败,"+msg); + return JsonResult.failMessage("新增失败," + msg); } } } @@ -184,12 +193,12 @@ public class StudentAccountTradingRecordSheetController{ @PostMapping(MODEL + "/add.json") @Function("studentAccountTradingRecordSheet.add") @ApiOperation("添加") - public JsonResult add(@Validated(ValidateConfig.ADD.class) StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery, BindingResult result,@SCoreUser CoreUser coreUser){ - if(result.hasErrors()){ + public JsonResult add(@Validated(ValidateConfig.ADD.class) StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery, BindingResult result, @SCoreUser CoreUser coreUser) { + if (result.hasErrors()) { return JsonResult.failMessage(result); - }else{ - - studentAccountTradingRecordSheetQuery.setOrgId(coreUser.getOrgId()); + } else { + + studentAccountTradingRecordSheetQuery.setOrgId(coreUser.getOrgId()); return studentAccountTradingRecordSheetService.add(studentAccountTradingRecordSheetQuery); } } @@ -198,16 +207,16 @@ public class StudentAccountTradingRecordSheetController{ @Function("studentAccountTradingRecordSheet.edit") @ApiOperation("编辑") public JsonResult update(@Validated(ValidateConfig.UPDATE.class) StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery, BindingResult result) { - if(result.hasErrors()){ + if (result.hasErrors()) { return JsonResult.failMessage(result); - }else { + } else { Assert.notNull(getUser(), "请登录后再操作"); - studentAccountTradingRecordSheetQuery.setOrgId(null); + studentAccountTradingRecordSheetQuery.setOrgId(null); String msg = studentAccountTradingRecordSheetService.edit(studentAccountTradingRecordSheetQuery); if (StringUtils.isBlank(msg)) { return JsonResult.success(); } else { - return JsonResult.failMessage("更新失败,"+msg); + return JsonResult.failMessage("更新失败," + msg); } } } @@ -216,17 +225,17 @@ public class StudentAccountTradingRecordSheetController{ @GetMapping(MODEL + "/view.json") @Function("studentAccountTradingRecordSheet.query") @ApiOperation("根据ID获取数据") - public JsonResultqueryInfo(Long id) { - StudentAccountTradingRecordSheet studentAccountTradingRecordSheet = studentAccountTradingRecordSheetService.queryById( id); - return JsonResult.success(studentAccountTradingRecordSheet); + public JsonResult queryInfo(Long id) { + StudentAccountTradingRecordSheet studentAccountTradingRecordSheet = studentAccountTradingRecordSheetService.queryById(id); + return JsonResult.success(studentAccountTradingRecordSheet); } @GetMapping(MODEL + "/getValues.json") @Function("studentAccountTradingRecordSheet.query") @ApiOperation("列表") - public JsonResult>getValues(StudentAccountTradingRecordSheetQuery param) { - Listlist = studentAccountTradingRecordSheetService.getValuesByQuery(param); - return JsonResult.success(list); + public JsonResult> getValues(StudentAccountTradingRecordSheetQuery param) { + List list = studentAccountTradingRecordSheetService.getValuesByQuery(param); + return JsonResult.success(list); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/StudentAccountTradingRecordSheetQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/StudentAccountTradingRecordSheetQuery.java index 21996db5..88b11383 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/StudentAccountTradingRecordSheetQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/StudentAccountTradingRecordSheetQuery.java @@ -45,6 +45,9 @@ public class StudentAccountTradingRecordSheetQuery extends PageParam { private Date startTime; private Date endTime; + private Long startTimeLong; + private Long endTimeLong; + private String studentAccountTradingRecordSheetJsonStr;//json格式 private String _given;//指定更新的特定字段，多个逗号隔开 @@ -151,4 +154,20 @@ public class StudentAccountTradingRecordSheetQuery extends PageParam { public void setEndTime(Date endTime) { this.endTime = endTime; } + + public Long getStartTimeLong() { + return startTimeLong; + } + + public void setStartTimeLong(Long startTimeLong) { + this.startTimeLong = startTimeLong; + } + + public Long getEndTimeLong() { + return endTimeLong; + } + + public void setEndTimeLong(Long endTimeLong) { + this.endTimeLong = endTimeLong; + } }