Commit 39fea793 authored by YangZhaoJun1's avatar YangZhaoJun1

解决bug

parent 88b1a87f
...@@ -29,7 +29,7 @@ public class BAgency extends IdEntity<BAgency> { ...@@ -29,7 +29,7 @@ public class BAgency extends IdEntity<BAgency> {
private String code; private String code;
/*代理商名*/ /*代理商名*/
@Length(min = 1, max = 100, message = "长度最小为1,最大为250") @Length(min = 1, max = 50, message = "长度最小为1,最大为50")
@NotBlank @NotBlank
private String name; private String name;
......
...@@ -59,7 +59,7 @@ public class BRooms extends IdEntity<BRooms> { ...@@ -59,7 +59,7 @@ public class BRooms extends IdEntity<BRooms> {
private String plan; private String plan;
/*教室编号*/ /*教室编号*/
@Length(min= 1 , max = 50, message = "长度最短为1,最长为50") @Length(min= 1 , max = 10, message = "长度最短为1,最长为10")
@NotBlank @NotBlank
private String code; private String code;
......
...@@ -155,11 +155,11 @@ public class BRoomsServiceImpl implements BRoomsService { ...@@ -155,11 +155,11 @@ public class BRoomsServiceImpl implements BRoomsService {
result += "表中第 " + index + " 行,编号 " + value[1] + " 在表中重复 \n"; result += "表中第 " + index + " 行,编号 " + value[1] + " 在表中重复 \n";
continue; continue;
} }
if(value[1].length() > 50){ if(value[1].length() > 10){
result += "表中第 " + index + " 行,编号 " + value[1] + " 太长 \n"; result += "表中第 " + index + " 行,编号 " + value[1] + " 太长 \n";
continue; continue;
} }
if(value[3].length() > 50){ if(value[3].length() > 15){
result += "表中第 " + index + " 行,编号 " + value[3] + " 太长 \n"; result += "表中第 " + index + " 行,编号 " + value[3] + " 太长 \n";
continue; continue;
} }
......
...@@ -86,12 +86,12 @@ ...@@ -86,12 +86,12 @@
SELECT DISTINCT bc.business_id,bc.is_test,bc.class_hour, SELECT DISTINCT bc.business_id,bc.is_test,bc.class_hour,
bc.chapter_name, bc.automatic,bc.sl_id,bc.experiment_type, bc.chapter_name, bc.automatic,bc.sl_id,bc.experiment_type,
ROUND((SELECT AVG(bsc.score) from b_r_student_chapter bsc ROUND((SELECT AVG(bsc.score) from b_r_student_chapter bsc
where bsc.chapter_id = bc.business_id and score != '-1'),2) as average, where bsc.chapter_id = bc.business_id and score != '-1' and score != '999'),2) as average,
(SELECT MAX(bsc.score) from b_r_student_chapter bsc (SELECT MAX(bsc.score) from b_r_student_chapter bsc
where bsc.chapter_id = bc.business_id and score != '-1') as maxScore, where bsc.chapter_id = bc.business_id and score != '-1' and score != '999') as maxScore,
(SELECT MIN(bsc.score) from b_r_student_chapter bsc (SELECT MIN(bsc.score) from b_r_student_chapter bsc
where bsc.chapter_id = bc.business_id and score != '-1') as minScore, where bsc.chapter_id = bc.business_id and score != '-1' and score != '999') as minScore,
(SELECT COUNT(*) from b_r_student_chapter where score = '-1' (SELECT COUNT(*) from b_r_student_chapter where (score = '-1' or score = '999')
AND sl_id = #{slId} AND chapter_id = bc.business_id AND is_complete = '1') as waitingMark, AND sl_id = #{slId} AND chapter_id = bc.business_id AND is_complete = '1') as waitingMark,
(SELECT COUNT(*) from b_r_student_chapter where sl_id = #{slId} (SELECT COUNT(*) from b_r_student_chapter where sl_id = #{slId}
AND chapter_id = bc.business_id AND is_complete = '1') as submit, AND chapter_id = bc.business_id AND is_complete = '1') as submit,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment