Inicio Explorar Axuda
Iniciar sesión
art-enrollment
/
server
2
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

央美附中

haogh hai 7 meses
pai
fc80c376f8
achega
2a779e8c82
Modificáronse 9 ficheiros con 180 adicións e 55 borrados
Unificar vista Mostrar estatísticas de Diff
  1. 2 2
      WebRoot/admis/admis.ymfz.html
  2. 1 1
      WebRoot/ymfz/js/angular.app.js
  3. 10 2
      WebRoot/ymfz/js/angular.router.js
  4. 15 37
      WebRoot/ymfz/routes/main/main.html
  5. 21 5
      WebRoot/ymfz/routes/main/main.js
  6. 42 1
      WebRoot/ymfz/routes/score/fz/score_fz_info.html
  7. 16 6
      WebRoot/ymfz/routes/score/fz/score_fz_info.js
  8. 3 1
      src/cn/hmsoft/art/constants/StdLogType.java
  9. 70 0
      src/cn/hmsoft/art/enrol/control/score/EnrolStdScoreYmfzControl.java

+ 2 - 2
WebRoot/admis/admis.ymfz.html
Ver ficheiro 

@@ -4,7 +4,7 @@
 
 <meta charset="utf-8" />
 
 <meta charset="utf-8" />
 
 <head>
 
 <head>
 
 
 
-<title>中央美术学院2024年成绩查询</title>
 
+<title>中央美术学院2025年成绩查询</title>
 
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
 <meta http-equiv="pragma" content="no-cache">
 
 <meta http-equiv="pragma" content="no-cache">
 
@@ -50,7 +50,7 @@
 
 		<div class="container">
 
 		<div class="container">
 
 			<div class="row">
 
 			<div class="row">
 
 				<div class="col-xs-12">
 
 				<div class="col-xs-12">
 
-					<h1>2024年附中优秀人才选拔考试</h1>
 
+					<h1>2025年附中优秀人才选拔考试</h1>
 
 					<p>
 
 					<p>
 
 					<!-- 准考证下载及 -->
 
 					<!-- 准考证下载及 -->
 
 						<span><h2>成绩查询</h2> </span>
 
 						<span><h2>成绩查询</h2> </span>

+ 1 - 1
WebRoot/ymfz/js/angular.app.js
Ver ficheiro 

@@ -134,7 +134,7 @@ app.controller('AppCtrl', [ '$rootScope', '$scope', '$http', '$localStorage', '$
 
 		});
 
 		});
 
 	};
 
 	};
 
 	$rootScope.getParamValue = function(paran_name, default_value) {
 
 	$rootScope.getParamValue = function(paran_name, default_value) {
 
-		if ($rootScope.FrameParam[paran_name] == undefined)
 
+		if ($rootScope.FrameParam[paran_name] === undefined)
 
 			return default_value;
 
 			return default_value;
 
 		return $rootScope.FrameParam[paran_name];
 
 		return $rootScope.FrameParam[paran_name];
 
 	}
 
 	}

+ 10 - 2
WebRoot/ymfz/js/angular.router.js
Ver ficheiro 

@@ -135,8 +135,16 @@ angular.module('app').config([ '$stateProvider', '$urlRouterProvider', function(
 
     			return $ocLazyLoad.load(['routes/score/info/score_info.js?v=' + new Date().getTime() ]);
 
     			return $ocLazyLoad.load(['routes/score/info/score_info.js?v=' + new Date().getTime() ]);
 
     		} ]
 
     		} ]
 
     	}
 
     	}
 
-    })
 
-    
+    }).state('app.score.fz', { // 附中成绩查询
 
+		url : '/fz',
 
+		templateUrl : 'routes/score/fz/score_fz_info.html?v=' + new Date().getTime(),
 
+		resolve : {
 
+			deps : [ '$ocLazyLoad', function($ocLazyLoad) {
 
+				return $ocLazyLoad.load(['routes/score/fz/score_fz_info.js?v=' + new Date().getTime() ]);
 
+			} ]
 
+		}
 
+	})
 
+
 
     .state('app.appointment', {
 
     .state('app.appointment', {
 
 		abstract : true,
 
 		abstract : true,
 
 		url : '/appointment',
 
 		url : '/appointment',

+ 15 - 37
WebRoot/ymfz/routes/main/main.html
Ver ficheiro 

@@ -28,15 +28,10 @@
 
 						<h4 class="weui-media-box__title {{e.pay_status=='Active'?'text-success':'text-warning'}}">
 
 						<h4 class="weui-media-box__title {{e.pay_status=='Active'?'text-success':'text-warning'}}">
 
 							{{e.aspect_name}}<span ng-if="e.pay_status!='Active'" class="text-danger">(未缴费)</span>
 
 							{{e.aspect_name}}<span ng-if="e.pay_status!='Active'" class="text-danger">(未缴费)</span>
 
 						</h4>
 
 						</h4>
 
-						<!--<p class="weui-media-box__desc">{{e.agent_name}}</p>-->
 
 					</div>
 
 					</div>
 
 				</div>
 
 				</div>
 
 			</div>
 
 			</div>
 
 		</div>
 
 		</div>
 
-		<!--
 
-		<div class="button-sp-area">
 
-				<a href="javascript:;" class="weui-btn weui-btn_primary" ng-if="firstQualified && showTicket" ng-click="goLocation('ticket/list')">下载准考证</a>
 
-		</div>-->
 
 
 
 		<div class="ui-card" ng-if="EnrolArray2 == undefined || EnrolArray2.length ==0 " style="padding: 20px">
 
 		<div class="ui-card" ng-if="EnrolArray2 == undefined || EnrolArray2.length ==0 " style="padding: 20px">
 
 			<div ng-if="FrameParam.ArtStatus == 'Config'">
 
 			<div ng-if="FrameParam.ArtStatus == 'Config'">
 
@@ -44,50 +39,33 @@
 
 				<div class="ui-title" style="margin-top: 0px !important;">系统未开放报名，具体开放时间请关注我校官方网站</div>
 
 				<div class="ui-title" style="margin-top: 0px !important;">系统未开放报名，具体开放时间请关注我校官方网站</div>
 
 			</div>
 
 			</div>
 
 
 
-			<div ng-if="FrameParam.ArtStatus != 'Config' && FrameParam.EnrolStatus == 'InActive'">
 
+			<div ng-if="FrameParam.ArtStatus == 'Enrol' && FrameParam.EnrolStatus == 'InActive'">
 
 				<div class="ui-big-title" style="margin-top: 0px !important;">报名已结束</div>
 
 				<div class="ui-big-title" style="margin-top: 0px !important;">报名已结束</div>
 
 				<div class="ui-title" style="margin-top: 0px !important;">报名已经截止，不再接受考生报考，详情见招生简章。</div>
 
 				<div class="ui-title" style="margin-top: 0px !important;">报名已经截止，不再接受考生报考，详情见招生简章。</div>
 
 			</div>
 
 			</div>
 
 		
 		
 			<div ng-if="FrameParam.ArtStatus == 'Enrol' && FrameParam.EnrolStatus == 'Active'">
 
 			<div ng-if="FrameParam.ArtStatus == 'Enrol' && FrameParam.EnrolStatus == 'Active'">
 
-				<div class="ui-big-title" style="margin-top: 0px !important;">报名已结束</div>
 
+				<div class="ui-big-title" style="margin-top: 0px !important;">报名开放时间</div>
 
 				<div class="ui-title" style="margin-top: 0px !important;">
 
 				<div class="ui-title" style="margin-top: 0px !important;">
 
-					开始时间:2023-12-21 10:00:00 <br>
 
-					结束时间:2023-12-22 22:00:00
 
+					开始时间： {{Agent.enrol_start_time}} <br>
 
+					结束时间： {{Agent.enrol_end_time}}
 
 				</div>
 
 				</div>
 
-				<!--
 
-				<div class="button-sp-area">
 
+
 
+				<div class="button-sp-area" ng-if="showEnrolFlag">
 
 					<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="goLocation('enrol/guide')">选择专业</a>
 
 					<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="goLocation('enrol/guide')">选择专业</a>
 
-				</div>-->
 
-			</div>
 
-		</div>		
-		
-		<!--<div class="ui-card" ng-if="EnrolArray.length>0" style="margin-top: 20px !important; padding: 20px;">
 
-			<div class="ui-card" >
 
-				<div class="ui-big-title" style="margin-top: 0px !important;font-size:14pt;font-weight:bold"><span style="color:#d4003d">报考专业</span><span style="font-size:12pt;"></span></div>
 
-			</div>
 
-			<div class="weui-panel__bd" style="margin-top: 10px;">
 
-				<div ng-repeat="e in EnrolArray" >
 
-					<div class="weui-media-box weui-media-box_text" ng-click="goEnrol(e)">
 
-						<h4 class="weui-media-box__title">
 
-							<span style="color:#d4003d">{{e.aspect_name}}</span><span ng-if="e.batch == 'first'">（初试成绩）</span><span ng-if="e.batch == 'final'">（复试成绩）</span>
 
-						</h4>
 
-						<p class="text-success" style="font-size:10pt;" ng-if="e.confirm_flag">已确认为录取排队专业</p>
 
-						 && qualified_total>1
 
-						<p class="" style="font-size:10pt;">专业成绩：{{e.aspect_score}}</p>
 
-						<p class=""  style="font-size:10pt;">专业结论：{{e.aspect_qualified}}</p>
 
-						
-					</div>
 
 				</div>
 
 				</div>
 
 			</div>
 
 			</div>
 
-			 <div class="button-sp-area">
 
-				<a href="javascript:;" class="weui-btn weui-btn_primary" ng-if="firstQualified && showTicket" ng-click="goLocation('ticket/list')">下载准考证</a>
 
-			</div>
 
-		</div>-->
 
-		
+		</div>
 
+
 
+		<!--准考证下载-->
 
 		<div class="button-sp-area">
 
 		<div class="button-sp-area">
 
 			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-if="showTicket" ng-click="goLocation('ticket/list')">下载准考证</a>
 
 			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-if="showTicket" ng-click="goLocation('ticket/list')">下载准考证</a>
 
 		</div>
 
 		</div>
 
-		
+
 
+		<!--成绩查询-->
 
+		<div class="button-sp-area">
 
+			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-if="showScoreFlag" ng-click="goLocation('score/fz')">成绩查询</a>
 
+		</div>
 
+
 
 	</div>
 
 	</div>
 
 </div>
 
 </div>

+ 21 - 5
WebRoot/ymfz/routes/main/main.js
Ver ficheiro 

@@ -6,9 +6,10 @@ app.controller('MainCtrl', [ '$rootScope', '$scope', '$timeout', function($rootS
 
 	$scope.showTicket = false;
 
 	$scope.showTicket = false;
 
 	$scope.firstQualified = false;//是否存在初始合格
 
 	$scope.firstQualified = false;//是否存在初始合格
 
 	$scope.showInfo = false;
 
 	$scope.showInfo = false;
 
+	$scope.showEnrolFlag = false; // 是否显示报考按钮
 
+	$scope.showScoreFlag = false; //是否显示成绩查询按钮
 
 
 
 	$scope.getEnrolArray2 = function() {
 
 	$scope.getEnrolArray2 = function() {
 
-			console.log('12312');
 
 		$rootScope.ajaxRequest({
 
 		$rootScope.ajaxRequest({
 
 			url : '../enrol/std/enrol/list.htm'
 
 			url : '../enrol/std/enrol/list.htm'
 
 		}, function(response) {
 
 		}, function(response) {
 
@@ -29,24 +30,39 @@ app.controller('MainCtrl', [ '$rootScope', '$scope', '$timeout', function($rootS
 
 					$scope.firstQualified = true;
 
 					$scope.firstQualified = true;
 
 				}*/
 
 				}*/
 
 			}	
 			}	
-			if(response.array.length == 0) {
 
+			if(response.array.length === 0) {
 
 				$scope.getEnrolArray2();
 
 				$scope.getEnrolArray2();
 
 			}
 
 			}
 
 		});
 
 		});
 
 	}
 
 	}
 
 	
 	
-	//TODO  临时
 
 	$scope.getAgent = function() {
 
 	$scope.getAgent = function() {
 
 		$rootScope.ajaxRequest({
 
 		$rootScope.ajaxRequest({
 
 			url : '../enrol/agent/find.htm?agent_id=101'
 
 			url : '../enrol/agent/find.htm?agent_id=101'
 
 		}, function(response) {
 
 		}, function(response) {
 
 			$scope.Agent = response.map;
 
 			$scope.Agent = response.map;
 
 			var now = $rootScope.parseLongString(response.map.now);
 
 			var now = $rootScope.parseLongString(response.map.now);
 
+
 
+			// 是否展示准考证下载按钮
 
 			if ($rootScope.parseLongString(response.map.ticket_start_time) < now 
 			if ($rootScope.parseLongString(response.map.ticket_start_time) < now 
 					&& $rootScope.parseLongString(response.map.ticket_end_time) > now) {
 
 					&& $rootScope.parseLongString(response.map.ticket_end_time) > now) {
 
-				// 判断考点是否开放了预约，只处理当天
 
 				$scope.showTicket = true;
 
 				$scope.showTicket = true;
 
 			}
 
 			}
 
+
 
+			// 是否展示去报考按钮
 
+			if ($rootScope.parseLongString(response.map.enrol_start_time) < now
 
+				&& $rootScope.parseLongString(response.map.enrol_end_time) > now) {
 
+				$scope.showEnrolFlag = true;
 
+			}
 
+
 
+			//是否显示成绩查询按钮
 
+			var fzScoreStartTime = $rootScope.getParamValue("FzScoreStartTime");
 
+			var fzScoreEndTime = $rootScope.getParamValue("FzScoreEndTime");
 
+			if ($rootScope.parseLongString(fzScoreStartTime) < now
 
+				&& $rootScope.parseLongString(fzScoreEndTime) > now) {
 
+				$scope.showScoreFlag = true;
 
+			}
 
+
 
 		});
 
 		});
 
 	}	
 	}	
 	
 	
@@ -56,5 +72,5 @@ app.controller('MainCtrl', [ '$rootScope', '$scope', '$timeout', function($rootS
 
 	}
 
 	}
 
 
 
 	$scope.getEnrolArray2();
 
 	$scope.getEnrolArray2();
 
-	$scope.getAgent();//TODO  临时
 
+	$scope.getAgent();
 
 } ])
 
 } ])

+ 42 - 1
WebRoot/ymfz/routes/score/fz/score_fz_info.html
Ver ficheiro 

@@ -1,3 +1,44 @@
 
 <div ng-controller="StdFzScoreInfoCtrl">
 
 <div ng-controller="StdFzScoreInfoCtrl">
 
-	1111
 
+
 
+	<div class="weui-panel__hd">成绩查询</div>
 
+
 
+	<div class="weui-form-preview" style="margin-top: 8px;" ng-if="score">
 
+		<div class="weui-form-preview__bd">
 
+
 
+			<div class="weui-form-preview__item">
 
+				<label class="weui-form-preview__label">考生姓名：</label> <span class="weui-form-preview__value">{{ArtStdReg.std_name}}</span>
 
+			</div>
 
+			<div class="weui-form-preview__item">
 
+				<label class="weui-form-preview__label">报考专业：</label> <span class="weui-form-preview__value">{{score.aspect_name}}</span>
 
+			</div>
 
+			<div class="weui-form-preview__item">
 
+				<label class="weui-form-preview__label">准考证号：</label> <span class="weui-form-preview__value">{{score.ticket_no}}</span>
 
+			</div>
 
+			<div class="weui-form-preview__item">
 
+				<label class="weui-form-preview__label">造型基础：</label> <span class="weui-form-preview__value">{{score.subj_zxjc}}</span>
 
+			</div>
 
+			<div class="weui-form-preview__item">
 
+				<label class="weui-form-preview__label">命题创作：</label> <span class="weui-form-preview__value">{{score.subj_mtcz}}</span>
 
+			</div>
 
+
 
+			<div class="weui-form-preview__item">
 
+				<label class="weui-form-preview__label">综合素养考核（在校一贯表现）：</label> <span class="weui-form-preview__value">{{score.subj_zhsy}}</span>
 
+			</div>
 
+
 
+			<div class="weui-form-preview__item">
 
+				<label class="weui-form-preview__label">综合素养考核（面试）：</label> <span class="weui-form-preview__value">{{score.face_score}}</span>
 
+			</div>
 
+
 
+			<div class="weui-form-preview__item">
 
+				<label class="weui-form-preview__label">总分：</label> <span class="weui-form-preview__value">{{score.total_score}}</span>
 
+			</div>
 
+
 
+			<div class="weui-form-preview__item">
 
+				<label class="weui-form-preview__label">结论：</label>
 
+				<span class="weui-form-preview__value" ng-class="{'text-success': score.qualified == '合格', 'text-danger': score.qualified != '合格'}">{{score.qualified}}</span>
 
+			</div>
 
+
 
+		</div>
 
+	</div>
 
+
 
 </div>
 
 </div>

+ 16 - 6
WebRoot/ymfz/routes/score/fz/score_fz_info.js
Ver ficheiro 

@@ -1,10 +1,20 @@
 
 app.controller('StdFzScoreInfoCtrl', [ '$rootScope', '$scope', '$stateParams', '$timeout', function($rootScope, $scope, $stateParams, $timeout) {
 
 app.controller('StdFzScoreInfoCtrl', [ '$rootScope', '$scope', '$stateParams', '$timeout', function($rootScope, $scope, $stateParams, $timeout) {
 
-	$scope.showcheckin=false;
 
-	if ($stateParams == undefined || $stateParams.aspect_id == undefined) {
 
-		$.alert('参数错误，无法获取报考详细信息', function() {
 
-			$rootScope.goWechat();
 
+
 
+
 
+	$scope.getScore = function () {
 
+		$rootScope.ajaxRequest({
 
+			url: '../enrol/std/score/search.htm'
 
+		}, function (response) {
 
+			if (response.map) {
 
+				$scope.scoreList = response.map.scoreList;
 
+			}
 
+			//考生成绩
 
+			if ($scope.scoreList.length > 0) {
 
+				$scope.score = $scope.scoreList[0];
 
+			}
 
 		});
 
 		});
 
-		return;
 
 	}
 
 	}
 
-	
+
 
+	$scope.getScore();
 
+
 
 } ])
 
 } ])

+ 3 - 1
src/cn/hmsoft/art/constants/StdLogType.java
Ver ficheiro 

@@ -41,6 +41,8 @@ public class StdLogType {
 
 	
 	
 	public final static String AspectEnrolVariety = "AspectEnrolVariety";
 
 	public final static String AspectEnrolVariety = "AspectEnrolVariety";
 
 	public final static String AspectEnrolVarietyDel = "AspectEnrolVarietyDel";
 
 	public final static String AspectEnrolVarietyDel = "AspectEnrolVarietyDel";
 
-	
+
 
+	public final static String ScoreQuery = "ScoreQuery";
 
+
 
 	
 	
 }
 
 }

+ 70 - 0
src/cn/hmsoft/art/enrol/control/score/EnrolStdScoreYmfzControl.java
Ver ficheiro 

@@ -0,0 +1,70 @@
 
+package cn.hmsoft.art.enrol.control.score;
 
+
 
+import cn.hmsoft.application.web.Ajax;
 
+import cn.hmsoft.art.constants.StdLogType;
 
+import cn.hmsoft.art.data.dao.std.StdEnrolDao;
 
+import cn.hmsoft.art.data.model.sc.ScStdAspect;
 
+import cn.hmsoft.art.data.model.std.StdEnrol;
 
+import cn.hmsoft.art.data.model.std.StdLog;
 
+import cn.hmsoft.art.data.model.std.StdReg;
 
+import cn.hmsoft.art.enrol.control.EnrolStdAbstractControl;
 
+import cn.hmsoft.art.helper.ArtParamHelper;
 
+import cn.hmsoft.frame.exception.BusinessException;
 
+import cn.hmsoft.helper.LocalDateHelper;
 
+import cn.hmsoft.log.LogHelper;
 
+import org.springframework.beans.factory.annotation.Autowired;
 
+import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RestController;
 
+
 
+import java.time.LocalDateTime;
 
+import java.util.HashMap;
 
+import java.util.List;
 
+import java.util.Map;
 
+
 
+/**
 
+ * @Description 央美附中成绩查询
 
+ * @Author haoguanghui
 
+ * @date 2024/10/28
 
+ */
 
+@RestController
 
+public class EnrolStdScoreYmfzControl extends EnrolStdAbstractControl {
 
+
 
+    @Autowired
 
+    private StdEnrolDao stdEnrolDao;
 
+
 
+    @RequestMapping("/enrol/std/score/search")
 
+    public Ajax fzScore() {
 
+        StdReg stdReg = this.getStdReg();
 
+        Map<String, Object> map = new HashMap<>();
 
+        // 成绩查询 起止时间
 
+        LocalDateTime scoreStartTime = LocalDateHelper.parseDateTime(ArtParamHelper.getParamValue("FzScoreStartTime", null));
 
+        LocalDateTime scoreEndTime = LocalDateHelper.parseDateTime(ArtParamHelper.getParamValue("FzScoreEndTime", null));
 
+        if (scoreStartTime == null || scoreEndTime == null) {
 
+            LogHelper.warn("[成绩查询] 未设置成绩查询起止时间");
 
+            throw new BusinessException("未到成绩查询时间");
 
+        }
 
+        if (LocalDateTime.now().isBefore(scoreStartTime) || LocalDateTime.now().isAfter(scoreEndTime)) {
 
+            throw new BusinessException(
 
+                    "成绩查询时间为:[" + LocalDateHelper.format(scoreStartTime) + " ~ " + LocalDateHelper.format(scoreEndTime) + "]");
 
+        }
 
+
 
+        // 考生成绩信息
 
+        List<Map<String, Object>> scoreList = stdEnrolDao.listMapBySql("select * from fz_score where std_name=? and cert_id=?", stdReg.getStd_name(),
 
+                stdReg.getCert_id());
 
+
 
+        if(scoreList == null || scoreList.isEmpty()) {
 
+            throw new BusinessException("未查询到考生成绩");
 
+        }
 
+
 
+        map.put("scoreList", scoreList);
 
+
 
+        //记录日志
 
+        StdLog log = new StdLog();
 
+        log.setStd_id(stdReg.getStd_id());
 
+        log.setLog_time(LocalDateTime.now());
 
+        log.setLog_type(StdLogType.ScoreQuery);
 
+        stdEnrolDao.insert(log);
 
+
 
+        return new Ajax(map);
 
+    }
 
+}