优化

sql/update.sql

@@ -143,8 +143,10 @@ ALTER TABLE  `std_reg`
     ADD COLUMN `biz_token` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL COMMENT '腾讯活体识别token';
 
 INSERT INTO `frame_dict`(`DICT_NAME`, `DICT_VALUE`, `DICT_TEXT`, `DICT_ORDER`) VALUES ('PhotoNum', '', '全部', 1);
-INSERT INTO `frame_dict`(`DICT_NAME`, `DICT_VALUE`, `DICT_TEXT`, `DICT_ORDER`) VALUES ('PhotoNum', '1', '1张', 2);
-INSERT INTO `frame_dict`(`DICT_NAME`, `DICT_VALUE`, `DICT_TEXT`, `DICT_ORDER`) VALUES ('PhotoNum', '2', '2张', 3);
-INSERT INTO `frame_dict`(`DICT_NAME`, `DICT_VALUE`, `DICT_TEXT`, `DICT_ORDER`) VALUES ('PhotoNum', '3', '3张', 4);
+INSERT INTO `frame_dict`(`DICT_NAME`, `DICT_VALUE`, `DICT_TEXT`, `DICT_ORDER`) VALUES ('PhotoNum', '0', '0张', 2);
+INSERT INTO `frame_dict`(`DICT_NAME`, `DICT_VALUE`, `DICT_TEXT`, `DICT_ORDER`) VALUES ('PhotoNum', '1', '1张', 3);
+INSERT INTO `frame_dict`(`DICT_NAME`, `DICT_VALUE`, `DICT_TEXT`, `DICT_ORDER`) VALUES ('PhotoNum', '2', '2张', 4);
+INSERT INTO `frame_dict`(`DICT_NAME`, `DICT_VALUE`, `DICT_TEXT`, `DICT_ORDER`) VALUES ('PhotoNum', '3', '3张', 5);
+
 
 INSERT INTO `frame_res`(`RES_ID`, `RES_NAME`, `RES_ALIAS`, `RES_URL`, `RES_PID`, `RES_LEVEL`, `RES_TYPE`, `RES_CSS`, `RES_STATUS`, `RES_ORDER`, `RES_DESC`) VALUES (304070, '模特照片查看', '模特照片查看', 'art/exam/photograph/model', 304000, 4, 'Page', 'icon-grid text-primary', 'Active', 304070, NULL);

src/cn/hmsoft/art/control/ex/judge/ExamJudgeGradeControl.java

@@ -284,26 +284,25 @@ public class ExamJudgeGradeControl extends AjaxControl {
 	/*********************************
 	 * 提交分数
 	 * 
-	 * @param value
-	 *            加密后的json串
-	 * @param std_id
-	 *            考生编号
-	 * @param exam_seq
-	 *            考生序号
-	 * @param exam_start_time
-	 *            考生入场时间
-	 * @param skip
-	 *            是否回避
+	 * @param score_json   加密后的json串
+	 * @param std_id 考生编号
+	 * @param real_exam_seq  考生序号
+	 * @param judge_avoid 是否回避
 	 */
 	@RequestMapping("exam/judge/grade/std/score")
 	public Ajax score(String score_json, int std_id, int real_exam_seq, String judge_avoid, String remark, Integer discipline_id) {
 		ExJudgeRoom judge = this.checkJudge();
 		// json_list是加密的，需要解密
-		String json_value = SecureHelper.aesDecrypt(score_json, judge.getDes_key());
-		if (StringHelper.isEmpty(json_value))
-			throw new BusinessException("提交分数错误：数据包验证失败，请重试！");
-		List<ExJudgeScore> list = JsonHelper.fromJson(json_value, ExJudgeScore.class);
-		if (list.size() == 0)
+		List<ExJudgeScore> list;
+		if (ArtParamHelper.SchoolCode.equals("10047") || ArtParamHelper.SchoolCode.equals("10047FZ")) {
+			list = JsonHelper.fromJson(score_json, ExJudgeScore.class);
+		} else {
+			String json_value = SecureHelper.aesDecrypt(score_json, judge.getDes_key());
+			if (StringHelper.isEmpty(json_value))
+				throw new BusinessException("提交分数错误：数据包验证失败，请重试！");
+			list = JsonHelper.fromJson(json_value, ExJudgeScore.class);
+		}
+		if (list.isEmpty())
 			throw new BusinessException("评委评分错误：没有提交任何考生成绩");
 
 		this.sGrade.judgeScore(std_id, real_exam_seq, judge, list, judge_avoid, score_json, remark, discipline_id);

src/cn/hmsoft/art/control/score/ScoreAspectControl.java

@@ -36,7 +36,7 @@ public class ScoreAspectControl extends AjaxControl {
 	}
 
 	@RequestMapping("score/aspect/page")
-	public Ajax scoreAspectPage(int aspect_id,int batch_id, String query, Integer limit, Integer start, String order, String type) {
+	public Ajax scoreAspectPage(Integer aspect_id,int batch_id, String query, Integer limit, Integer start, String order, String type) {
 		if (StringHelper.isEmpty(order))
 			order = "aspect_ticket_num";
 		return new Ajax(

src/cn/hmsoft/art/data/dao/ex/exam/ExamJudgeGradeDao.java

@@ -240,7 +240,7 @@ public class ExamJudgeGradeDao extends PlatformDaoSupport<ExJudgeRoom> {
 		sql.append("    	a.real_checkin_seq,b.judge_score judge_score,a.time_type                                                     ");
 		sql.append("    FROM (                                                                                                           ");
 		sql.append("    		SELECT                                                                                                   ");
-		sql.append("    			sb.*, l.group_order,l.subject_id                                                                                   ");
+		sql.append("    			sb.*, l.group_order                                                                                  ");
 		sql.append("    		FROM                                                                                                     ");
 		sql.append("    			ly_std_subject sb,                                                                                   ");
 		sql.append("    			ly_subject l                                                                                         ");
@@ -258,7 +258,7 @@ public class ExamJudgeGradeDao extends PlatformDaoSupport<ExJudgeRoom> {
 		sql.append("    LEFT JOIN (    SELECT std_subject_id,std_id,judge_score FROM ex_judge_score                                      ");
 		sql.append("    	 WHERE room_id = ? AND judge_seq = ? AND real_exam_seq > ? AND real_exam_seq <=?                             ");
 		sql.append("    ) b ON a.std_subject_id = b.std_subject_id                                                                       ");
-		sql.append("    where     b.std_id IS NULL order by a.group_order,a.l.subject_id                                                                 ");
+		sql.append("    where     b.std_id IS NULL order by a.group_order,a.subject_id                                                                 ");
 		return this.listBySql(LyStdSubject.class, sql.toString(), ly_room_id, last_exam_seq, last_exam_seq+1, ly_room_id,
 				judge_seq, last_exam_seq, last_exam_seq + 1);
 	}

src/cn/hmsoft/art/data/dao/sc/ScStdAspectDao.java

@@ -34,7 +34,7 @@ public class ScStdAspectDao extends PlatformDaoSupport<ScStdAspect> {
 		return this.listMapBySql(sql);
 	}
 
-	public Pager pageStdAspect(int aspect_id,int batch_id, Integer start, Integer limit, String query, QueryOrder order) {
+	public Pager pageStdAspect(Integer aspect_id,int batch_id, Integer start, Integer limit, String query, QueryOrder order) {
 		String sql = "SELECT " + 
 				"	std.cert_id, " + 
 				"	std.std_name, " +