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:
@@ -124,6 +124,7 @@ public class WpsWordUtils {
|
|||||||
} else {
|
} else {
|
||||||
String function = wpsWordReqDto.getFunction();
|
String function = wpsWordReqDto.getFunction();
|
||||||
String chineseName = wpsWordReqDto.getName();
|
String chineseName = wpsWordReqDto.getName();
|
||||||
|
|
||||||
WpsWordJudgementDto judgement = new WpsWordJudgementDto();
|
WpsWordJudgementDto judgement = new WpsWordJudgementDto();
|
||||||
// 1-1、创建新的数据组
|
// 1-1、创建新的数据组
|
||||||
XmlCursor wpCursor = cursor.newCursor();
|
XmlCursor wpCursor = cursor.newCursor();
|
||||||
@@ -134,14 +135,6 @@ public class WpsWordUtils {
|
|||||||
judgement.setContent(function + "-/true");
|
judgement.setContent(function + "-/true");
|
||||||
} else {
|
} else {
|
||||||
String value = wpCursor.getTextValue();
|
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);
|
value = getValueType(wpsWordReqDto, value);
|
||||||
judgement.setContentIn(chineseName + value);
|
judgement.setContentIn(chineseName + value);
|
||||||
judgement.setContent(function + "-/" + value);
|
judgement.setContent(function + "-/" + value);
|
||||||
|
Reference in New Issue
Block a user