1、swagger接口文档

web/src/main/java/com/ibeetl/jlw/service/StudentAccountAssetAllocationService.java

@@ -623,7 +623,7 @@ public class StudentAccountAssetAllocationService extends CoreBaseService<Studen
 
         toAccountAssetAllocation.setInitialInvestmentCapital(toAccountAssetAllocation.getTransferOutAmount().add(transfer));
         toAccountAssetAllocation.setAvailableFunds(toAccountAssetAllocation.getTransferOutAmount().add(transfer));
-        toAccountAssetAllocation.setTransferAmount(toAccountAssetAllocation.getTransferAmount().add(transfer));
+        toAccountAssetAllocation.setTransferinAmount(toAccountAssetAllocation.getTransferinAmount().add(transfer));
         studentAccountAssetAllocationDao.updateById(toAccountAssetAllocation);
 
         StudentAccountTradingRecordSheet tradingRecordSheet = new StudentAccountTradingRecordSheet();

web/src/main/java/com/ibeetl/jlw/web/StudentAccountTradingRecordSheetController.java

@@ -43,6 +43,7 @@ import com.ibeetl.jlw.service.*;
 import com.ibeetl.jlw.web.query.*;
 
 import org.springframework.beans.factory.annotation.Autowired;
+
 import javax.servlet.http.HttpServletRequest;
 
 import javax.servlet.http.HttpServletRequest;
@@ -68,26 +69,34 @@ import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser;
 @RestController
 @Validated
 @Api(tags = {"资产账户转账记录 学生资产账户交易流水 接口"})
-public class StudentAccountTradingRecordSheetController{
+public class StudentAccountTradingRecordSheetController {
 
     private final Log log = LogFactory.getLog(this.getClass());
     private static final String MODEL = "/jlw/studentAccountTradingRecordSheet";
     private static final String API = "/api/studentAccountTradingRecordSheet";
 
 
-    @Autowired private StudentAccountTradingRecordSheetService studentAccountTradingRecordSheetService;
+    @Autowired
-
+    FileService fileService;
-    @Autowired FileService fileService;
+    @Autowired
+    private StudentAccountTradingRecordSheetService studentAccountTradingRecordSheetService;
 
     /* 前端接口 */
 
     @PostMapping(API + "/getPageList.do")
     @ApiOperation("分页列表")
-    public JsonResult<PageQuery> getPageList(StudentAccountTradingRecordSheetQuery condition,@SCoreUser CoreUser coreUser){
+    public JsonResult<PageQuery> getPageList(StudentAccountTradingRecordSheetQuery condition, @SCoreUser CoreUser coreUser) {
-        if(null == 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 JsonResult<StudentAccountTradingRecordSheet>getInfo(StudentAccountTradingRecordSheetQuery param,@SCoreUser CoreUser coreUser) {
+    public JsonResult<StudentAccountTradingRecordSheet> getInfo(StudentAccountTradingRecordSheetQuery param, @SCoreUser CoreUser coreUser) {
-        if(null == 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<List<StudentAccountTradingRecordSheet>>getList(StudentAccountTradingRecordSheetQuery param,@SCoreUser CoreUser coreUser) {
+    public JsonResult<List<StudentAccountTradingRecordSheet>> getList(StudentAccountTradingRecordSheetQuery param, @SCoreUser CoreUser coreUser) {
-        if(null == coreUser){
+        if (null == coreUser) {
             return JsonResult.failMessage("请登录后再操作");
-        }else{
+        } else {
-            List<StudentAccountTradingRecordSheet>list = studentAccountTradingRecordSheetService.getValuesByQuery(param);
+            List<StudentAccountTradingRecordSheet> list = studentAccountTradingRecordSheetService.getValuesByQuery(param);
-            return  JsonResult.success(list);
+            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<PageQuery> list(StudentAccountTradingRecordSheetQuery condition){
+    public JsonResult<PageQuery> 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){
+    public JsonResult addAll(StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery, @SCoreUser CoreUser coreUser) {
-        if(null == coreUser){
+        if (null == coreUser) {
             return JsonResult.failMessage("请登录后再操作");
-        }else{
+        } else {
-                studentAccountTradingRecordSheetQuery.setOrgId(coreUser.getOrgId());
+            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){
+    public JsonResult add(@Validated(ValidateConfig.ADD.class) StudentAccountTradingRecordSheetQuery studentAccountTradingRecordSheetQuery, BindingResult result, @SCoreUser CoreUser coreUser) {
-        if(result.hasErrors()){
+        if (result.hasErrors()) {
             return JsonResult.failMessage(result);
-        }else{
+        } else {
-            
+
-                studentAccountTradingRecordSheetQuery.setOrgId(coreUser.getOrgId());
+            studentAccountTradingRecordSheetQuery.setOrgId(coreUser.getOrgId());
             return studentAccountTradingRecordSheetService.add(studentAccountTradingRecordSheetQuery);
         }
     }
@@ -198,16 +207,16 @@ public class StudentAccountTradingRecordSheetController{
     @Function("studentAccountTradingRecordSheet.edit")
     @ApiOperation("编辑")
     public JsonResult<String> 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 JsonResult<StudentAccountTradingRecordSheet>queryInfo(Long id) {
+    public JsonResult<StudentAccountTradingRecordSheet> queryInfo(Long id) {
-        StudentAccountTradingRecordSheet studentAccountTradingRecordSheet = studentAccountTradingRecordSheetService.queryById( id);
+        StudentAccountTradingRecordSheet studentAccountTradingRecordSheet = studentAccountTradingRecordSheetService.queryById(id);
-        return  JsonResult.success(studentAccountTradingRecordSheet);
+        return JsonResult.success(studentAccountTradingRecordSheet);
     }
 
     @GetMapping(MODEL + "/getValues.json")
     @Function("studentAccountTradingRecordSheet.query")
     @ApiOperation("列表")
-    public JsonResult<List<StudentAccountTradingRecordSheet>>getValues(StudentAccountTradingRecordSheetQuery param) {
+    public JsonResult<List<StudentAccountTradingRecordSheet>> getValues(StudentAccountTradingRecordSheetQuery param) {
-        List<StudentAccountTradingRecordSheet>list = studentAccountTradingRecordSheetService.getValuesByQuery(param);
+        List<StudentAccountTradingRecordSheet> list = studentAccountTradingRecordSheetService.getValuesByQuery(param);
-        return  JsonResult.success(list);
+        return JsonResult.success(list);
     }
 
 

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;
+    }
 }