Merge remote-tracking branch 'origin/master'

# Conflicts:
#	exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/wps_word/WpsWordUtils.java
This commit is contained in:
DESKTOP-932OMT8\REN
2025-06-13 21:57:31 +08:00

View File

@@ -124,6 +124,7 @@ public class WpsWordUtils {
} else {
String function = wpsWordReqDto.getFunction();
String chineseName = wpsWordReqDto.getName();
WpsWordJudgementDto judgement = new WpsWordJudgementDto();
// 1-1、创建新的数据组
XmlCursor wpCursor = cursor.newCursor();
@@ -134,14 +135,6 @@ public class WpsWordUtils {
judgement.setContent(function + "-/true");
} else {
String value = wpCursor.getTextValue();
if (wpsWordReqDto.getName().contains("倾斜")) {
value = wpCursor.getAttributeText(new QName("w:val"));
if (value.contains("0")) {
value = "";
} else if (value.contains("0") || value == null) {
value = "";
}
}
value = getValueType(wpsWordReqDto, value);
judgement.setContentIn(chineseName + value);
judgement.setContent(function + "-/" + value);