7 months ago · 5633a5ca26
--- a/WebRoot/ymfz/index.html
+++ b/WebRoot/ymfz/index.html
@@ -2,7 +2,7 @@
 
															 <head>
														
 
															 <meta charset="utf-8">
														
 
															 <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
														
 
															-<title>中央美术学院</title>
														
 
															+<title>附中优秀人才选拔考试</title>
														
 
															 <link rel="stylesheet" href="//lib.baomitu.com/weui/2.1.3/style/weui.min.css">
														
 
															 <!--  -->
														
 
															 <link rel="stylesheet" href="//lib.baomitu.com/jquery-weui/1.2.1/css/jquery-weui.min.css">
														
--- a/WebRoot/ymfz/js/angular.tabbar.js
+++ b/WebRoot/ymfz/js/angular.tabbar.js
@@ -2,7 +2,7 @@ app.controller('TabbarCtrl', [ '$rootScope', '$scope', '$timeout', '$location',
 
															 	$scope.FuncMap = {
														
 
															 		'me' : [ {
														
 
															 			text : '个人信息',
														
 
															-			url : 'std/cert'
														
 
															+			url : 'std/info'
														
 
															 		}, /*{
														
 
															 			text : '通讯地址',
														
 
															 			url : 'std/info'
														
--- a/WebRoot/ymfz/routes/std/material/std_material.html
+++ b/WebRoot/ymfz/routes/std/material/std_material.html
@@ -37,4 +37,9 @@
 
															 		</div>
														
 
															 	</div>
														
 
															+
														
 
															+	<div class="button-sp-area">
														
 
															+		<a href="javascript:void(0);" class="weui-btn weui-btn_primary" ng-click="goWechat()">首页</a>
														
 
															+	</div>
														
 
															+
														
 
															 </div>
														
--- a/src/cn/hmsoft/art/control/ex/interview/ExamInterviewExportControl.java
+++ b/src/cn/hmsoft/art/control/ex/interview/ExamInterviewExportControl.java
@@ -466,7 +466,7 @@ public class ExamInterviewExportControl extends ArtControl {
 
															 					for (int i = 1; i < cols.length; i++) {
														
 
															 						cols[i] = 15	/1;
														
 
															 					}
														
 
															-				} else if(ArtParamHelper.SchoolCode.equals("10047")) {
														
 
															+				} else if(ArtParamHelper.SchoolCode.equals("10047") || ArtParamHelper.SchoolCode.equals("10047FZ")) {
														
 
															 					subjectList = filterSubject(subjectArray);
														
 
															 					cols = new float[1 + subjectList.size()];
														
 
															 					cols[0] =1f;
														
@@ -500,7 +500,7 @@ public class ExamInterviewExportControl extends ArtControl {
 
															 			if (ArtParamHelper.SchoolCode.equals("11524")) {
														
 
															 				table.addCell(new Cell().add(group.getGroup_name()).setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(10));
														
 
															 			}else {
														
 
															-				if(ArtParamHelper.SchoolCode.equals("10047")) {
														
 
															+				if(ArtParamHelper.SchoolCode.equals("10047") || ArtParamHelper.SchoolCode.equals("10047FZ")) {
														
 
															 					//List<CfSubject> subjectList = filterSubject(subjectArray);
														
 
															 					for (CfSubject cfSubject : subjectList) {
														
 
															 						table.addCell(new Cell().add(cfSubject.getSubject_name()).setTextAlignment(TextAlignment.CENTER).setVerticalAlignment(VerticalAlignment.MIDDLE).setFontSize(10));
														
--- a/src/cn/hmsoft/art/enrol/helper/EnrolMaterialHelper.java
+++ b/src/cn/hmsoft/art/enrol/helper/EnrolMaterialHelper.java
@@ -171,7 +171,7 @@ public class EnrolMaterialHelper {
 
															 					}
														
 
															 				}
														
 
															 				if (curMaterial == null || !curMaterial.containsKey("material_id"))
														
 
															-					if(ArtParamHelper.SchoolCode.equals("10047")) {
														
 
															+					if(ArtParamHelper.SchoolCode.equals("10047") || ArtParamHelper.SchoolCode.equals("10047FZ")) {
														
 
															 						throw new BusinessException("请在【我的->报考材料】，完善报考材料。");
														
 
															 					} else {
														
 
															 						throw new BusinessException("请在【我的->报考材料】上传【" + conf.getMaterial_name() + "】，完善报考材料。");
														
@@ -245,7 +245,7 @@ public class EnrolMaterialHelper {
 
															 				}
														
 
															 			}
														
 
															 			if (curMaterial == null || !curMaterial.containsKey("material_id"))
														
 
															-				if(ArtParamHelper.SchoolCode.equals("10047")) {
														
 
															+				if(ArtParamHelper.SchoolCode.equals("10047") || ArtParamHelper.SchoolCode.equals("10047FZ")) {
														
 
															 					throw new BusinessException("请在【我的->报考材料】，完善报考材料。");
														
 
															 				} else {
														
 
															 					throw new BusinessException("请在【我的->报考材料】上传【" + conf.getMaterial_name() + "】，完善报考材料。");
														
--- a/src/cn/hmsoft/art/enrol/service/EnrolStdInfoService.java
+++ b/src/cn/hmsoft/art/enrol/service/EnrolStdInfoService.java
@@ -68,7 +68,7 @@ public class EnrolStdInfoService {
 
															 		s.setLink_city(std.getLink_city());
														
 
															 		s.setStd_type(std.getStd_type());
														
 
															 		//央美特殊处理
														
 
															-		if(ArtParamHelper.SchoolCode.equals("10047")) {
														
 
															+		if(ArtParamHelper.SchoolCode.equals("10047") || ArtParamHelper.SchoolCode.equals("10047FZ") ) {
														
 
															 			s.setEnd_date(std.getEnd_date());
														
 
															 			s.setStd_political(std.getStd_political());
														
 
															 			s.setEmail(std.getEmail());
														
@@ -85,7 +85,7 @@ public class EnrolStdInfoService {
 
															 			throw new BusinessException("考生手机号码不允许为空，请填写");
														
 
															 		}
														
 
															 		if (StringHelper.isEmpty(std.getLink_mobile())){
														
 
															-			if(ArtParamHelper.SchoolCode.equals("10047")) {
														
 
															+			if(ArtParamHelper.SchoolCode.equals("10047") || ArtParamHelper.SchoolCode.equals("10047FZ")) {
														
 
															 				throw new BusinessException("紧急联系人手机号不允许为空，请填写");
														
 
															 			} else {
														
 
															 				throw new BusinessException("备用电话不允许为空，请填写");
														
@@ -96,13 +96,15 @@ public class EnrolStdInfoService {
 
															 		if(StringHelper.isNotEmpty(std.getStd_province()) && Integer.parseInt(std.getStd_province()) < 70) {
														
 
															 			FrameAssertUtil.verifyRegex(ArtRegexHelper.MobileTel, std.getStd_mobile(), "请输入正确的考生手机号码");
														
 
															 		}
														
 
															-		
														
 
															+
														
 
															 		//央美去掉验证
														
 
															-		if (!ArtParamHelper.SchoolCode.equals("10047") && StringHelper.isNotEmpty(s.getLink_mobile()) && StringHelper.isNotEmpty(std.getStd_province())
														
 
															-				&& Integer.parseInt(std.getStd_province()) < 70 )
														
 
															+		if (!ArtParamHelper.SchoolCode.equals("10047") && !ArtParamHelper.SchoolCode.equals("10047FZ") && StringHelper.isNotEmpty(s.getLink_mobile())
														
 
															+				&& StringHelper.isNotEmpty(std.getStd_province())
														
 
															+				&& Integer.parseInt(std.getStd_province()) < 70)
														
 
															 			FrameAssertUtil.verifyRegex(ArtRegexHelper.MobileTel, std.getLink_mobile(), "请输入正确的备用手机号码");
														
 
															 		//家长联系方式-央美单独处理
														
 
															-		if (ArtParamHelper.SchoolCode.equals("10047") && StringHelper.isNotEmpty(s.getLink_mobile()) && StringHelper.isNotEmpty(std.getStd_province()))
														
 
															+		if ((ArtParamHelper.SchoolCode.equals("10047") || ArtParamHelper.SchoolCode.equals("10047FZ")) && StringHelper.isNotEmpty(s.getLink_mobile())
														
 
															+				&& StringHelper.isNotEmpty(std.getStd_province()))
														
 
															 				//&& Integer.parseInt(std.getStd_province()) < 70
														
 
															 		  {
														
 
															 			String[] arr = s.getLink_mobile().split(";");