优化

WebRoot/ymbk/routes/main/main.html

@@ -34,7 +34,10 @@
 						
 						<p class="weui-media-box__desc" ng-if="false&&e.teach_college && e.teach_college.length>0">{{getParamValue('EnrolAspectTeachCollegeText','教学院区')}}：{{e.teach_college}}</p>
 					</div>
-					<a href="javascript:void(0);" class="weui-btn weui-btn weui-btn_default "  ng-click="goEnrol(e)">查看详情</a>
+					<a href="javascript:void(0);" class="weui-btn weui-btn weui-btn_default " ng-if="!hasFirstScore && !hasFinalScore"  ng-click="goEnrol(e)">查看详情</a>
+					<!--成绩查询-->
+					<a href="javascript:;" class="weui-btn weui-btn_primary" style="font-size:10pt;" ng-if="firstScoreTimeFlag && hasFirstScore" ng-click="goFirstScore(e)">查询成绩</a>
+					<a href="javascript:;" class="weui-btn weui-btn_primary" style="font-size:10pt;" ng-if="finalScoreTimeFlag && hasFinalScore" ng-click="goFinalScore(e)">复试查询成绩</a>
 				</div>
 				<br>
 			</div>
@@ -48,7 +51,7 @@
 		</div>
 		
 		<div class="button-sp-area" ng-if="FrameParam.ArtStatus == 'Enrol' && EnrolArray2.length < getParamValue('EnrolStdAspectLimit', '10')
-				 && enrolTimeFlag === 'Active' && EnrolArray2.length !=0 && showEnrolFlag">
+				 && enrolTimeFlag && EnrolArray2.length !=0 && showEnrolFlag">
 			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="goLocation('enrol/guide')">专业报考</a>
 		</div>
 		
@@ -67,8 +70,8 @@
 			<div ng-if="FrameParam.ArtStatus == 'Enrol' && FrameParam.EnrolStatus == 'Active'">
 				<div class="ui-big-title" style="margin-top: 0px !important;">报名已开放</div>
 				<div class="ui-title" style="margin-top: 0px !important;">
-					开始时间:2024-01-09 09:00:00 <br>
-					结束时间:2024-01-12 12:00:00
+					开始时间:{{Agent.enrol_start_time}} <br>
+					结束时间:{{Agent.enrol_end_time}}
 				</div>
 				<div class="button-sp-area">
 					<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="goLocation('enrol/guide')">选择专业</a>

WebRoot/ymbk/routes/main/main.js

@@ -8,10 +8,13 @@ app.controller('MainCtrl', [ '$rootScope', '$scope', '$timeout', function($rootS
 	$scope.hasFirstScore = false;
 	$scope.hasFinalScore = false;
 	
-	$rootScope.can_sc = true;
+	/*$rootScope.can_sc = true;
 	$rootScope.can_yxtb = true;
-	$rootScope.can_jbyl = true;
+	$rootScope.can_jbyl = true;*/
 	$scope.showEnrolFlag = false;
+	$scope.firstScoreTimeFlag = false;
+	$scope.finalScoreTimeFlag = false
+
 	
 	$scope.getEnrolArray2 = function() {
 		$rootScope.ajaxRequest({
@@ -19,7 +22,7 @@ app.controller('MainCtrl', [ '$rootScope', '$scope', '$timeout', function($rootS
 		}, function(response) {
 			$scope.EnrolArray2 = response.array;
 			for(const ea of $scope.EnrolArray2) {
-				if(ea.aspect_id == 20701 || ea.aspect_id == 22001) {
+				if(ea.aspect_id === 20701 || ea.aspect_id === 22001) {
 					$scope.showEnrolFlag = true;
 					break;
 				}
@@ -27,42 +30,28 @@ app.controller('MainCtrl', [ '$rootScope', '$scope', '$timeout', function($rootS
 		});
 	}
 
-	$scope.getScoreArray = function() {
-		var today = $rootScope.shortDateString(new Date());
-		var now = new Date();
-
+	$scope.getScoreArray = function () {
 		$rootScope.ajaxRequest({
-			url : '../enrol/std/score/ym/final/list.htm'
-			//data : {batch: "first"}
-		}, function(response) {
-			$rootScope.ScoreArray = response.array;
-			for (var i=0;i<response.array.length;i++) {
-				if (response.array[i].batch == 'first') {
+			url: '../enrol/std/score/ym/final/list.htm'
+		}, function (response) {
+			for (var i = 0; i < response.array.length; i++) {
+				if (response.array[i].batch === 'first') {
 					$scope.hasFirstScore = true;
-				} else if (response.array[i].batch == 'final') {
+				} else if (response.array[i].batch === 'final') {
 					$scope.hasFinalScore = true;
 				}
 			}
-			/*var qualified_total = 0;
-			for(var i=0;i<response.array.length;i++){
-				if(response.array[i].aspect_qualified !='不合格')
-					qualified_total ++;
-			}	
-			$rootScope.qualified_total  = qualified_total ;*/
 		});
 	}
 	//初试成绩
 	$scope.goFirstScore = function(e) {
-		//debugger;
 		$rootScope.goLocation('ym/score/' + e.aspect_name + '/first');//初试成绩
 	}
 	//复试成绩
 	$scope.goFinalScore = function(e) {
-		//debugger;
 		$rootScope.goLocation('ym/score/' + e.aspect_name + '/final');//复试成绩
 	}	
 	$scope.goAddr = function(e) {
-		//debugger;
 		$rootScope.goLocation('ym/addr');//邮寄地址修改界面
 	}
 	
@@ -82,18 +71,38 @@ app.controller('MainCtrl', [ '$rootScope', '$scope', '$timeout', function($rootS
 		}, function(response) {
 			$scope.Agent = response.map;
 			var now = $rootScope.parseLongString(response.map.now);
+
+			// 准考证下载
 			if ($rootScope.parseLongString(response.map.ticket_start_time) < now 
 					&& $rootScope.parseLongString(response.map.ticket_end_time) > now) {
-				// 判断考点是否开放了预约，只处理当天
 				$scope.showTicket = true;
 			}
+
+			// 报考按钮显示
+			if ($rootScope.parseLongString(response.map.enrol_start_time) < now
+				&& $rootScope.parseLongString(response.map.enrol_end_time) > now) {
+				$scope.enrolTimeFlag = true;
+			}
+
+			//初试成绩显示
+			if ($rootScope.parseLongString(response.map.first_score_start_time) < now
+				&& $rootScope.parseLongString(response.map.first_score_end_time) > now) {
+				$scope.firstScoreTimeFlag = true;
+				$scope.getScoreArray();
+			}
+			//复试成绩显示
+			if ($rootScope.parseLongString(response.map.final_score_start_time) < now
+				&& $rootScope.parseLongString(response.map.final_score_end_time) > now) {
+				$scope.finalScoreTimeFlag = true;
+				$scope.getScoreArray();
+			}
 		});
 	}
 
 	$scope.getEnrolArray2();
 	//$scope.getScoreArray();
 	$scope.getAgent();
-	$scope.enrolTime();
+	//$scope.enrolTime();
 	
 	
 	//进入申请页面

WebRoot/ymbk/routes/main_成绩/main.js

@@ -17,8 +17,6 @@ app.controller('MainCtrl', [ '$rootScope', '$scope', '$timeout', function($rootS
 	}
 
 	$scope.getScoreArray = function() {
-		var today = $rootScope.shortDateString(new Date());
-		var now = new Date();
 
 		$rootScope.ajaxRequest({
 			url : '../enrol/std/score/ym/final/list.htm'
@@ -26,9 +24,9 @@ app.controller('MainCtrl', [ '$rootScope', '$scope', '$timeout', function($rootS
 		}, function(response) {
 			$rootScope.ScoreArray = response.array;
 			for (var i=0;i<response.array.length;i++) {
-				if (response.array[i].batch == 'first') {
+				if (response.array[i].batch === 'first') {
 					$scope.hasFirstScore = true;
-				} else if (response.array[i].batch == 'final') {
+				} else if (response.array[i].batch === 'final') {
 					$scope.hasFinalScore = true;
 				}
 			}

WebRoot/ymfz/routes/main/main.html

@@ -64,7 +64,7 @@
 
 		<!--成绩查询-->
 		<div class="button-sp-area">
-			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-if="showScoreFlag" ng-click="goLocation('score/fz')">成绩查询</a>
+			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-if="showScoreFlag && ArtStdReg.std_qualified_flag=='Active'" ng-click="goLocation('score/fz')">成绩查询</a>
 		</div>
 
 	</div>

src/cn/hmsoft/art/constants/Constants.java

@@ -23,4 +23,7 @@ public class Constants {
 
     // 非大陆考生省份ID
     public static final int NOT_MAINLAND_PROVINCE_ID = 70;
+
+    // 成绩查询默认时间
+    public static final String DEFAULT_TIME = "2024-11-11 10:00:00";
 }

src/cn/hmsoft/art/enrol/control/enrol/EnrolStdEnrolControl.java

@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import cn.hmsoft.art.constants.Constants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -300,7 +301,6 @@ public class EnrolStdEnrolControl extends EnrolStdAbstractControl {
 	
 	/** app 扫公众号二维码登录
 	 *  后台负责生成字符串，前台负责生成二维码
-	 * @param std_id
 	 * @return
 	 */
 	@RequestMapping("/enrol/std/app/qrcode/value")
@@ -327,6 +327,10 @@ public class EnrolStdEnrolControl extends EnrolStdAbstractControl {
 		map.put("works_upload_end_time", agent.getWorks_upload_end_time());// 作品上传结束时间
 		map.put("ticket_start_time", agent.getTicket_start_time());
 		map.put("ticket_end_time", agent.getTicket_end_time());
+		map.put("first_score_start_time", ArtParamHelper.getParamValue("YmScoreFirstStartTime", Constants.DEFAULT_TIME));
+		map.put("first_score_end_time", ArtParamHelper.getParamValue("YmScoreFirstEndTime", Constants.DEFAULT_TIME));
+		map.put("final_score_start_time", ArtParamHelper.getParamValue("YmScoreFinalStartTime", Constants.DEFAULT_TIME));
+		map.put("final_score_end_time", ArtParamHelper.getParamValue("YmScoreFinalEndTime", Constants.DEFAULT_TIME));
 		return new Ajax(map);
 	}
 

src/cn/hmsoft/art/service/score/FzScoreService.java

@@ -8,6 +8,7 @@ import cn.hmsoft.art.data.model.score.FzScore;
 import cn.hmsoft.art.data.model.std.StdEnrol;
 import cn.hmsoft.art.data.model.std.StdReg;
 import cn.hmsoft.art.service.ArtService;
+import cn.hmsoft.frame.constants.FrameStatus;
 import cn.hmsoft.frame.data.dao.FrameOptrLogDao;
 import cn.hmsoft.frame.data.model.FrameOptr;
 import cn.hmsoft.frame.data.model.FrameOptrLog;
@@ -166,6 +167,10 @@ public class FzScoreService extends ArtService {
                 fzScoreDao.update(existScore);
             } else {
                 fzScoreDao.insert(score);
+                // 更新考生成绩显示标志
+                StdReg stdReg = stdRegDao.find(score.getStd_id());
+                stdReg.setStd_qualified_flag(FrameStatus.Active.toString());
+                stdRegDao.update(stdReg);
             }
         }