|
@@ -590,19 +590,18 @@ public final class DocxProcessUtil {
|
|
|
} else if (quesUnit == QuesUnit.QUES_ANSWER) {
|
|
|
|
|
|
// 过滤答案标题
|
|
|
- if (tmpText.matches("^\\[答案\\][:|:][\\s\\S]*")) {
|
|
|
- if (index == 2) {
|
|
|
- return p;
|
|
|
+ if(tmpText.contains(":") || tmpText.contains(":")){
|
|
|
+ if(tmpText.startsWith(":") || tmpText.startsWith(":")){
|
|
|
+ tmpText = tmpText.replaceFirst("[:|:]","");
|
|
|
+ text.setValue(tmpText);
|
|
|
+ }else{
|
|
|
+ tmpText = tmpText.replaceFirst("\\[","").replaceFirst("\\]","").replaceFirst("答案","");
|
|
|
+ text.setValue(tmpText);
|
|
|
}
|
|
|
- tmpText = tmpText.replaceFirst("\\[答案\\][:|:]","");
|
|
|
- text.setValue(tmpText);
|
|
|
- } else if(tmpText.matches("\\[") || tmpText.matches("\\]")){
|
|
|
- text.setValue("");
|
|
|
- } else if(tmpText.contains("答案")){
|
|
|
- text.setValue("");
|
|
|
- } else if(tmpText.contains(":") || tmpText.contains(":")){
|
|
|
- text.setValue("");
|
|
|
return p;
|
|
|
+ } else {
|
|
|
+ tmpText = tmpText.replaceFirst("\\[","").replaceFirst("\\]","").replaceFirst("答案","");
|
|
|
+ text.setValue(tmpText);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -914,6 +913,8 @@ public final class DocxProcessUtil {
|
|
|
}
|
|
|
|
|
|
public static void main(String[] args) {
|
|
|
- System.out.println("123".matches("^\\d{1,}$"));
|
|
|
+ for(QuesUnit quesUnit:QuesUnit.values()){
|
|
|
+ System.out.println(quesUnit.name()+" "+quesUnit.getName());
|
|
|
+ }
|
|
|
}
|
|
|
}
|