@ -1,9 +1,8 @@
package com.dsideal.FengHuang.Exam.Model ;
import cn.hutool.core.date.DateTime ;
import com.jfinal.aop.Before ;
import com.jfinal.ext.interceptor.GET ;
import com.jfinal.ext.interceptor.POST ;
import com.alibaba.fastjson.JSONArray ;
import com.alibaba.fastjson.JSONObject ;
import com.jfinal.kit.Kv ;
import com.jfinal.kit.StrKit ;
import com.jfinal.plugin.activerecord.Db ;
@ -11,7 +10,6 @@ import com.jfinal.plugin.activerecord.Page;
import com.jfinal.plugin.activerecord.Record ;
import com.jfinal.plugin.activerecord.SqlPara ;
import java.sql.Time ;
import java.time.Duration ;
import java.time.LocalDateTime ;
import java.util.ArrayList ;
@ -129,18 +127,18 @@ public class ExamModel {
String sql = "select question_id from t_exam_record where person_id=? and order_id=?" ;
int question_id = Db . findFirst ( sql , person_id , order_id ) . getInt ( "question_id" ) ;
sql = "select question_id,type_id,content,A,B,C,D,E,F,G,score from t_exam_question where question_id=?";
sql = "select t1. question_id,t1.t ype_id,t1. content,t1. A,t1. B,t1. C,t1. D,t1. E,t1. F,t1. G,t1. score,t2.type_name from t_exam_question as t1 inner join t_exam_question_type as t2 on t1.type_id=t2.type_id where t1. question_id=?";
Record record = Db . findFirst ( sql , question_id ) ;
Kv kv = Kv . create ( ) ;
kv . set ( "A" , record . getStr ( "A" ) ) ;
kv . set ( "B" , record . getStr ( "B" ) ) ;
if ( ! StrKit . isBlank ( record . getStr ( "C" ) ) ) kv . set ( "C" , record . getStr ( "C" ) ) ;
if ( ! StrKit . isBlank ( record . getStr ( "D" ) ) ) kv . set ( "D" , record . getStr ( "D" ) ) ;
if ( ! StrKit . isBlank ( record . getStr ( "E" ) ) ) kv . set ( "E" , record . getStr ( "E" ) ) ;
if ( ! StrKit . isBlank ( record . getStr ( "F" ) ) ) kv . set ( "F" , record . getStr ( "F" ) ) ;
if ( ! StrKit . isBlank ( record . getStr ( "G" ) ) ) kv . set ( "G" , record . getStr ( "G" ) ) ;
JSONArray array = new JSONArray ( ) ;
for ( char x = 'A' ; x < = 'F' ; x + + ) {
if ( ! StrKit . isBlank ( record . getStr ( String . valueOf ( x ) ) ) ) {
JSONObject jo = new JSONObject ( ) ;
jo . put ( "key" , String . valueOf ( x ) ) ;
jo . put ( "value" , record . getStr ( String . valueOf ( x ) ) ) ;
array . add ( jo ) ;
}
}
record . remove ( "A" ) ;
record . remove ( "B" ) ;
record . remove ( "C" ) ;
@ -148,7 +146,8 @@ public class ExamModel {
record . remove ( "E" ) ;
record . remove ( "F" ) ;
record . remove ( "G" ) ;
record . set ( "xuanxiang" , kv ) ;
record . set ( "xuanxiang" , array ) ;
return record ;
}