Browse Source

教务端课表bug修复

Joburgess 5 năm trước cách đây
mục cha
commit
93ea41e862

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TeacherHomeworkListDto.java

@@ -50,6 +50,16 @@ public class TeacherHomeworkListDto {
 
     private int isSubmit;
 
+    private int status;
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
     public Date getStartClassTime() {
         return startClassTime;
     }

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ExtracurricularExercises.java

@@ -51,6 +51,16 @@ public class ExtracurricularExercises {
 
 	private int isSubmit;
 
+	private int status;
+
+	public int getStatus() {
+		return status;
+	}
+
+	public void setStatus(int status) {
+		this.status = status;
+	}
+
 	public int getIsReplied() {
 		return isReplied;
 	}

+ 7 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseHomeworkServiceImpl.java

@@ -67,6 +67,13 @@ public class CourseHomeworkServiceImpl extends BaseServiceImpl<Long, CourseHomew
 				if(notSubmitNum<=0){
 					teacherHomeworkListDto.setIsSubmit(1);
 				}
+				if(noRepliedNum>0){
+					teacherHomeworkListDto.setStatus(1);
+				}else if(noRepliedNum<=0&&notSubmitNum>0){
+					teacherHomeworkListDto.setStatus(2);
+				}else if(noRepliedNum<=0&&notSubmitNum<=0){
+					teacherHomeworkListDto.setStatus(3);
+				}
 			}
 		}
 		if (count != 0) {

+ 7 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExtracurricularExercisesServiceImpl.java

@@ -114,6 +114,13 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
 				if(notSubmitNum<=0){
 					extracurricularExercises.setIsSubmit(1);
 				}
+				if(noRepliedNum>0){
+					extracurricularExercises.setStatus(1);
+				}else if(noRepliedNum<=0&&notSubmitNum>0){
+					extracurricularExercises.setStatus(2);
+				}else if(noRepliedNum<=0&&notSubmitNum<=0){
+					extracurricularExercises.setStatus(3);
+				}
 			}
 
 			Map<String, List<ExtracurricularExercises>> collect = dataList.stream().collect(Collectors.groupingBy(e -> DateUtil.dateToString(e.getCreateTime(), "yyyy-MM-dd")));