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;
@@ -75,9 +76,10 @@ public class StudentAccountTradingRecordSheetController{
     private static final String API = "/api/studentAccountTradingRecordSheet";
 
 
-    @Autowired private StudentAccountTradingRecordSheetService studentAccountTradingRecordSheetService;
+    @Autowired
-
+    FileService fileService;
-    @Autowired FileService fileService;
+    @Autowired
+    private StudentAccountTradingRecordSheetService studentAccountTradingRecordSheetService;
 
     /* 前端接口 */
 
@@ -88,6 +90,13 @@ public class StudentAccountTradingRecordSheetController{
             return JsonResult.failMessage("请登录后再操作");
         } 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);
         }

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