潘钊 / bsth_control · Commits

Commit 820e9a685ac3b42ede526c8b8d267e94ee142402

Authored by yiming
1 parent ed90f9e5
build: skipped

考生创建时新增班级

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