业务编写

src/main/java/com/sztzjy/forex/trading_trading/entity/Member.java

@@ -1,5 +1,7 @@
 package com.sztzjy.forex.trading_trading.entity;
 
+import io.swagger.annotations.ApiModelProperty;
+
 public class Member {
     /**
      *
@@ -8,6 +10,7 @@ public class Member {
      *
      * @mbg.generated Wed Jul 19 15:55:18 CST 2023
      */
+    @ApiModelProperty("主键id")
     private String memberId;
 
     /**
@@ -17,6 +20,7 @@ public class Member {
      *
      * @mbg.generated Wed Jul 19 15:55:18 CST 2023
      */
+    @ApiModelProperty("实训任务id")
     private String trainingId;
 
     /**
@@ -26,6 +30,7 @@ public class Member {
      *
      * @mbg.generated Wed Jul 19 15:55:18 CST 2023
      */
+    @ApiModelProperty("学生姓名")
     private String name;
 
     /**
@@ -35,6 +40,7 @@ public class Member {
      *
      * @mbg.generated Wed Jul 19 15:55:18 CST 2023
      */
+    @ApiModelProperty("学号")
     private String studentNumber;
 
     /**
@@ -44,6 +50,7 @@ public class Member {
      *
      * @mbg.generated Wed Jul 19 15:55:18 CST 2023
      */
+    @ApiModelProperty("专业")
     private String major;
 
     /**
@@ -53,6 +60,7 @@ public class Member {
      *
      * @mbg.generated Wed Jul 19 15:55:18 CST 2023
      */
+    @ApiModelProperty("班级")
     private String classGrade;
 
     /**
@@ -62,6 +70,7 @@ public class Member {
      *
      * @mbg.generated Wed Jul 19 15:55:18 CST 2023
      */
+    @ApiModelProperty("学生排名")
     private Integer stuRank;
 
     /**
@@ -71,6 +80,7 @@ public class Member {
      *
      * @mbg.generated Wed Jul 19 15:55:18 CST 2023
      */
+    @ApiModelProperty("初始资金")
     private Double initialCapital;
 
     /**
@@ -80,6 +90,7 @@ public class Member {
      *
      * @mbg.generated Wed Jul 19 15:55:18 CST 2023
      */
+    @ApiModelProperty("总资产")
     private Double totalAssets;
 
     /**
@@ -89,6 +100,7 @@ public class Member {
      *
      * @mbg.generated Wed Jul 19 15:55:18 CST 2023
      */
+    @ApiModelProperty("净值")
     private Double netValue;
 
     /**
@@ -98,6 +110,7 @@ public class Member {
      *
      * @mbg.generated Wed Jul 19 15:55:18 CST 2023
      */
+    @ApiModelProperty("已用保证金")
     private Double marginUsed;
 
     /**
@@ -107,6 +120,7 @@ public class Member {
      *
      * @mbg.generated Wed Jul 19 15:55:18 CST 2023
      */
+    @ApiModelProperty("可用资金")
     private Double availableFunds;
 
     /**
@@ -116,6 +130,7 @@ public class Member {
      *
      * @mbg.generated Wed Jul 19 15:55:18 CST 2023
      */
+    @ApiModelProperty("保证金水平")
     private Double marginLevel;
 
     /**
@@ -125,6 +140,7 @@ public class Member {
      *
      * @mbg.generated Wed Jul 19 15:55:18 CST 2023
      */
+    @ApiModelProperty("持仓盈亏")
     private Double positionProfitLoss;
 
     /**
@@ -134,6 +150,7 @@ public class Member {
      *
      * @mbg.generated Wed Jul 19 15:55:18 CST 2023
      */
+    @ApiModelProperty("累计盈亏")
     private Double cumulativeProfitLoss;
 
     /**
@@ -143,6 +160,7 @@ public class Member {
      *
      * @mbg.generated Wed Jul 19 15:55:18 CST 2023
      */
+    @ApiModelProperty("收益率")
     private Double yield;
 
     /**
@@ -152,6 +170,7 @@ public class Member {
      *
      * @mbg.generated Wed Jul 19 15:55:18 CST 2023
      */
+    @ApiModelProperty("开仓次数")
     private Integer openingTrades;
 
     /**
@@ -161,6 +180,7 @@ public class Member {
      *
      * @mbg.generated Wed Jul 19 15:55:18 CST 2023
      */
+    @ApiModelProperty("平仓次数")
     private Integer closingTrades;
 
     /**
@@ -170,6 +190,7 @@ public class Member {
      *
      * @mbg.generated Wed Jul 19 15:55:18 CST 2023
      */
+    @ApiModelProperty("学校id")
     private Integer schoolId;
 
     /**
@@ -179,6 +200,7 @@ public class Member {
      *
      * @mbg.generated Wed Jul 19 15:55:18 CST 2023
      */
+    @ApiModelProperty("创建学校")
     private String createSchool;
 
     /**
@@ -188,6 +210,7 @@ public class Member {
      *
      * @mbg.generated Wed Jul 19 15:55:18 CST 2023
      */
+    @ApiModelProperty("实训任务名称")
     private String trainingName;
 
     /**
@@ -197,6 +220,7 @@ public class Member {
      *
      * @mbg.generated Wed Jul 19 15:55:18 CST 2023
      */
+    @ApiModelProperty("报告成绩")
     private Double reportScore;
 
     /**
@@ -206,6 +230,7 @@ public class Member {
      *
      * @mbg.generated Wed Jul 19 15:55:18 CST 2023
      */
+    @ApiModelProperty("班级id")
     private Integer classId;
 
     /**

src/main/java/com/sztzjy/forex/trading_trading/service/MemberService.java

@@ -90,7 +90,13 @@ public class MemberService {
             criteria.andTrainingNameEqualTo(trainingName);
         }
         if (markStatus != null) {
-            //TODO 待确定评分状态
+            //未评分
+            if (markStatus == 0) {
+                criteria.andReportScoreIsNull();
+            } else {
+                //已评分
+                criteria.andReportScoreIsNotNull();
+            }
         }
         if (StringUtils.hasText(keyword)) {
             criteria.andNameLike("%" + keyword + "%");
@@ -108,6 +114,7 @@ public class MemberService {
         MemberExample example = new MemberExample();
         MemberExample.Criteria criteria = example.createCriteria();
         criteria.andTrainingIdEqualTo(trainingId);
+        example.setOrderByClause("stuRank ASC");
         PageHelper.startPage(index, size);
         return new PageInfo<>(memberMapper.selectByExample(example));
     }