导入

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

@@ -136,7 +136,6 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 				}
 				
 				//如果之前有这个老师的，就统一使用用旧老师的名称，如果没有就使用新的名称。
-				String name=tbLibImTeacherTemp.getTeacherName();
 				TbLibManager tbLibManager=managerService.findAllByUserIdAndTypeAndState(user.getId(),Constant.TEACHER_TYPE,1);
 				if(tbLibManager==null){//有老师user，生成type=2的老师
 					tbLibManager=new TbLibManager();
@@ -144,7 +143,7 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 					tbLibManager.setUserId(user.getId());
 					tbLibManager.setType(Constant.TEACHER_TYPE);
 					tbLibManager.setCreateTime(new Date());
-					tbLibManager.setName(name);
+					tbLibManager.setName(tbLibImTeacherTemp.getTeacherName());
 					tbLibManager.setTelephone(tbLibImTeacherTemp.getTeacherPhone());
 					tbLibManager.setCourseName(tbLibImTeacherTemp.getSubject());
 					if(StringUtils.isEmpty(tbLibImTeacherTemp.getSubject())) {
@@ -161,8 +160,6 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 					}
 					tbLibManager.setState(1);
 					tbLibManager=managerService.save(tbLibManager);
-				}else {
-					name=tbLibManager.getName();
 				}
 				
 				
@@ -173,7 +170,7 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 					tbLibManager1.setUserId(user.getId());
 					tbLibManager1.setType(Constant.LIB_TEACHER_TYPE);
 					tbLibManager1.setCreateTime(new Date());
-					tbLibManager1.setName(name);
+					tbLibManager1.setName(tbLibImTeacherTemp.getTeacherName());
 					tbLibManager1.setTelephone(tbLibImTeacherTemp.getTeacherPhone());
 					tbLibManager1.setCourseName(tbLibImTeacherTemp.getSubject());
 					if(StringUtils.isEmpty(tbLibImTeacherTemp.getSubject())) {
@@ -189,15 +186,9 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 						tbLibManager1.setIsCorrect(0);
 					}
 					tbLibManager1.setState(1);
-				}else {
-					tbLibImTeacherTemp.setTeacherId(user.getId());
-					tbLibImTeacherTemp.setStatus(0);
-					tbLibImTeacherTemp.setErrorReason("与平台已有老师信息冲突");
-					this.save(tbLibImTeacherTemp);
-					return 0;
+					managerService.save(tbLibManager1);
 				}
 				
-				
 				TbLibManager tbLibManager2=managerService.findAllByUserIdAndTypeAndState(tbLibImTeacherTemp.getLibId(),user.getId(), Constant.ORG_TEACHER_TYPE,1);
 				if(tbLibManager2==null){//有老师user，生成type=10的老师
 					tbLibManager2=new TbLibManager();
@@ -205,7 +196,7 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 					tbLibManager2.setUserId(user.getId());
 					tbLibManager2.setType(Constant.ORG_TEACHER_TYPE);
 					tbLibManager2.setCreateTime(new Date());
-					tbLibManager2.setName(name);
+					tbLibManager2.setName(tbLibImTeacherTemp.getTeacherName());
 					tbLibManager2.setTelephone(tbLibImTeacherTemp.getTeacherPhone());
 					tbLibManager2.setCourseName(tbLibImTeacherTemp.getSubject());
 					if(StringUtils.isEmpty(tbLibImTeacherTemp.getSubject())) {
@@ -221,26 +212,17 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 						tbLibManager2.setIsCorrect(0);
 					}
 					tbLibManager2.setState(1);
-					
-				}else {
-					tbLibImTeacherTemp.setTeacherId(user.getId());
-					tbLibImTeacherTemp.setStatus(0);
-					tbLibImTeacherTemp.setErrorReason("与平台已有老师信息冲突");
-					this.save(tbLibImTeacherTemp);
-					return 0;
+					managerService.save(tbLibManager2);
 				}
 				
-				tbLibManager1=managerService.save(tbLibManager1);
-				tbLibManager2=managerService.save(tbLibManager2);
-				
 				//导入了自批改老师，平台老师老师设置为无效
-				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);	
-				}
+//				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) {
@@ -263,6 +245,12 @@ public class TbClassTeacherTempServiceImpl extends BaseServiceImpl<TbClassTeache
 					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) {

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

@@ -724,14 +724,11 @@ public class ImLibUserController extends BaseController {
 				for (Map<String,String> map : datas) {
 					tbLibImTeacherTemp=new TbClassTeacherTemp();
 					tbLibImTeacherTemp.setLeagueName(map.get("data_0"));
-//					tbLibImTeacherTemp.setSchool(map.get("data_1"));
-//					tbLibImTeacherTemp.setGrade(map.get("data_2"));
 					tbLibImTeacherTemp.setTeacherName(map.get("data_1"));
-					tbLibImTeacherTemp.setSubject(map.get("data_2"));
-					tbLibImTeacherTemp.setTeacherPhone(map.get("data_3"));
-					tbLibImTeacherTemp.setGrade(map.get("data_4"));
-					tbLibImTeacherTemp.setClassName(map.get("data_5"));
-					tbLibImTeacherTemp.setSubject(map.get("data_6"));
+					tbLibImTeacherTemp.setTeacherPhone(map.get("data_2"));
+					tbLibImTeacherTemp.setGrade(map.get("data_3"));
+					tbLibImTeacherTemp.setClassName(map.get("data_4"));
+					tbLibImTeacherTemp.setSubject(map.get("data_5"));
 					tbLibImTeacherTemp.setIsCorrect(1);
 					
 					tbLibImTeacherTemps.add(tbLibImTeacherTemp);
@@ -741,16 +738,16 @@ public class ImLibUserController extends BaseController {
 						iserror=true;
 						break;
 					}
-//					if(StringUtils.isEmpty(tbLibImTeacherTemp.getSchool())){
-//						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;
@@ -897,7 +894,7 @@ public class ImLibUserController extends BaseController {
 	}	
 	
 	
-	//科目组长导入
+	//班主任导入
 	@RequestMapping(value="/headmaster/import")
 	@ResponseBody
 	public Response headmasterImput(Model model,@RequestParam("file") MultipartFile file) {

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

@@ -80,23 +80,23 @@
 	    
 	    
 	     <li>
-		  <a th:href="@{/static/sys/excel/principal_lib .xlsx}"><input type="button" style="background: #ccc no-repeat center;width: 100px;height: 30px"  class="scbtn" value="校长模板" /></a>
+		  <a th:href="@{/static/sys/excel/principal_lib .xlsx?1}"><input type="button" style="background: #ccc no-repeat center;width: 100px;height: 30px"  class="scbtn" value="校长模板" /></a>
 	    </li>
 	    
 	     <li>
-		  <a th:href="@{/static/sys/excel/leader_lib .xlsx}"><input type="button" style="background: #ccc no-repeat center;width: 100px;height: 30px"  class="scbtn" value="科目组长模板" /></a>
+		  <a th:href="@{/static/sys/excel/leader_lib .xlsx?1}"><input type="button" style="background: #ccc no-repeat center;width: 100px;height: 30px"  class="scbtn" value="科目组长模板" /></a>
 	    </li>
 	    
 	     <li>
-		  <a th:href="@{/static/sys/excel/headmaster_lib.xlsx}"><input type="button" style="background: #ccc no-repeat center;width: 100px;height: 30px"  class="scbtn" value="班主任模板" /></a>
+		  <a th:href="@{/static/sys/excel/headmaster_lib.xlsx?1}"><input type="button" style="background: #ccc no-repeat center;width: 100px;height: 30px"  class="scbtn" value="班主任模板" /></a>
 	    </li>
 	    
 	   <li>
-		  <a th:href="@{/static/sys/excel/teacher_lib.xlsx}"><input type="button" style="background: #ccc no-repeat center;width: 100px;height: 30px"  class="scbtn" value="科任老师模板" /></a>
+		  <a th:href="@{/static/sys/excel/teacher_lib.xlsx?1}"><input type="button" style="background: #ccc no-repeat center;width: 100px;height: 30px"  class="scbtn" value="科任老师模板" /></a>
 	    </li>
 	    
 	     <li>
-		  <a th:href="@{/static/sys/excel/student_lib.xlsx}"><input type="button" style="background: #ccc no-repeat center;width: 100px;height: 30px"  class="scbtn" value="学生模板" /></a>
+		  <a th:href="@{/static/sys/excel/student_lib.xlsx?1}"><input type="button" style="background: #ccc no-repeat center;width: 100px;height: 30px"  class="scbtn" value="学生模板" /></a>
 	    </li>
 	    
 <!-- 	     <li> -->