diff --git a/src/main/java/com/example/exam/exam/service/wpsword/docx4j/DocxMaster.java b/src/main/java/com/example/exam/exam/service/wpsword/docx4j/DocxMaster.java index 874f4af..00f246a 100644 --- a/src/main/java/com/example/exam/exam/service/wpsword/docx4j/DocxMaster.java +++ b/src/main/java/com/example/exam/exam/service/wpsword/docx4j/DocxMaster.java @@ -9,6 +9,7 @@ import com.example.exam.exam.service.wpsword.docx4j.paragraph.Paragraphs; import com.example.exam.exam.service.wpsword.docx4j.paragraph.RunText; import com.example.exam.exam.service.wpsword.docx4j.section.SectionPage; import com.example.exam.exam.service.wpsword.docx4j.table.TableIng; +import com.example.exam.exam.service.wpsword.docx4j.text.TextInfo; import com.example.exam.exam.service.wpsword.docx4j.utils.WpsWordNameSpaces; import com.example.exam.exam.service.wpsword.docx4j.utils.XmlUtil; import com.example.exam.exam.service.wpsword.docx4j.vo.JudgementWordsVO; @@ -146,7 +147,7 @@ public class DocxMaster { ++i; SectPr sectPr = section.getSectPr(); - if (sectPr != null && firstName.contains("节")) { + if (sectPr != null && firstName.contains("节")) { if (i == Integer.parseInt(indexParm)) { // 构造一个伪段落,包裹 sectPr 传入方法 P dummyP = new P(); @@ -462,7 +463,7 @@ public class DocxMaster { if (anchor != null) { // 反射调用文本框处理方法(传 Anchor) - Class textClass = pc.exam.pp.module.judgement.utils.wps_word.docx4j.text.TextInfo.class; + Class textClass = TextInfo.class; String value = null; try { Method method = textClass.getMethod(function, List.class, @@ -634,8 +635,6 @@ public class DocxMaster { e.printStackTrace(); } - break; // 找到指定表格就退出 - } diff --git a/src/main/java/com/example/exam/exam/service/wpsword/docx4j/paragraph/Paragraphs.java b/src/main/java/com/example/exam/exam/service/wpsword/docx4j/paragraph/Paragraphs.java index 72fe8cd..5b271ad 100644 --- a/src/main/java/com/example/exam/exam/service/wpsword/docx4j/paragraph/Paragraphs.java +++ b/src/main/java/com/example/exam/exam/service/wpsword/docx4j/paragraph/Paragraphs.java @@ -1,4 +1,4 @@ -package pc.exam.pp.module.judgement.utils.wps_word.docx4j.paragraph; +package com.example.exam.exam.service.wpsword.docx4j.paragraph; import com.example.exam.exam.service.wpsword.docx4j.paragraph.Convert; import com.example.exam.exam.service.wpsword.docx4j.utils.ColorUtils; @@ -519,7 +519,6 @@ public class Paragraphs { CTBorder bottom = border.getBottom(); CTBorder left = border.getLeft(); CTBorder right = border.getRight(); - if (top != null && bottom != null && left != null && right != null) { String topVal = translateBorderVal(top.getVal().value()); String bottomVal = translateBorderVal(bottom.getVal().value()); diff --git a/src/main/java/com/example/exam/exam/service/wpsword/docx4j/paragraph/RunText.java b/src/main/java/com/example/exam/exam/service/wpsword/docx4j/paragraph/RunText.java index 1b47a84..b473c9e 100644 --- a/src/main/java/com/example/exam/exam/service/wpsword/docx4j/paragraph/RunText.java +++ b/src/main/java/com/example/exam/exam/service/wpsword/docx4j/paragraph/RunText.java @@ -5,7 +5,6 @@ import org.docx4j.XmlUtils; import org.docx4j.openpackaging.parts.WordprocessingML.StyleDefinitionsPart; import org.docx4j.wml.*; import java.util.List; - public class RunText { // 句子-字号(返回第一个有效值) @@ -330,8 +329,6 @@ public class RunText { if (run == null) continue; RPr rPr = run.getRPr(); if (rPr != null && rPr.getU() != null && rPr.getU().getColor() != null) { - System.out.println("============================================================"); - System.out.println(ColorUtils.getChineseColorName(rPr.getU().getColor())+"''''''''''''''''''''''''''''''''''''"); return ColorUtils.getChineseColorName(rPr.getU().getColor()); } } @@ -345,8 +342,6 @@ public class RunText { Style style = stylePart.getStyleById(styleId); if (style != null && style.getRPr() != null && style.getRPr().getU() != null && style.getRPr().getU().getColor() != null) { - System.out.println("============================================================"); - System.out.println(ColorUtils.getChineseColorName(style.getRPr().getU().getColor())); return ColorUtils.getChineseColorName(style.getRPr().getU().getColor()); } } catch (Exception e) { diff --git a/src/main/resources/mapper/error/ExamErrorQuestionMapper.xml b/src/main/resources/mapper/error/ExamErrorQuestionMapper.xml index 1778fc9..8b4103f 100644 --- a/src/main/resources/mapper/error/ExamErrorQuestionMapper.xml +++ b/src/main/resources/mapper/error/ExamErrorQuestionMapper.xml @@ -4,12 +4,11 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + DELETE FROM exam_error_question WHERE qu_id = #{quId} AND creator = #{userId} AND tenant_id = #{tenantId} - \ No newline at end of file