夏文涛 2 лет назад
Родитель
Сommit
a6cbf6a731

+ 5 - 0
src/main/java/com/template/model/evaluate/teacher/SmartScoreManage.java

@@ -1,5 +1,6 @@
 package com.template.model.evaluate.teacher;
 
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,6 +15,8 @@ public class SmartScoreManage {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "主键ID")
+    @TableId(value = "id", type = IdType.AUTO)
     public Integer id;
 
     @ApiModelProperty(value = "学期")
@@ -32,6 +35,8 @@ public class SmartScoreManage {
     public Double scoreNum;
 
     @ApiModelProperty(value = "逻辑删除 未删除:0;删除:1")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
     public Integer deleted;
 
 }

+ 2 - 2
src/main/java/com/template/services/impl/SmartSemesterServiceImpl.java

@@ -97,9 +97,9 @@ public class SmartSemesterServiceImpl extends ServiceImpl<SmartSemesterMapper, S
     @Override
     public List<SmartSemester> getSemesterTime(Date startTime, Date endTime) {
         LambdaQueryWrapper<SmartSemester> wrapper=new LambdaQueryWrapper<>();
-        wrapper.between(SmartSemester::getStartTime,startTime,endTime)
+        wrapper.and(query -> query.between(SmartSemester::getStartTime,startTime,endTime)
                 .or()
-                .between(SmartSemester::getEndTime,startTime,endTime);
+                .between(SmartSemester::getEndTime,startTime,endTime));
         List<SmartSemester> list = this.list(wrapper);
         return list;
     }