告知书和决定书

WebRoot/ymbk/routes/main/main.js

@@ -44,16 +44,30 @@ app.controller('MainCtrl', [ '$rootScope', '$scope', '$timeout', function($rootS
 			}
 		});
 	}
+
+	$scope.disciplineQueryLog = function(log_type) {
+		$rootScope.ajaxRequest({
+			url : '../enrol/ym/std/discipline/log.htm',
+			data : {log_type : log_type}
+		}, function(response) {
+
+		});
+	}
+
 	//初试成绩
 	$scope.goFirstScore = function(e) {
 		// 考生有违纪 提示
 		if($rootScope.ArtStdReg.discipline_flag == 'Active') {
-			$.confirm("有违纪，请下载违纪告知书", function() {
+
+			$.confirm("接受违规处理决定书", function() {
+				$scope.disciplineQueryLog('DisciplineConfirm');// 记录日志
 				$rootScope.goLocation('ym/score/' + e.aspect_name + '/first');//初试成绩
 				$scope.$apply();
 			}, function() {
 				// 点击取消后的回调函数
+				$scope.disciplineQueryLog('DisciplineCancel');
 			});
+
 		} else {
 			$rootScope.goLocation('ym/score/' + e.aspect_name + '/first');//初试成绩
 		}

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

@@ -69,7 +69,7 @@ public abstract class DecisionHelper {
                     .setFontSize(22).setBold().setTextAlignment(TextAlignment.CENTER);
             doc.add(p1);
 
-            Text underlineText = new Text("" + score.get("violation_no")).setUnderline();
+            Text underlineText = new Text("YM" + score.get("violation_no")).setUnderline();
             p1 = new Paragraph("编号：").add(underlineText).setFontSize(fontSize).setTextAlignment(TextAlignment.CENTER);
             doc.add(p1);
 

src/cn/hmsoft/art/enrol/control/score/EnrolStdScoreYMControl.java

@@ -135,5 +135,15 @@ public class EnrolStdScoreYMControl extends EnrolStdAbstractControl {
 		daoLog.log(std_id, GobalBusinessType.ScoreQuery, LocalDateTime.now(), null, userIp);
 		return new Ajax();
 	}
+
+	/**
+	 *  记录违纪考生的成绩查询日志
+	 */
+	@RequestMapping("/enrol/ym/std/discipline/log")
+	public Ajax disciplineLog(Integer std_id, String log_type) {
+		String userIp = FrameAgentUtil.getUserAddr(this.getRequest());
+		daoLog.log(std_id, log_type, LocalDateTime.now(), null, userIp);
+		return new Ajax();
+	}
 	
 }

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

@@ -10,6 +10,7 @@ import cn.hmsoft.art.data.model.sc.ScScoreYmViolation;
 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.model.FrameOptr;
 import cn.hmsoft.frame.exception.BusinessException;
 import cn.hmsoft.helper.CollectionHelper;
@@ -195,7 +196,9 @@ public class ScScoreYmViolationService extends ArtService {
             row++;
             total++;
 
-            //TODO 更新考生的违纪标志
+            //更新考生的违纪标志
+            stdReg.setDiscipline_flag(FrameStatus.Active.toString());
+            scScoreYmViolationDao.update(stdReg);
         }
 
         this.log(optr, ArtOptrLogType.VIOLATION_IMPORT.toString(), total);