From 085806bd62da039a5ba29eca5d1345961914b106 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Sat, 6 May 2023 08:44:14 +0800
Subject: [PATCH] 'commit'

---
 Doc/积木报表.txt                          | 17 ++++++++++++++
 .../FengHuang/Exam/Model/ExamModel.java       | 23 +++++++++++--------
 2 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 Doc/积木报表.txt

diff --git a/Doc/积木报表.txt b/Doc/积木报表.txt
new file mode 100644
index 0000000..5bfa95c
--- /dev/null
+++ b/Doc/积木报表.txt
@@ -0,0 +1,17 @@
+# EXSI主机
+10.10.14.93
+root
+DsideaL4r5t6y7u!@#
+
+
+#积木报表访问办法
+http://10.10.14.66:8085/jmreport/list
+
+#显示全的
+http://10.10.14.66:8085/jmreport/view/810022805021978624?task_id=17
+
+# 只显示中班
+http://10.10.14.66:8085/jmreport/view/810022805021978624?task_id=17&bx_id=3
+
+# SQL中条件表达式
+https://www.kancloud.cn/zhangdaiscott/jimureport/2373410
\ No newline at end of file
diff --git a/src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java b/src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java
index 944286b..7d8e6b5 100644
--- a/src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java
+++ b/src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java
@@ -1,6 +1,8 @@
 package com.dsideal.FengHuang.Exam.Model;
 
 import cn.hutool.core.date.DateTime;
+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;
@@ -128,15 +130,15 @@ public class ExamModel {
         sql = "select t1.question_id,t1.type_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");
@@ -144,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;
     }