Commit 820e9a685ac3b42ede526c8b8d267e94ee142402

Authored by yiming
1 parent ed90f9e5

考生创建时新增班级

src/main/java/com/bsth/repository/subject/SubjectUserRepository.java
@@ -20,7 +20,7 @@ public interface SubjectUserRepository extends BaseRepository<SubjectUser, Integ @@ -20,7 +20,7 @@ public interface SubjectUserRepository extends BaseRepository<SubjectUser, Integ
20 @Query(value = "update SubjectUser su set su.result =?1,su.updateBy = ?2,su.updateDate = ?3,su.remark =?4 where su.id =?5") 20 @Query(value = "update SubjectUser su set su.result =?1,su.updateBy = ?2,su.updateDate = ?3,su.remark =?4 where su.id =?5")
21 int updates(String result, Integer id, Date updateDate,String remark, Integer userId); 21 int updates(String result, Integer id, Date updateDate,String remark, Integer userId);
22 22
23 - @Query(value="select su.user_id,su.rq,su.result,u.name,u.user_name " 23 + @Query(value="select su.user_id,su.rq,su.result,u.name,u.user_name,su.fraction "
24 + " from bsth_subject_user su,bsth_c_sys_user u where su.user_id =u.id and su.rq =?1 and su.user_id in ( ?2 ) " 24 + " from bsth_subject_user su,bsth_c_sys_user u where su.user_id =u.id and su.rq =?1 and su.user_id in ( ?2 ) "
25 + " order by su.user_id",nativeQuery=true) 25 + " order by su.user_id",nativeQuery=true)
26 List<Object[]> searchSubjectUserByUserId(String rq, List<String> userIds); 26 List<Object[]> searchSubjectUserByUserId(String rq, List<String> userIds);
src/main/java/com/bsth/service/subject/impl/SubjectUserServiceImpl.java
@@ -153,6 +153,7 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer @@ -153,6 +153,7 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer
153 tempM.put("result", objects.get(i)[2]); 153 tempM.put("result", objects.get(i)[2]);
154 tempM.put("name", objects.get(i)[3]); 154 tempM.put("name", objects.get(i)[3]);
155 tempM.put("userName", objects.get(i)[4]); 155 tempM.put("userName", objects.get(i)[4]);
  156 + tempM.put("fraction", objects.get(i)[5]);
156 subjectUserList.add(tempM); 157 subjectUserList.add(tempM);
157 } 158 }
158 } 159 }
@@ -160,6 +161,7 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer @@ -160,6 +161,7 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer
160 m.forEach((k,v)->{ 161 m.forEach((k,v)->{
161 Map<String,Object> result=new HashMap<>(); 162 Map<String,Object> result=new HashMap<>();
162 int sum=0; 163 int sum=0;
  164 + int sumFraction=0;
163 int t=0; 165 int t=0;
164 int f=0; 166 int f=0;
165 int na=0; 167 int na=0;
@@ -170,6 +172,7 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer @@ -170,6 +172,7 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer
170 } 172 }
171 else if("0".equals(su.get("result").toString())){ 173 else if("0".equals(su.get("result").toString())){
172 t++; 174 t++;
  175 + sumFraction+=Integer.parseInt(su.get("fraction").toString());
173 }else if("1".equals(su.get("result").toString())){ 176 }else if("1".equals(su.get("result").toString())){
174 f++; 177 f++;
175 } 178 }
@@ -184,6 +187,7 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer @@ -184,6 +187,7 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer
184 result.put("t",t); 187 result.put("t",t);
185 result.put("f",f); 188 result.put("f",f);
186 result.put("na",na); 189 result.put("na",na);
  190 + result.put("fraction",sumFraction);
187 results.add(result); 191 results.add(result);
188 } 192 }
189 }); 193 });
src/main/resources/static/pages/subjectUser/selectSubject.html
@@ -121,6 +121,10 @@ @@ -121,6 +121,10 @@
121 const inputs = $("input[name='fraction']"); 121 const inputs = $("input[name='fraction']");
122 let sum=0; 122 let sum=0;
123 for (let i=0; i<inputs.length;i++) { 123 for (let i=0; i<inputs.length;i++) {
  124 + if(inputs[i].value == ''){
  125 + layer.alert("请输入分值");
  126 + return;
  127 + }
124 fractionStr+=inputs[i].value+"," 128 fractionStr+=inputs[i].value+","
125 sum+=Number(inputs[i].value); 129 sum+=Number(inputs[i].value);
126 } 130 }
src/main/resources/static/pages/subjectUser/subjectUserList.html
@@ -58,6 +58,7 @@ @@ -58,6 +58,7 @@
58 <td>正确</td> 58 <td>正确</td>
59 <td>错误</td> 59 <td>错误</td>
60 <td>未答</td> 60 <td>未答</td>
  61 + <td>成绩</td>
61 <td>查看</td> 62 <td>查看</td>
62 </tr> 63 </tr>
63 </thead> 64 </thead>
@@ -152,6 +153,7 @@ @@ -152,6 +153,7 @@
152 <td>{{obj.t}}</td> 153 <td>{{obj.t}}</td>
153 <td>{{obj.f}}</td> 154 <td>{{obj.f}}</td>
154 <td>{{obj.na}}</td> 155 <td>{{obj.na}}</td>
  156 + <td>{{obj.fraction}}</td>
155 <td> 157 <td>
156 <button type="button" class="btn btn-sm blue btn-subjectUserList" 158 <button type="button" class="btn btn-sm blue btn-subjectUserList"
157 data-id="{{obj.userId}}" data-rq="{{obj.rq}}">查看</button> 159 data-id="{{obj.userId}}" data-rq="{{obj.rq}}">查看</button>