fix

file/临时.txt

@@ -73,7 +73,7 @@ CREATE TABLE `temp_subject` (
   `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
 检查是否有包含公式的题
-select q.id,q.question_type,q.topic,q.difficulty,q.answer
+select q.id,q.question_type,q.topic,q.answer,an.answer_text
 					from wq_question_bank_subject t left join wq_subject sub on t.subject_id=sub.id
 					left join wq_question_bank b on t.question_bank_id=b.id
 					left join wq_question_question_bank f on t.question_bank_id=f.question_bank_id
@@ -84,7 +84,16 @@ and sub.subject_code in (select yun_code from temp_subject)
 and b.rent_id=811 and b.is_deleted=0 and q.is_deleted=0 and q.rent_id=811
 and (q.topic like '%$$%' or q.answer like '%$$%' or an.answer_text like '%$$%');
 
-java代码更新属性树wq_knowledge_system新加的字段root_id
+处理公式的临时表
+CREATE TABLE `temp_gs` (
+  `id` bigint NOT NULL,
+  `content1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
+  `content2` text COLLATE utf8mb4_bin,
+  `content3` text COLLATE utf8mb4_bin,
+  `content4` text COLLATE utf8mb4_bin,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
+
 update wq_question INNER JOIN temp_gs on wq_question.id=temp_gs.id
 set wq_question.topic= CONCAT_WS('',temp_gs.content1,temp_gs.content2,temp_gs.content3,temp_gs.content4);
 
@@ -94,6 +103,9 @@ set wq_question.answer= CONCAT_WS('',temp_gs.content1,temp_gs.content2,temp_gs.c
 update wq_question_answer_item INNER JOIN temp_gs on wq_question_answer_item.id=temp_gs.id
 set wq_question_answer_item.answer_text= CONCAT_WS('',temp_gs.content1,temp_gs.content2,temp_gs.content3,temp_gs.content4);
 
+java代码更新属性树wq_knowledge_system新加的字段root_id
+
+
 #查询wq_question表中question_id!=-1的数据，将有效的question补入wq_question_question_bank。将套题作为单独的题处理
 #insert into wq_question_question_bank (question_bank_id,question_id)
 #select question_bank_id,question_id from temp_childer;

src/main/java/cn/com/qmth/export/ExportPaperByCourseCode.java

@@ -11,9 +11,9 @@ import org.apache.log4j.Logger;
 public class ExportPaperByCourseCode {
 	private static Logger logger = LogManager.getLogger(ExportPaperByCourseCode.class);
 	//试卷后缀
-	private static String paperSuff = "(240313)";
+	private static String paperSuff = "(240612)";
 	//数据库名
-	private static String dbName="yunkai_question6";
+	private static String dbName="yunkai_240612";
 	private static AtomicInteger count=new AtomicInteger(0);
 	
 	public static void main(String[] args) {

src/main/java/cn/com/qmth/export/ExportProperty.java

@@ -26,7 +26,7 @@ import com.alibaba.fastjson.JSONObject;
 
 public class ExportProperty {
 	private static Logger logger = LogManager.getLogger(ExportProperty.class);
-	private static String dbName="yunkai_question6";
+	private static String dbName="yunkai_240612";
 	private final static String sourceDir = "d:/yunkai/";
 	public static void main(String[] args) {
 		logger.debug("导出开始");

src/main/java/cn/com/qmth/export/MyConsumer.java

@@ -39,7 +39,7 @@ public class MyConsumer extends Consumer<PaperExportDto> {
 		try {
 			Class.forName("com.mysql.cj.jdbc.Driver");
 
-			String url = "jdbc:mysql://localhost:3306/"+dto.getDbName()+"?serverTimezone=GMT%2B8";
+			String url = "jdbc:mysql://localhost:3306/" + dto.getDbName() + "?serverTimezone=GMT%2B8";
 
 			String user = "root";
 
@@ -83,8 +83,8 @@ public class MyConsumer extends Consumer<PaperExportDto> {
 				q.setBody(disposeImg(resultSet.getString("topic"), courseCode));
 				q.setQst(YunkaiQuesStructType.getByYunKaiType(resultSet.getInt("question_type")));
 				q.setQuesStructType(QuesStructType.getQuesStructTypeById(q.getQst().getType()));
-				YunkaiDifficulty yd=YunkaiDifficulty.getByYunKaiType(resultSet.getInt("difficulty"));
-				q.setDifficultyDegree(yd==null?0.5:yd.getType());
+				YunkaiDifficulty yd = YunkaiDifficulty.getByYunKaiType(resultSet.getInt("difficulty"));
+				q.setDifficultyDegree(yd == null ? 0.5 : yd.getType());
 //				if (!q.getQst().isObjective()) {
 //					continue;
 //				}
@@ -302,8 +302,8 @@ public class MyConsumer extends Consumer<PaperExportDto> {
 	 * @param number
 	 * @return
 	 */
-	private String getOptionNum(int number) {
-		char optionNum = (char) (65 + number);
+	private  String getOptionNum(int number) {
+		char optionNum = (char) (64 + number);
 		return String.valueOf(optionNum);
 	}
 
@@ -374,6 +374,15 @@ public class MyConsumer extends Consumer<PaperExportDto> {
 
 		Map<YunkaiQuesStructType, List<KdQuestion>> qmap = new HashMap<>();
 		for (KdQuestion q : qs) {
+			if (QuesStructType.SINGLE_ANSWER_QUESTION.equals(q.getQuesStructType())
+					|| QuesStructType.MULTIPLE_ANSWER_QUESTION.equals(q.getQuesStructType())) {
+				if(CollectionUtils.isEmpty(q.getOptions())) {
+					continue;
+				}
+				if(q.getOptions().size()==1) {
+					continue;
+				}
+			}
 			List<KdQuestion> list = qmap.get(q.getQst());
 			if (list == null) {
 				list = new ArrayList<>();

src/main/java/cn/com/qmth/export/SetRootId.java

@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.Map;
 
 public class SetRootId {
-	private static String dbName="yunkai_question6";
+	private static String dbName="yunkai_240612";
 	public static void main(String[] args) {
 		System.out.println("开始处理");
 		Connection connect = null;