考生创建时新增班级

yiming
1 parent 32f3be1e
Showing 8 changed files with 96 additions and 18 deletions
src/main/java/com/bsth/controller/subject/SubjectController.java
src/main/java/com/bsth/entity/subject/SubjectUser.java
src/main/java/com/bsth/repository/sys/SysUserRepository.java
src/main/java/com/bsth/service/subject/SubjectUserService.java
src/main/java/com/bsth/service/subject/impl/SubjectUserServiceImpl.java
src/main/resources/static/assets/css/MSFmultiSelect.css
src/main/resources/static/assets/js/MSFmultiSelect.js
src/main/resources/static/pages/subjectUser/selectSubject.html
@@ -37,8 +37,11 @@ public class SubjectController extends BaseController&lt;Subject, Integer&gt; {
     public Map<String,String> selectSubject(@RequestParam() Map<String, Object> map){
         Map<String,String> result=new HashMap<>();
         try {
-            String[] arr=map.get("ids").toString().split(",");
-            subjectUserService.selectSubject(arr);
+            String[] ids=map.get("ids").toString().split(",");
+            String[] fractions=map.get("fractionStr").toString().split(",");
+            String isOperate=map.get("isOperate").toString();
+            String className=map.get("className").toString();
+            subjectUserService.selectSubject(ids,fractions,isOperate,className);
             result.put("result","成功");
             return result;
         } catch (Exception e) {
@@ -42,6 +42,10 @@ public class SubjectUser {
     @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
     private Date updateDate;
+    private int fraction;
+
+    private String isOperateTest;
+
     public Integer getId() {
         return id;
     }
@@ -122,4 +126,20 @@ public class SubjectUser {
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public int getFraction() {
+        return fraction;
+    }
+
+    public void setFraction(int fraction) {
+        this.fraction = fraction;
+    }
+
+    public String getIsOperateTest() {
+        return isOperateTest;
+    }
+
+    public void setIsOperateTest(String isOperateTest) {
+        this.isOperateTest = isOperateTest;
+    }
 }
@@ -55,4 +55,7 @@ public interface SysUserRepository extends BaseRepository&lt;SysUser, Integer&gt;{
 	@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 );
+
+	@Query("SELECT u FROM SysUser u where u.parentID = ?1 and u.className= ?2")
+	List<SysUser> findByParentIDAndClassName(String parentID,String className);
 }
@@ -17,5 +17,5 @@ public interface SubjectUserService extends BaseService&lt;SubjectUser, Integer&gt; {
     List<Map<String,Object>> subjectUserDetail(Map<String, Object> map);
-    void selectSubject(String[] arr) throws Exception;
+    void selectSubject(String[] arr,String[] fractions,String isOperate,String className) throws Exception;
 }
@@ -227,9 +227,15 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer
     @Override
     @Transactional
-    public void selectSubject(String[] arr) throws Exception{
+    public void selectSubject(String[] ids,String[] fractions,String isOperate,String className) throws Exception{
         SysUser loginUser = SecurityUtils.getCurrentUser();
-        List<SysUser> userList= sysUserRepository.findByParentID(String.valueOf(loginUser.getId()));
+        List<SysUser> userList;
+        if(className==null || "".equals(className)){
+            userList= sysUserRepository.findByParentID(String.valueOf(loginUser.getId()));
+        }else {
+            userList= sysUserRepository.findByParentIDAndClassName(String.valueOf(loginUser.getId()),className);
+        }
+
         DateTimeFormatter dateTimeFormatter=DateTimeFormatter.ofPattern("yyyy-MM-dd");
         LocalDate localDate=LocalDate.now();
         String rq=localDate.format(dateTimeFormatter);
@@ -242,14 +248,16 @@ public class SubjectUserServiceImpl extends BaseServiceImpl&lt;SubjectUser, Integer
         for (SysUser user : userList) {
             //清除考生排班
             ddexamService.clearScheduleRealInfo(user);
-            for (String s : arr) {
+            for (int i = 0; i < ids.length; i++) {
                 SubjectUser subjectUser=new SubjectUser();
                 subjectUser.setUserId(user);
                 subjectUser.setRq(rq);
                 subjectUser.setCreateBy(loginUser.getId());
                 Subject subject=new Subject();
-                subject.setId(Integer.parseInt(s));
+                subject.setId(Integer.parseInt(ids[i]));
                 subjectUser.setSubjectId(subject);
+                subjectUser.setFraction(Integer.parseInt(fractions[i]));
+                subjectUser.setIsOperateTest(isOperate);
                 subjectUserRepository.save(subjectUser);
             }
         }
 .msf_multiselect_container .msf_multiselect {
-  border: 1px solid #e4e4e4;
+  border: 1px solid #c2cad8;
   list-style-type:none;
   margin: 0;
   padding: 0;
@@ -22,6 +22,7 @@
   padding-left: 2px;
   padding-top: 2px;
   overflow: auto;
+  border: 1px solid #c2cad8;
 }
 .msf_multiselect_container .msf_multiselect{
   height: 200px;
@@ -8,8 +8,8 @@ class MSFmultiSelect{
     this.select = select;
     this.settings = settings;
     this.defultSettings={
-      width:350,
-      height:30,
+      width:200,
+      height:34,
       appendTo:'body',
       className:''
     }
@@ -28,15 +28,25 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="">
-					<div style="display: inline-block;">
-						<span class="item-label" style="width: 80px;margin-left: 6px;">场景: </span>
-						<div id="myselect">
-							<select id="multiselect" style="width: 350px;" class="form-control"  name="countries[]" multiple="multiple">
+					<div class="form-group">
+						<span class="item-label">班级: </span>
+						<select class="form-control" name="className" id="className" style="width: 180px;">
+							<li class="select2-results__option" role="treeitem" >请选择</li>
+						</select>
+					</div>
+					<div class="form-group">
+						<span class="item-label" >场景: </span>
+						<div id="myselect" class="form-group" style="margin-bottom: -5px;" >
+							<select id="multiselect"  class="form-control"  name="countries[]" multiple="multiple" >
 							</select>
 						</div>
 					</div>
+					<div class="form-group" >
+						<input type="radio" name="isOperate" value="1"   checked="checked"/><label >隐藏操作</label>
+						<input type="radio" name="isOperate" value="0" /><label >显示操作</label>
+					</div>
 					<div class="form-group">
-						<input class="btn btn-default"  type="button" onclick="selectSubject()" value="提交" style="margin-left: 2px;margin-top: -24px;"/>
+						<input class="btn btn-default"  type="button" onclick="selectSubject()" value="提交" />
 					</div>
 				</form>
 			</div>
@@ -45,15 +55,18 @@
 					<form role="form">
 						<div class="form-group">
 							<span class="item-label" style="width: 80px;margin-left: 6px;">场景: </span>
-							<textarea class="form-control" rows="12" id="subjectText"></textarea>
+							<textarea class="form-control" rows="10" id="subjectText"></textarea>
 						</div>
 					</form>
 					<form role="form">
 						<div class="form-group">
 							<span class="item-label" style="width: 80px;margin-left: 6px;">操作: </span>
-							<textarea class="form-control" rows="12" id="operateTest"></textarea>
+							<textarea class="form-control" rows="10" id="operateTest"></textarea>
 						</div>
 					</form>
+
+					<form  id="fractions">
+					</form>
 				</div>
 			</div>
 		</div>
@@ -66,6 +79,7 @@
 				onChange:function(checked,value,instance){
 					var subjectTextStr='';
 					var operateTestStr='';
+					var htmlSrt='';
 					var arr=select.getData();
 					for (let i of arr) {
 						let index=1;
@@ -73,12 +87,16 @@
 							if(s.id==i){
 								subjectTextStr+='题'+index+':'+s.subjectText+'\n';
 								operateTestStr+='题'+index+':'+s.operateTest+'\n';
+								htmlSrt+='<row style="display: inline-block"><span class="col-md-1" className="item-label" style="width: 80px">题'+index+': </span><input class="col-md-1" class="" type="text" oninput="value=value.replace(/[^\\d]/g,\'\')" name="fraction" style="border: 1px solid #c2cad8;width: 50px;"/></row>'
 							}
 							index++;
 						}
 					}
 					$("#subjectText").val(subjectTextStr);
 					$("#operateTest").val(operateTestStr);
+					$("#fractions").html(htmlSrt);
+
+
 				},
 				appendTo:'#myselect',
 			}
@@ -98,8 +116,22 @@
 			}
 			select.loadSource(datas);
 		});
+		getClass();
 	});
 	function selectSubject(){
+		let fractionStr = '';
+		const inputs = $("input[name='fraction']");
+		let sum=0;
+		for (let i=0; i<inputs.length;i++) {
+			fractionStr+=inputs[i].value+","
+			sum+=Number(inputs[i].value);
+		}
+		let isOperate=$('input[name="isOperate"]:checked').val();
+		let className=$("#className").val();
+		if(sum != 100){
+			layer.alert("总分必须为100");
+			return;
+		}
 		var arr=select.getData();
 		if(arr.length == 0){
 			layer.alert("请选择场景");
@@ -113,11 +145,22 @@
 			for (let id of arr) {
 				ids+=id+',';
 			}
-			$get('/subject/selectSubject',{ids:ids},function(result){
+			$get('/subject/selectSubject',{ids:ids,fractionStr:fractionStr,isOperate:isOperate,className:className},function(result){
 				layer.alert(result.result);
 			});
 		});
 	}
+	var firstLoad=true;
+	function getClass(){
+		$.get('/user/classList',function(result){
+			var data=[];
+			for(var code in result){
+				data.push({id: result[code], text: result[code]});
+			}
+			initPinYinSelect2('#className',data,'');
+			firstLoad=false;
+		})
+	}
 </script>