|
|
@@ -531,8 +531,8 @@ public class StudentScoreServiceImpl extends ServiceImpl<StudentScoreDao, Studen
|
|
|
// System.out.println(score+d.substring(start,d.length()));
|
|
|
// }
|
|
|
// String[] items = d.split("\\[\\[[0-9](.[0-9]+){0,1}分\\]\\]");
|
|
|
- String code = "2020301021117";
|
|
|
- String s = "https://file.markingcloud.com/" + getMarkingCloudPath(1342, getSuffix(code), code, 1, "jpg");
|
|
|
+ String code = "2021113801";
|
|
|
+ String s = "https://file.markingcloud.com/" + getMarkingCloudPath(1379, getSuffix(code), code, 1, "jpg");
|
|
|
System.out.println(s);
|
|
|
}
|
|
|
|
|
|
@@ -791,6 +791,7 @@ public class StudentScoreServiceImpl extends ServiceImpl<StudentScoreDao, Studen
|
|
|
lw.eq(StudentScoreEntity::getSubjectCode, subjectCode);
|
|
|
lw.eq(StudentScoreEntity::getMainNumber, mainNumber);
|
|
|
lw.eq(StudentScoreEntity::getSubNumber, subNumber);
|
|
|
+ lw.isNotNull(StudentScoreEntity::getMarkingScore);
|
|
|
lw.and(wq -> {
|
|
|
wq.or(wq1 -> wq1.isNull(StudentScoreEntity::getScoreNone));
|
|
|
wq.or(wq2 -> wq2.eq(StudentScoreEntity::getScoreNone, false));
|
