考生创建时新增班级

yiming
1 parent c0340163
Showing 9 changed files with 83 additions and 11 deletions
src/main/java/com/bsth/controller/ddexam/DdexamController.java
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/entity/sys/SysUser.java
src/main/java/com/bsth/repository/sys/SysUserRepository.java
src/main/java/com/bsth/service/ddexam/DdexamService.java
src/main/java/com/bsth/service/ddexam/impl/DdexamServiceImpl.java
src/main/java/com/bsth/service/sys/SysUserService.java
src/main/java/com/bsth/service/sys/impl/SysUserServiceImpl.java
src/main/resources/static/pages/ddexam/index.html
@@ -23,8 +23,8 @@ public class DdexamController {
     //创建账号
     @RequestMapping("initialization")
-    public Map initializationAll(@RequestParam String name ,@RequestParam Long userName){
-        return ddexamService.initializationAll(name,userName);
+    public Map initializationAll(@RequestParam String name ,@RequestParam Long userName,@RequestParam String className){
+        return ddexamService.initializationAll(name,userName,className);
     }
     //初始化
     @RequestMapping("initialization2")
@@ -308,4 +308,9 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
         return sysUserService.userNameList();
     }
+    @RequestMapping(value = "/classList")
+    public List<String> classList() {
+        return sysUserService.getAllClass();
+    }
+
 }
@@ -46,6 +46,9 @@ public class SysUser implements Serializable {
 	@Column(name = "parent_id")
 	private String parentID;
+
+	@Column(name = "class_name")
+	private String className;
 	@ManyToMany(fetch = FetchType.EAGER)
 	private Set<Role> roles = new LinkedHashSet<>();
@@ -147,9 +150,17 @@ public class SysUser implements Serializable {
 		this.parentID = parentID;
 	}
+	public String getClassName() {
+		return className;
+	}
+
+	public void setClassName(String className) {
+		this.className = className;
+	}
+
 	public  SysUser(){
 	}
-	public  SysUser(String name,String userName,SysUser loginUser){
+	public  SysUser(String name,String userName,SysUser loginUser,String className){
 		this.createDate=new Date();
 		this.enabled=true;
 		this.name=name;
@@ -157,5 +168,6 @@ public class SysUser implements Serializable {
 		this.userName=userName;
 		this.ksstatus="1"; //状态  表示今日账户已用
 		this.parentID=String.valueOf(loginUser.getId());
+		this.className=className;
 	}
 }
@@ -52,4 +52,7 @@ public interface SysUserRepository extends BaseRepository&lt;SysUser, Integer&gt;{
 	@Query("SELECT u FROM SysUser u where u.parentID = ?1")
 	List<SysUser> findByParentID(String parentID );
+
+	@Query(value ="SELECT class_name FROM bsth_c_sys_user  where class_name is not null and parent_id = ?1 GROUP BY class_name",nativeQuery=true)
+	List<String> findAllClassByParentID(String parentID );
 }
@@ -8,7 +8,7 @@ import java.util.Map;
 public interface DdexamService {
-    public Map initializationAll(String name,Long userName);
+    public Map initializationAll(String name,Long userName,String className);
     public Map initializationAll2(Long userName);
@@ -194,7 +194,7 @@ public class DdexamServiceImpl implements DdexamService {
     //考生人初始化  单线程 测试1：执行中途再次执行是否同步 测试2：
     @Override
     @Transactional //事务
-    public synchronized Map initializationAll(String name,Long userName) {
+    public synchronized Map initializationAll(String name,Long userName,String className) {
         Long start = System.currentTimeMillis();
         Map m = new HashMap<>();
         try {  //用户当天分配完直接改状态  无二次分配的可能
@@ -209,7 +209,7 @@ public class DdexamServiceImpl implements DdexamService {
             new Thread() {
                 public  synchronized  void run() {
-                    SysUser user = new SysUser(name,String.valueOf(userName),loginUser);
+                    SysUser user = new SysUser(name,String.valueOf(userName),loginUser,className);
                     if(createUser(user)){
                         log.info("考试初始化创建成功");
                         kk();
@@ -426,7 +426,7 @@ public class DdexamServiceImpl implements DdexamService {
             for(int i = 0; i < textList.size(); i++) {
                 String text = textList.get(i);
                 String[] split = text.split(",");
-                SysUser user = new SysUser(split[1].trim(),split[0].trim(),SecurityUtils.getCurrentUser());
+                SysUser user = new SysUser(split[1].trim(),split[0].trim(),SecurityUtils.getCurrentUser(),split[2].trim());
                 userList.add(user);
             }
             List<SysUser> users = sysUserRepository.findBySusUserAll();
@@ -22,4 +22,6 @@ public interface SysUserService extends BaseService&lt;SysUser, Integer&gt;{
 	Map<String, Object> resetPassword(@RequestParam Integer id);
 	List<Map<String,String>> userNameList();
+
+	List<String> getAllClass();
 }
@@ -193,4 +193,10 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 		}
 		return users;
 	}
+
+	public List<String> getAllClass(){
+		SysUser loginUser=SecurityUtils.getCurrentUser();
+		List<String> classList=sysUserRepository.findAllClassByParentID(String.valueOf(loginUser.getId()));
+		return classList;
+	}
 }
@@ -56,16 +56,28 @@
                 <label class="col-md-12 sizell">请输入学号：</label>
                 <div class="col-md-9 scm">
                     <input id="userName" type="text" class="form-control" name="userName" autocomplete="off"  oninput="value=value.replace(/[^\d]/g,'')"/>
-                   
+
                 </div>
                 <label class="col-md-12 sizell">请输入姓名：</label>
                 <div class="col-md-9 scm">
                     <input id="name" type="text" class="form-control" name="name" autocomplete="off" />
+
+                </div>
+                <label class="col-md-12 sizell">请输入班级：</label>
+                <div class="col-md-9 scm" >
+                    <div id="className1">
+                        <select class="form-control" name="className" id="className" ></select>
+                    </div>
+                    <input  type="text" class="form-control" name="className2" id="className2" autocomplete="off" style="display: none"/>
                     <h6>人数过大时，耗时较久，请耐心等待</h6>
                 </div>
-             
+                <div class="col-md-3" style="padding-right: 60px; padding-top: 5px">
+                    <input type="radio" name="isNew" value="1" onclick="isNew()" checked="checked"/><label >已有</label>
+                    <input type="radio" name="isNew" value="2" onclick="isNew()"/><label >新增</label>
+                </div>
+
                 <div class="col-md-12 nt" >
                     <button type="button" class="btn btn-primary textk" id="onckil">创建账号</button>
                     <button type="button" class="btn btn-primary textk" id="upload"><i class="fa fa-file-excel-o"></i>
@@ -112,8 +124,9 @@
             format : 'HH:mm:ss',
             locale : 'zh-cn',
         });
+        getClass();
     })
-    
+
     // 下一步点击事件
     $('#onckil').on('click', function() {
         onckil();// 表单提交
@@ -140,9 +153,16 @@
     function onckil(){
+        var className;
+        if($('input[name="isNew"]:checked').val()==2) {
+            className=$("#className2").val();
+        }else {
+            className=$("#className").val();
+        }
         var params ={
             userName :  $("#userName").val(),
-            name : $("#name").val()
+            name : $("#name").val(),
+            className :className
         }
         var i = layer.load(2);
         $.post('/ddexam/initialization',params,function(data) {
@@ -216,5 +236,29 @@
         $.get('upload.html', function(m){$(pjaxContainer).append(m);});
     });
+    function isNew(){
+        if($('input[name="isNew"]:checked').val()==2){
+            $('#className1').hide();
+            $('#className2').show();
+        }else {
+            getClass();
+            $('#className1').show();
+            $('#className2').hide();
+        }
+    }
+    var firstLoad=true;
+    function getClass(){
+        $.get('/user/classList',function(result){
+            var data=[];
+            if(firstLoad){
+                data.push({id: "", text:"请选择"});
+            }
+            for(var code in result){
+                data.push({id: result[code], text: result[code]});
+            }
+            initPinYinSelect2('#className',data,'');
+            firstLoad=false;
+        })
+    }
 </script>
 \ No newline at end of file