旧转新

src/main/java/com/ssj/bean/sys/fx/domain/Merchant.java

@@ -70,8 +70,14 @@ public class Merchant extends BaseEntity {
 	
 	private Integer portNum;
 	
+	private Integer portNumOdd;
+	
 	private Integer libService;
 	
+	private Integer libServiceOdd;
+	
+	private Date changeTime;
+	
 	private Integer libServiceMonth;
 	
 	private Integer platformService;
@@ -428,4 +434,30 @@ public class Merchant extends BaseEntity {
 		this.startActiveTime = startActiveTime;
 	}
 
+	public Integer getLibServiceOdd() {
+		return libServiceOdd;
+	}
+
+	public void setLibServiceOdd(Integer libServiceOdd) {
+		this.libServiceOdd = libServiceOdd;
+	}
+
+	public Date getChangeTime() {
+		return changeTime;
+	}
+
+	public void setChangeTime(Date changeTime) {
+		this.changeTime = changeTime;
+	}
+
+	public Integer getPortNumOdd() {
+		return portNumOdd;
+	}
+
+	public void setPortNumOdd(Integer portNumOdd) {
+		this.portNumOdd = portNumOdd;
+	}
+	
+	
+
 }

src/main/java/com/ssj/dao/sys/imlibuser/dao/impl/TbClassQueryDaoImpl.java

@@ -25,10 +25,10 @@ public class TbClassQueryDaoImpl implements TbClassQueryDao {
 		List<Object> queryParams = new ArrayList<Object>();
 		selSql.append(" SELECT t.*    ");
 		selSql.append(" ,( SELECT COUNT(DISTINCT(v.id)) from tb_lib_vip v  where v.stat=1 AND v.lib_id=t.id  ) as student_num     ");
-		selSql.append(" ,( SELECT COUNT(DISTINCT(a.teacher_id)) from tb_class_teacher a  where a.status=1 and a.type=1 AND a.lib_id=t.id ) as teacher_num    ");
+		selSql.append(" ,( SELECT COUNT(a.teacher_id) from tb_class_teacher a  where a.status=1 and a.type=1 AND a.lib_id=t.id ) as teacher_num    ");
 		selSql.append(" ,( SELECT COUNT(DISTINCT(a.user_id)) from tb_lib_manager a  where a.state=1  AND a.type in (4) AND a.lib_id=t.id  ) as principal_num    ");
 		selSql.append(" ,( SELECT COUNT(DISTINCT(a.user_id)) from tb_lib_manager a  where a.state=1  AND a.type in (19) AND a.lib_id=t.id  ) as leader_num    ");
-		selSql.append(" ,( SELECT COUNT(DISTINCT(a.teacher_id)) from tb_class_teacher a  where a.status=1 and a.type=2 AND a.lib_id=t.id  ) as headmaster_num    ");
+		selSql.append(" ,( SELECT COUNT(a.teacher_id) from tb_class_teacher a  where a.status=1 and a.type=2 AND a.lib_id=t.id  ) as headmaster_num    ");
 		selSql.append(" ,IFNULL(( SELECT SUM(m.port_num) from fx_merchant m WHERE m.lib_id=t.id GROUP BY m.lib_id),0) as port_num ");
 		selSql.append(" from tb_lib_join t    ");
 		selSql.append(" where t.type=1    ");
@@ -140,7 +140,7 @@ public class TbClassQueryDaoImpl implements TbClassQueryDao {
 	public Page<Map<String, Object>> findHeadmasterByPage(Map<String, Object> searchParam, Pageable pageable) {
 		StringBuffer selSql = new StringBuffer();
 		List<Object> queryParams = new ArrayList<Object>();
-		selSql.append("  SELECT u.*,c.grade,c.class_name from tb_class_teacher t LEFT JOIN tb_user u ON t.teacher_id=u.id LEFT JOIN tb_class c ON t.class_id=c.id   ");
+		selSql.append("  SELECT u.*,c.grade,c.class_name,c.id as cid from tb_class_teacher t LEFT JOIN tb_user u ON t.teacher_id=u.id LEFT JOIN tb_class c ON t.class_id=c.id   ");
 		selSql.append("  where t.status=1 AND t.lib_id=?  ");
 		queryParams.add(searchParam.get("libId"));
 		if(!"".equals(searchParam.get("type"))){

src/main/java/com/ssj/service/sys/fx/service/impl/MerchantServiceImpl.java

@@ -1424,6 +1424,12 @@ public class MerchantServiceImpl extends BaseServiceImpl<Merchant, String> imple
 				boolean isServiceMonth=false;
 				Merchant oldmerchant =this.getById(merchant.getId());
 				
+				//发生了旧转新
+				if(oldmerchant.getSignType()==0) {
+					oldmerchant.setLibServiceOdd(oldmerchant.getLibService());
+					oldmerchant.setPortNumOdd(oldmerchant.getPortNum());
+					oldmerchant.setChangeTime(new Date());
+				}
 				if(StringUtils.isNotEmpty(merchant.getLibId())) {
 					Merchant libMerchant=this.getMerchantByLibId(merchant.getLibId());
 					if(libMerchant!=null && !libMerchant.getId().equals(merchant.getId())) {

src/main/java/com/ssj/service/sys/imlibuser/service/impl/TbClassStudentTempServiceImpl.java

@@ -289,27 +289,28 @@ public class TbClassStudentTempServiceImpl extends BaseServiceImpl<TbClassStuden
 					}
 				}
 				
-				
-				TbClass tbClass=tbClassService.getTbClassGradeByLibId(tbLibImStudentTemp.getLibId(),tbLibImStudentTemp.getGrade(), tbLibImStudentTemp.getClassName());
-				if(tbClass==null) {
-					tbClass=new TbClass();
-					tbClass.setLibId(tbLibImStudentTemp.getLibId());
-					tbClass.setClassName(tbLibImStudentTemp.getClassName());
-					tbClass.setGrade(tbLibImStudentTemp.getGrade());
-					tbClass.setCreateTime(new Date());
-					tbClass.setStatus(1);
-					tbClass=tbClassService.save(tbClass);
-				}
-				
-				TbClassStudent tbClassStudent=tbClassStudentService.getTbClassTeacherByVipId(tbClass.getId(), libVip.getId());
-				if(tbClassStudent==null) {
-					tbClassStudent=new TbClassStudent();
-					tbClassStudent.setLibId(libJoin.getId());	
-					tbClassStudent.setClassId(tbClass.getId());
-					tbClassStudent.setVipId(libVip.getId());
-					tbClassStudent.setStatus(1);
-					tbClassStudent.setCreateTime(new Date());
-					tbClassStudentService.save(tbClassStudent);
+				//没有班级信息的，不关联班级信息
+				if(StringUtils.isNotEmpty(tbLibImStudentTemp.getClassName())) {
+					TbClass tbClass=tbClassService.getTbClassGradeByLibId(tbLibImStudentTemp.getLibId(),tbLibImStudentTemp.getGrade(), tbLibImStudentTemp.getClassName());
+					if(tbClass==null) {
+						tbClass=new TbClass();
+						tbClass.setLibId(tbLibImStudentTemp.getLibId());
+						tbClass.setClassName(tbLibImStudentTemp.getClassName());
+						tbClass.setGrade(tbLibImStudentTemp.getGrade());
+						tbClass.setCreateTime(new Date());
+						tbClass.setStatus(1);
+						tbClass=tbClassService.save(tbClass);
+					}
+					TbClassStudent tbClassStudent=tbClassStudentService.getTbClassTeacherByVipId(tbClass.getId(), libVip.getId());
+					if(tbClassStudent==null) {
+						tbClassStudent=new TbClassStudent();
+						tbClassStudent.setLibId(libJoin.getId());	
+						tbClassStudent.setClassId(tbClass.getId());
+						tbClassStudent.setVipId(libVip.getId());
+						tbClassStudent.setStatus(1);
+						tbClassStudent.setCreateTime(new Date());
+						tbClassStudentService.save(tbClassStudent);
+					}
 				}
 
 				//给学生增加一个默认的永久校区批改服务

src/main/java/com/ssj/service/sys/imlibuser/service/impl/TbClassTeacherTempServiceImpl.java

@@ -216,41 +216,44 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 				}
 				
 				//导入了自批改老师，平台老师老师设置为无效
-//				List<TbLibManager> platformTbLibManagers=managerService.findByUserIdAndTypeInAndState(user.getId(),new int[]{8, 11, 12, 13, 14},1);
-//				if(platformTbLibManagers!=null && platformTbLibManagers.size()>0) {
-//					for (TbLibManager platformTbLibManager : platformTbLibManagers) {
-//						platformTbLibManager.setState(2);
-//					}
-//					managerService.save(platformTbLibManagers);	
-//				}
-				
-				TbClass tbClass=tbClassService.getTbClassGradeByLibId(tbLibImTeacherTemp.getLibId(),tbLibImTeacherTemp.getGrade(), tbLibImTeacherTemp.getClassName());
-				if(tbClass==null) {
-					tbClass=new TbClass();
-					tbClass.setLibId(tbLibImTeacherTemp.getLibId());
-					tbClass.setClassName(tbLibImTeacherTemp.getClassName());
-					tbClass.setGrade(tbLibImTeacherTemp.getGrade());
-					tbClass.setCreateTime(new Date());
-					tbClass.setStatus(1);
-					tbClass=tbClassService.save(tbClass);
+				List<TbLibManager> platformTbLibManagers=managerService.findByUserIdAndTypeInAndState(user.getId(),new int[]{8, 11, 12, 13, 14},1);
+				if(platformTbLibManagers!=null && platformTbLibManagers.size()>0) {
+					for (TbLibManager platformTbLibManager : platformTbLibManagers) {
+						platformTbLibManager.setState(2);
+					}
+					managerService.save(platformTbLibManagers);	
 				}
 				
-				TbClassTeacher tbClassTeacher=tbClassTeacherService.getTbLibImTeacherByClassIdAndType(tbClass.getId(),user.getId(),1);
-				if(tbClassTeacher==null) {
-					tbClassTeacher=new TbClassTeacher();
-					tbClassTeacher.setClassId(tbClass.getId());
-					tbClassTeacher.setLibId(libJoin.getId());
-					tbClassTeacher.setType(1);
-					tbClassTeacher.setStatus(1);
-					tbClassTeacher.setCreateTime(new Date());
-					tbClassTeacher.setTeacherId(user.getId());
-					tbClassTeacherService.save(tbClassTeacher);
-				}else {
-					tbLibImTeacherTemp.setTeacherId(user.getId());
-					tbLibImTeacherTemp.setStatus(0);
-					tbLibImTeacherTemp.setErrorReason("与平台已有老师信息冲突");
-					this.save(tbLibImTeacherTemp);
-					return 0;
+				//没有班级信息的，不关联班级信息
+				if(StringUtils.isNotEmpty(tbLibImTeacherTemp.getClassName())) {
+					TbClass tbClass=tbClassService.getTbClassGradeByLibId(tbLibImTeacherTemp.getLibId(),tbLibImTeacherTemp.getGrade(), tbLibImTeacherTemp.getClassName());
+					if(tbClass==null) {
+						tbClass=new TbClass();
+						tbClass.setLibId(tbLibImTeacherTemp.getLibId());
+						tbClass.setClassName(tbLibImTeacherTemp.getClassName());
+						tbClass.setGrade(tbLibImTeacherTemp.getGrade());
+						tbClass.setCreateTime(new Date());
+						tbClass.setStatus(1);
+						tbClass=tbClassService.save(tbClass);
+					}
+					
+					TbClassTeacher tbClassTeacher=tbClassTeacherService.getTbLibImTeacherByClassIdAndType(tbClass.getId(),user.getId(),1);
+					if(tbClassTeacher==null) {
+						tbClassTeacher=new TbClassTeacher();
+						tbClassTeacher.setClassId(tbClass.getId());
+						tbClassTeacher.setLibId(libJoin.getId());
+						tbClassTeacher.setType(1);
+						tbClassTeacher.setStatus(1);
+						tbClassTeacher.setCreateTime(new Date());
+						tbClassTeacher.setTeacherId(user.getId());
+						tbClassTeacherService.save(tbClassTeacher);
+					}else {
+						tbLibImTeacherTemp.setTeacherId(user.getId());
+						tbLibImTeacherTemp.setStatus(0);
+						tbLibImTeacherTemp.setErrorReason("与平台已有老师信息冲突");
+						this.save(tbLibImTeacherTemp);
+						return 0;
+					}
 				}
 				
 			} catch (Exception e) {
@@ -557,7 +560,7 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 				tbLibImTeacherTemp.setTeacherId(user.getId());
 				
 				//如果之前有这个老师的，就统一使用用旧老师的名称，如果没有就使用新的名称。
-				TbClass tbClass=tbClassService.getTbClassGradeByLibId(tbLibImTeacherTemp.getLibId(),tbLibImTeacherTemp.getGrade(), tbLibImTeacherTemp.getSubject());
+				TbClass tbClass=tbClassService.getTbClassGradeByLibId(tbLibImTeacherTemp.getLibId(),tbLibImTeacherTemp.getGrade(), tbLibImTeacherTemp.getClassName());
 				if(tbClass==null) {
 					tbClass=new TbClass();
 					tbClass.setLibId(tbLibImTeacherTemp.getLibId());

src/main/java/com/ssj/sys/controller/ImLibUserController.java

@@ -35,6 +35,7 @@ import org.springframework.web.multipart.MultipartFile;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.imlibuser.TbClassStudent;
 import com.ssj.bean.sys.imlibuser.TbClassStudentTemp;
+import com.ssj.bean.sys.imlibuser.TbClassTeacher;
 import com.ssj.bean.sys.imlibuser.TbClassTeacherTemp;
 import com.ssj.bean.weixin.libmy.domain.LibVip;
 import com.ssj.bean.weixin.libmy.domain.TbLibJoin;
@@ -48,9 +49,7 @@ import com.ssj.framework.core.util.Constant;
 import com.ssj.framework.core.util.ResponseConstant;
 import com.ssj.framework.core.util.ResponseEntity;
 import com.ssj.service.conch.common.service.ConchCommonService;
-import com.ssj.service.conch.parents.v2.service.ParentV2Service;
 import com.ssj.service.sys.easemob.service.EasemobService;
-import com.ssj.service.sys.imlibuser.service.TbClassService;
 import com.ssj.service.sys.imlibuser.service.TbClassStudentService;
 import com.ssj.service.sys.imlibuser.service.TbClassStudentTempService;
 import com.ssj.service.sys.imlibuser.service.TbClassTeacherService;
@@ -234,46 +233,6 @@ public class ImLibUserController extends BaseController {
 					if(map.containsKey("data_8")){
 						tbLibImStudentTemp.setDerver(map.get("data_8"));
 					}
-//					tbLibImStudentTemp.setCorrectType(1);
-//					if(map.containsKey("data_8")){
-//						String correctType=map.getOrDefault("data_8","");
-//						switch (correctType.trim()) {
-//						case "平台":
-//							tbLibImStudentTemp.setCorrectType(1);
-//							break;
-//						case "机构":
-//							tbLibImStudentTemp.setCorrectType(2);
-//							break;
-//						case "家长":
-//							tbLibImStudentTemp.setCorrectType(3);
-//							break;
-//						default:
-//							tbLibImStudentTemp.setCorrectType(1);
-//							break;
-//						}
-//					}
-//					if(map.containsKey("data_9")){
-//						String startTime=map.getOrDefault("data_9","");
-//						if(StringUtils.isNotEmpty(startTime))
-//						tbLibImStudentTemp.setStartTime(DateHelper.parseDate(map.get("data_9"), "yyyy/MM/dd HH:mm:ss"));	
-//					}
-//					if(map.containsKey("data_10")){
-//						String serviceNum=map.getOrDefault("data_10","");
-//						if(StringUtils.isNotEmpty(serviceNum))
-//						tbLibImStudentTemp.setServiceNum(Integer.parseInt(serviceNum.trim()));	
-//					}
-//					tbLibImStudentTemp.setTakeType(2);
-//					if(map.containsKey("data_11")){
-//						String correctType=map.getOrDefault("data_11","");
-//						switch (correctType.trim()) {
-//						case "是":
-//							tbLibImStudentTemp.setTakeType(1);
-//							break;
-//						default:
-//							tbLibImStudentTemp.setTakeType(2);
-//							break;
-//						}
-//					}
 					
 					tbLibImStudentTemps.add(tbLibImStudentTemp);
 					
@@ -282,11 +241,11 @@ public class ImLibUserController extends BaseController {
 						iserror=true;
 						break;
 					}
-					if(StringUtils.isEmpty(tbLibImStudentTemp.getGrade())){
-						response.failure("年级不能为空");
-						iserror=true;
-						break;
-					}
+//					if(StringUtils.isEmpty(tbLibImStudentTemp.getGrade())){
+//						response.failure("年级不能为空");
+//						iserror=true;
+//						break;
+//					}
 					if(StringUtils.isEmpty(tbLibImStudentTemp.getLeagueName())){
 						response.failure("机构不能为空");
 						iserror=true;
@@ -312,17 +271,6 @@ public class ImLibUserController extends BaseController {
 						iserror=true;
 						break;
 					}
-					
-//					if(tbLibImStudentTemp.getStartTime()!=null && tbLibImStudentTemp.getServiceNum()==null){
-//						response.failure("开始时间与服务月份，不能单一为空");
-//						iserror=true;
-//						break;
-//					}
-//					if(tbLibImStudentTemp.getStartTime()==null && tbLibImStudentTemp.getServiceNum()!=null){
-//						response.failure("开始时间与服务月份，不能单一为空");
-//						iserror=true;
-//						break;
-//					}
 				}
 				if(!iserror){
 					int successNum=tbLibImStudentTempService.insertBatchTbClassStudent(tbLibImStudentTemps);
@@ -738,16 +686,16 @@ public class ImLibUserController extends BaseController {
 						iserror=true;
 						break;
 					}
-					if(StringUtils.isEmpty(tbLibImTeacherTemp.getClassName())){
-						response.failure("学校班级不能为空");
-						iserror=true;
-						break;
-					}
-					if(StringUtils.isEmpty(tbLibImTeacherTemp.getGrade())){
-						response.failure("老师年级不能为空");
-						iserror=true;
-						break;
-					}
+//					if(StringUtils.isEmpty(tbLibImTeacherTemp.getClassName())){
+//						response.failure("学校班级不能为空");
+//						iserror=true;
+//						break;
+//					}
+//					if(StringUtils.isEmpty(tbLibImTeacherTemp.getGrade())){
+//						response.failure("老师年级不能为空");
+//						iserror=true;
+//						break;
+//					}
 					if(StringUtils.isEmpty(tbLibImTeacherTemp.getTeacherName())){
 						response.failure("老师姓名不能为空");
 						iserror=true;
@@ -912,7 +860,7 @@ public class ImLibUserController extends BaseController {
 					tbLibImTeacherTemp.setTeacherName(map.get("data_1"));
 					tbLibImTeacherTemp.setTeacherPhone(map.get("data_2"));
 					tbLibImTeacherTemp.setGrade(map.get("data_3"));
-					tbLibImTeacherTemp.setSubject(map.get("data_4"));
+					tbLibImTeacherTemp.setClassName(map.get("data_4"));
 					tbLibImTeacherTemps.add(tbLibImTeacherTemp);
 					
 					if(StringUtils.isEmpty(tbLibImTeacherTemp.getLeagueName())){
@@ -935,7 +883,7 @@ public class ImLibUserController extends BaseController {
 						iserror=true;
 						break;
 					}
-					if(StringUtils.isEmpty(tbLibImTeacherTemp.getSubject())){
+					if(StringUtils.isEmpty(tbLibImTeacherTemp.getClassName())){
 						response.failure("班级名称不能为空");
 						iserror=true;
 						break;
@@ -1153,14 +1101,66 @@ public class ImLibUserController extends BaseController {
 	
 	
 	//删除老师，解除关联
-	@RequestMapping(value="/teacher/data/del/{libId}/{teacherId}")
+	@RequestMapping(value="/teacher/data/del/{libId}/{teacherId}/{classId}")
+	@ResponseBody
+	public Response teacherDel(Model model,@PathVariable String libId,@PathVariable String teacherId,@PathVariable String classId) {
+		Response response = new  Response();
+		try {
+//			bookManagerService.saveTbLibManagerListStatus(libId,teacherId, new int[]{Constant.LIB_TEACHER_TYPE,
+//	                Constant.ORG_TEACHER_TYPE, Constant.TEACHER_TYPE}, 2);
+//	        tbClassTeacherService.saveTbClassTeacherStatusByLibId(libId, teacherId, 0);
+			
+			TbClassTeacher tbClassTeacher=tbClassTeacherService.getTbLibImTeacherByClassIdAndType(classId, teacherId,1);
+			tbClassTeacher.setStatus(0);
+			tbClassTeacherService.save(tbClassTeacher);
+			
+	        response.success("删除成功");
+		} catch (Exception e) {
+			 response.failure("删除失败");
+		}
+		return response;
+	}	
+	
+	
+	
+	//删除校长，解除关联
+	@RequestMapping(value="/principal/data/del/{libId}/{teacherId}")
+	@ResponseBody
+	public Response principalDel(Model model,@PathVariable String libId,@PathVariable String teacherId) {
+		Response response = new  Response();
+		try {
+			bookManagerService.saveTbLibManagerListStatus(libId,teacherId, new int[]{Constant.CURATOR}, 2);
+	        response.success("删除成功");
+		} catch (Exception e) {
+			 response.failure("删除失败");
+		}
+		return response;
+	}	
+	
+	//删除科目组长，解除关联
+	@RequestMapping(value="/leader/data/del/{libId}/{teacherId}")
+	@ResponseBody
+	public Response leaderDel(Model model,@PathVariable String libId,@PathVariable String teacherId) {
+		Response response = new  Response();
+		try {
+			bookManagerService.saveTbLibManagerListStatus(libId,teacherId, new int[]{Constant.LEADER}, 2);
+	        response.success("删除成功");
+		} catch (Exception e) {
+			 response.failure("删除失败");
+		}
+		return response;
+	}	
+	
+	
+	//删除班主任，解除关联
+	@RequestMapping(value="/headmaster/data/del/{libId}/{teacherId}/{classId}")
 	@ResponseBody
-	public Response teacherDel(Model model,@PathVariable String libId,@PathVariable String teacherId) {
+	public Response headmasterDel(Model model,@PathVariable String libId,@PathVariable String teacherId,@PathVariable String classId) {
 		Response response = new  Response();
 		try {
-			bookManagerService.saveTbLibManagerListStatus(libId,teacherId, new int[]{Constant.LIB_TEACHER_TYPE,
-	                Constant.ORG_TEACHER_TYPE, Constant.TEACHER_TYPE}, 2);
-	        tbClassTeacherService.saveTbClassTeacherStatusByLibId(libId, teacherId, 0);
+			TbClassTeacher tbClassTeacher=tbClassTeacherService.getTbLibImTeacherByClassIdAndType(classId, teacherId, 2);
+			tbClassTeacher.setStatus(0);
+			tbClassTeacherService.save(tbClassTeacher);
 	        response.success("删除成功");
 		} catch (Exception e) {
 			 response.failure("删除失败");

src/main/resources/templates/sys/fx/merchantAllList.html

@@ -186,6 +186,7 @@
 		    	<th >商户模式 </th>
 		    	<th style="width: 60px;">签约端口数量</th>
 		    	<th style="width: 60px;">服务人数/塾币</th>
+		    	<th style="width: 60px;">旧转新余币</th>
 		    	<th style="width: 60px;">平台塾币</th>
 		    	<th style="max-width: 160px;" >合同日期</th>
 		    	<th>充值/已结算(月份)</th>
@@ -233,6 +234,7 @@
 					
 					<td  th:text="${item.portNum}"></td>
 					<td  th:text="${item.libService}"></td>
+					<td  th:text="${item.libServiceOdd}"></td>
 					<td  th:text="${item.platformService}"></td>
 					
 					

src/main/resources/templates/sys/imlibuser/headmasterList.html

@@ -79,7 +79,9 @@
 <!-- 					<a th:if="${item.is_correct!=1}" th:href="${'javascript:teacherIsCorrectSave(''' + item.user_id + ''',1)'}"  class="tablelink">设置批改</a> -->
 <!-- 				</td> -->
 				<td>
-<!-- 					<a th:href="${'javascript:teacherDel(''' + item.user_id + ''')'}"  class="tablelink">删除老师</a> -->
+					<a th:if="${search.get('type')=='1'}" th:href="${'javascript:teacherDel(''' + item.id + ''',''' + item.cid + ''')'}"  class="tablelink">删除科任老师</a>
+					<a th:if="${search.get('type')=='2'}" th:href="${'javascript:headmasterDel(''' + item.id + ''',''' + item.cid + ''')'}"  class="tablelink">删除班主任</a>
+					
 				</td>
 			</tr>
 		</tbody>
@@ -116,11 +118,11 @@ $("#exbutton").on('click',function(){
 		});
 	}
 
-	function teacherDel(teacherId){
-		parent.layer.confirm("您确定要删除老师关联?", {
+	function teacherDel(teacherId,classId){
+		parent.layer.confirm("您确定要删除科任老师?", {
 			icon: 4, btn: ['确定','关闭'],offset: '100px' //按钮
 		}, function(){
-			var url="[[${sysUrl}]]/sys/imlibuser/teacher/data/del/[[${tbLibJoin.id}]]/"+teacherId;
+			var url="[[${sysUrl}]]/sys/imlibuser/teacher/data/del/[[${tbLibJoin.id}]]/"+teacherId+'/'+classId;
 			var params ={};
 			$.post(url,params,function(data){
 				if(data.meta.success){
@@ -134,6 +136,29 @@ $("#exbutton").on('click',function(){
 	}
 	
 	
+	function headmasterDel(teacherId,classId){
+		parent.layer.confirm("您确定要删除班主任?", {
+			icon: 4, btn: ['确定','关闭'],offset: '100px' //按钮
+		}, function(){
+			var url="[[${sysUrl}]]/sys/imlibuser/headmaster/data/del/[[${tbLibJoin.id}]]/"+teacherId+'/'+classId;
+			var params ={};
+			$.post(url,params,function(data){
+				if(data.meta.success){
+					parent.layer.msg("删除成功",{icon:1});
+					location.reload();
+				}else{
+					parent.layer.msg(data.meta.message,{icon:11});
+				}
+			});
+		});
+	}
+	
+	
+	
+	
+	
+	
+	
 	function teacherIsCorrectSave(teacherId,isCorrect){
 		var title="";
 		if(isCorrect==1){

src/main/resources/templates/sys/imlibuser/teacherList.html

@@ -81,7 +81,8 @@
 <!-- 					<a th:if="${item.is_correct!=1}" th:href="${'javascript:teacherIsCorrectSave(''' + item.user_id + ''',1)'}"  class="tablelink">设置批改</a> -->
 <!-- 				</td> -->
 				<td>
-<!-- 					<a th:href="${'javascript:teacherDel(''' + item.user_id + ''')'}"  class="tablelink">删除老师</a> -->
+					<a th:if="${search.get('type')=='1'}" th:href="${'javascript:principalDel(''' + item.user_id + ''')'}"  class="tablelink">删除校长</a>
+					<a th:if="${search.get('type')=='2'}" th:href="${'javascript:leaderDel(''' + item.user_id + ''')'}"  class="tablelink">删除科目组长</a>
 				</td>
 			</tr>
 		</tbody>
@@ -135,6 +136,43 @@ $("#exbutton").on('click',function(){
 		});
 	}
 	
+
+	function principalDel(teacherId){
+		parent.layer.confirm("您确定要删除校长关联?", {
+			icon: 4, btn: ['确定','关闭'],offset: '100px' //按钮
+		}, function(){
+			var url="[[${sysUrl}]]/sys/imlibuser//principal/data/del/[[${tbLibJoin.id}]]/"+teacherId;
+			var params ={};
+			$.post(url,params,function(data){
+				if(data.meta.success){
+					parent.layer.msg("删除成功",{icon:1});
+					location.reload();
+				}else{
+					parent.layer.msg(data.meta.message,{icon:11});
+				}
+			});
+		});
+	}
+	
+	
+
+	function leaderDel(teacherId){
+		parent.layer.confirm("您确定要删除科目组长关联?", {
+			icon: 4, btn: ['确定','关闭'],offset: '100px' //按钮
+		}, function(){
+			var url="[[${sysUrl}]]/sys/imlibuser/leader/data/del/[[${tbLibJoin.id}]]/"+teacherId;
+			var params ={};
+			$.post(url,params,function(data){
+				if(data.meta.success){
+					parent.layer.msg("删除成功",{icon:1});
+					location.reload();
+				}else{
+					parent.layer.msg(data.meta.message,{icon:11});
+				}
+			});
+		});
+	}
+	
 	
 	function teacherIsCorrectSave(teacherId,isCorrect){
 		var title="";