成绩查询复核日志

WebRoot/ymbk/routes/main/main.js

@@ -34,6 +34,7 @@ app.controller('MainCtrl', [ '$rootScope', '$scope', '$timeout', function($rootS
 		$rootScope.ajaxRequest({
 			url: '../enrol/std/score/ym/final/list.htm'
 		}, function (response) {
+			$rootScope.ScoreArray = response.array;
 			for (var i = 0; i < response.array.length; i++) {
 				if (response.array[i].batch === 'first') {
 					$scope.hasFirstScore = true;
@@ -45,7 +46,18 @@ app.controller('MainCtrl', [ '$rootScope', '$scope', '$timeout', function($rootS
 	}
 	//初试成绩
 	$scope.goFirstScore = function(e) {
-		$rootScope.goLocation('ym/score/' + e.aspect_name + '/first');//初试成绩
+		// 考生有违纪 提示
+		if($rootScope.ArtStdReg.discipline_flag == 'Active') {
+			$.confirm("有违纪，请下载违纪告知书", function() {
+				$rootScope.goLocation('ym/score/' + e.aspect_name + '/first');//初试成绩
+				$scope.$apply();
+			}, function() {
+				// 点击取消后的回调函数
+			});
+		} else {
+			$rootScope.goLocation('ym/score/' + e.aspect_name + '/first');//初试成绩
+		}
+
 	}
 	//复试成绩
 	$scope.goFinalScore = function(e) {

WebRoot/ymbk/routes/ym/score/ym_score.html

@@ -81,7 +81,7 @@
 				<div class="weui-cell__hd">
 					<label class="weui-label">复核</label>
 				</div>
-				<div class="weui-cell__bd">已申请，2024年3月11日9:00公布结果</div>
+				<div class="weui-cell__bd">{{getParamValue('ReviewNotice')}}</div>
 			</div>
 			
 			<div class="weui-cell"  ng-if="enrol.check_note && enrol.check_note.length>0 ">
@@ -105,7 +105,9 @@
 					<label class="weui-label">复核</label>
 				</div>
 				<div class="weui-cell__bd">
-					<input class="weui-input" type="text" placeholder="请输入复核内容" maxlength="1000" ng-model="enrol.apply_msg">				
+					<!--<input class="weui-input" type="text" placeholder="请输入复核内容" maxlength="1000" ng-model="enrol.apply_msg">-->
+					<textarea rows="3" cols="60" ng-model="enrol.apply_msg" maxlength="1000" placeholder="请输入复核内容" class="weui-input">
+					</textarea>
 				</div>
 			</div>			
 			<!-- 
@@ -125,22 +127,17 @@
 		</div>
 
 		<div class="button-sp-area">
-			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="goImage()" ng-if="enrol.aspect_image">违规处理通知单</a>
-			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="goCheck()" ng-if="canApply && enrol.check_flag == undefined">复核</a> 
+			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="goCheck()" ng-if="canApply && enrol.check_flag == undefined">复核</a>
+			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="downloadNotice()" ng-if="enrol.notice_file && getParamValue('ShowNotice', 'InActive') == 'Active'">下载违规处理告知书</a>
+			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="downloadImage()" ng-if="enrol.aspect_image && getParamValue('ShowDecision', 'InActive') == 'Active'">下载违规处理决定书</a>
 			<!--
 			<a href="javascript:;" class="weui-btn weui-btn_primary" ng-click="goConfirm()" ng-if="enrol.aspect_qualified !='不合格' && enrol.confirm_flag==undefined">
 				<span ng-if="qualified_total==1">填写高考成绩(选填)</span><span span ng-if="qualified_total>1">确认录取排队专业</span>
 			</a>-->
-			<a href="javascript:void(0);" class="weui-btn weui-btn_primary" ng-click="goLocation('main')">回首页</a>
+			<a href="javascript:void(0);" class="weui-btn weui-btn_default" ng-click="goLocation('main')">回首页</a>
 		</div>
 		
-		<!-- <div class="ui-card" style="padding: 20px" >
-				<div class="ui-title" style="margin-top: 0px !important;">欢迎兼报我院国际预科，报考方式如下：<br/>
-				1、微信搜索“中央美院国际预科”，关注公众号后点击下方“报名考试”登记报名；<br/>
-				2、致电010-64771017/18810731858 （同微信号）咨询报名。<br/>
-				备注：全体考生均可兼报。专业初试成绩达到我院当年校考实践类专业合格标准，考生即可获得国际预科专业笔试免试资格。</div>
-		</div> -->
-			
+
 	</div>
 
 </div>

WebRoot/ymbk/routes/ym/score/ym_score.js

@@ -7,10 +7,11 @@ app.controller('YmScoreCtrl', [ '$rootScope', '$scope', '$stateParams', '$timeou
 	}
 	$scope.canApply = false;
 	$scope.batch = $stateParams.batch;//初试、复试
-	//debugger;
+
+
 	for(var i=0;i<$rootScope.ScoreArray.length;i++){
 		//console.log($rootScope.ScoreArray[i].aspect_name + "," + $stateParams.aspect_name + " | " + $rootScope.ScoreArray[i].batch + "," + $stateParams.batch);
-		if($rootScope.ScoreArray[i].aspect_name == $stateParams.aspect_name && $rootScope.ScoreArray[i].batch == $stateParams.batch){
+		if ($rootScope.ScoreArray[i].aspect_name == $stateParams.aspect_name && $rootScope.ScoreArray[i].batch == $stateParams.batch) {
 			$scope.enrol = $rootScope.ScoreArray[i];
 		}
 	}
@@ -85,10 +86,17 @@ app.controller('YmScoreCtrl', [ '$rootScope', '$scope', '$stateParams', '$timeou
 		});
 	}
 
-	$scope.goImage = function() {
+	// 决定书
+	$scope.downloadImage = function() {
 		$('#pdf_url').attr('href', $rootScope.FrameParam.EnrolMaterialWebPath + $scope.enrol.aspect_image);
 		document.getElementById("pdf_url").click();
 	}
+
+	// 告知书
+	$scope.downloadNotice = function() {
+		$('#pdf_url').attr('href', $rootScope.FrameParam.EnrolMaterialWebPath + $scope.enrol.notice_file);
+		document.getElementById("pdf_url").click();
+	}
 	
 	//记录考生查询日志
 	$scope.scoreQueryLog = function() {

sql/update.sql

@@ -181,4 +181,12 @@ CREATE TABLE `sc_score_ym_violation`
   ROW_FORMAT = Dynamic;
 
 -- 2024-12-09
-ALTER TABLE `sc_score_ym` ADD COLUMN `NOTICE_FILE` varchar(255) NULL COMMENT '告知书地址' AFTER `RECOVERY_TIME`;
+ALTER TABLE `sc_score_ym` ADD COLUMN `NOTICE_FILE` varchar(255) NULL COMMENT '告知书地址' AFTER `RECOVERY_TIME`;
+
+
+-- 2024-12-10
+INSERT INTO `cf_enrol_param`(`PARAM_TYPE`, `PARAM_NAME`, `PARAM_VALUE`, `PARAM_NOTE`) VALUES ('Enrol', 'ShowNotice', 'Active', '成绩查询是否显示告知书');
+INSERT INTO `cf_enrol_param`(`PARAM_TYPE`, `PARAM_NAME`, `PARAM_VALUE`, `PARAM_NOTE`) VALUES ('Enrol', 'ShowDecision', 'InActive', '成绩查询是否显示决定书');
+INSERT INTO `cf_enrol_param`(`PARAM_TYPE`, `PARAM_NAME`, `PARAM_VALUE`, `PARAM_NOTE`) VALUES ('Enrol', 'ReviewNotice', '已申请，2025年3月11日9:00公布结果', '成绩查询，考生复核后的提示');
+
+ALTER TABLE `std_reg` ADD COLUMN `discipline_flag` varchar(8) NULL COMMENT '是否是违纪考生Active、InActive' AFTER `biz_token`;

src/cn/hmsoft/art/data/model/std/StdReg.java

@@ -106,6 +106,9 @@ public class StdReg implements Serializable {
 
 	//最新的活体识别token
 	private String biz_token;
+
+	//是否是违纪考生
+	private String discipline_flag;
 	
 	
 	/*********************
@@ -618,7 +621,13 @@ public class StdReg implements Serializable {
 		this.email = email;
 	}
 
+	public String getDiscipline_flag() {
+		return discipline_flag;
+	}
 
+	public void setDiscipline_flag(String discipline_flag) {
+		this.discipline_flag = discipline_flag;
+	}
 
 	/*******************
 	 * 考生省份名称

src/cn/hmsoft/art/enrol/business/decision/DecisionHelper.java

@@ -3,6 +3,7 @@ package cn.hmsoft.art.enrol.business.decision;
 import cn.hmsoft.application.SpringHelper;
 import cn.hmsoft.art.constants.StdMaterialType;
 import cn.hmsoft.art.data.dao.sc.ScScoreYmDao;
+import cn.hmsoft.art.data.model.cf.CfSubject;
 import cn.hmsoft.art.data.model.sc.ScScoreYm;
 import cn.hmsoft.art.data.model.std.StdLog;
 import cn.hmsoft.art.enrol.helper.EnrolMaterialHelper;
@@ -354,17 +355,30 @@ public abstract class DecisionHelper {
             stdTable.addCell(new Cell(2, 1).add("考试科目：").setFontSize(fontSize)
                     .setVerticalAlignment(VerticalAlignment.MIDDLE).setHorizontalAlignment(HorizontalAlignment.RIGHT).setTextAlignment(TextAlignment.RIGHT)
                     .setMarginTop(5).setMarginBottom(5).setBold());
-            String subject_name = "";
+
+            StringBuilder subject_name = new StringBuilder();
             if (StringHelper.isNotEmpty(score.getSubject_name_1())) {
-                subject_name = "《" + score.getSubject_name_1() + "》";
+                subject_name = new StringBuilder("《" + score.getSubject_name_1() + "》");
             }
             if (StringHelper.isNotEmpty(score.getSubject_name_2())) {
-                subject_name += "\n《" + score.getSubject_name_2() + "》";
+                subject_name.append("\n《").append(score.getSubject_name_2()).append("》");
             }
             if (StringHelper.isNotEmpty(score.getSubject_name_3())) {
-                subject_name += "\n《" + score.getSubject_name_3() + "》";
+                subject_name.append("\n《").append(score.getSubject_name_3()).append("》");
+            }
+
+            String sql;
+            if(StringHelper.isEmpty(subject_name.toString())) {
+                sql = "select t.* from cf_aspect a,cf_aspect_subject cas, cf_subject t "
+                        + "  where a.aspect_id=cas.aspect_id and cas.subject_id=t.subject_id and aspect_batch=? and aspect_name=? ";
+                List<CfSubject> subjectList = scoreYmDao.listBySql(CfSubject.class, sql, score.getBatch().equals("first") ? 1 : 2, score.getAspect_name());
+               for(CfSubject subject : subjectList) {
+                   subject_name.append("《").append(subject.getSubject_name()).append("》\n");
+               }
+               subject_name.deleteCharAt(subject_name.length() - 1);
             }
-            stdTable.addCell(new Cell(2, 1).add(subject_name).setFontSize(fontSize)
+
+            stdTable.addCell(new Cell(2, 1).add(subject_name.toString()).setFontSize(fontSize)
                     .setVerticalAlignment(VerticalAlignment.MIDDLE).setHorizontalAlignment(HorizontalAlignment.LEFT).setTextAlignment(TextAlignment.LEFT)
                     .setMarginLeft(5).setMarginTop(5).setMarginBottom(5));
 
@@ -481,7 +495,7 @@ public abstract class DecisionHelper {
             ItextPdfHelper.closePdf(doc);
 
             //更新文件路径
-            String sql = "update sc_score_ym set review_log_file=? where cert_id=? and aspect_name=? and batch=? ";
+            sql = "update sc_score_ym set review_log_file=? where cert_id=? and aspect_name=? and batch=? ";
             scoreYmDao.updateBySql(sql, file_name, score.getCert_id(), score.getAspect_name(), score.getBatch());
 
         } catch (Exception e) {

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

@@ -194,6 +194,8 @@ public class ScScoreYmViolationService extends ArtService {
             }
             row++;
             total++;
+
+            //TODO 更新考生的违纪标志
         }
 
         this.log(optr, ArtOptrLogType.VIOLATION_IMPORT.toString(), total);