生成排班不另起线程

yiming
1 parent 92dff733
Showing 4 changed files with 10 additions and 17 deletions
src/main/java/com/bsth/repository/subject/SubjectUserRepository.java
src/main/java/com/bsth/service/ddexam/impl/DdexamServiceImpl.java
src/main/java/com/bsth/service/subject/impl/SubjectUserServiceImpl.java
src/main/resources/static/pages/subjectUser/subjectUserDetailList.html
@@ -25,7 +25,7 @@ public interface SubjectUserRepository extends BaseRepository&lt;SubjectUser, Integ
             + " order by  su.user_id",nativeQuery=true)
     List<Object[]> searchSubjectUserByUserId(String rq, List<String> userIds);
-    @Query(value="select su.subject_id,su.rq,su.result,s.subject_text,s.operate_test "
+    @Query(value="select su.subject_id,su.rq,su.result,s.subject_text,s.operate_test,su.remark "
             + " from bsth_subject_user su,bsth_subject s where su.subject_id =s.id and su.rq =?1 and su.user_id = ?2 "
             + " order by  su.user_id",nativeQuery=true)
     List<Object[]> searchSubjectUserDetail(String rq, String userId);
@@ -246,13 +246,9 @@ public class DdexamServiceImpl implements DdexamService {
             if (userList.size() > 0) {
                 //已有的人检查分配线路
                 List<SysUser> finalUserList = userList;
-                new Thread() {
-                    public synchronized void run() {
-                        if (snt(finalUserList,false)) {
-                            kk();
-                        }
-                    }
-                }.start();
+                if (snt(finalUserList,false)) {
+                    kk();
+                }
             }
         }catch (Exception e){
             log.error("-----考试初始化失败------",e);
@@ -336,7 +332,7 @@ public class DdexamServiceImpl implements DdexamService {
     }
     //已创建好的用户分配排班
-    public Boolean snt(List<SysUser> userList,boolean type){
+    public Boolean snt(List<SysUser> userList,boolean type) throws Exception{
         for (int i = 0 ; i < userList.size() ; i++ ){   //已rs人数为准
             SysUser user = userList.get(i);
             if (realControAuthorityRepository.findByUserId(user.getId()) != null) {
@@ -214,6 +214,7 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer
                     tempM.put("result",result);
                     tempM.put("subjectText", objects.get(i)[3]);
                     tempM.put("operateTest", objects.get(i)[4]);
+                    tempM.put("remark", objects.get(i)[5]);
                     results.add(tempM);
                 }
             }
@@ -253,12 +254,8 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer
             }
         }
         //初始化考生排班 只初始化A线
-        new Thread() {
-            public synchronized void run() {
-                if (ddexamService.snt(userList,true)) {
-                    ddexamService.kk();
-                }
-            }
-        }.start();
+        if (ddexamService.snt(userList,true)) {
+            ddexamService.kk();
+        }
     }
 }
@@ -68,7 +68,7 @@
 		<td>{{obj.rq}}</td>
 		<td>{{obj.subjectText}}</td>
 		<td>{{obj.operateTest}}</td>
-		<td>{{obj.operateTest}}</td>
+		<td>{{obj.remark}}</td>
 		<td>{{obj.result}}</td>
 		</tr>
 	{{/each}}