|
@@ -500,6 +500,10 @@ public abstract class ExportPaperAbstractService {
|
|
* 4.替换题干中的##为____
|
|
* 4.替换题干中的##为____
|
|
*/
|
|
*/
|
|
public void setQuestionNumberForWord(List<PaperDetailExp> paperDetails) throws Exception {
|
|
public void setQuestionNumberForWord(List<PaperDetailExp> paperDetails) throws Exception {
|
|
|
|
+ if (CollectionUtils.isEmpty(paperDetails)) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
for (PaperDetailExp paperDetail : paperDetails) {
|
|
for (PaperDetailExp paperDetail : paperDetails) {
|
|
List<PaperDetailUnitExp> paperDetailUnitExpList = paperDetail.getPaperDetailUnits();
|
|
List<PaperDetailUnitExp> paperDetailUnitExpList = paperDetail.getPaperDetailUnits();
|
|
for (PaperDetailUnitExp paperDetailUnit : paperDetailUnitExpList) {
|
|
for (PaperDetailUnitExp paperDetailUnit : paperDetailUnitExpList) {
|
|
@@ -1488,6 +1492,10 @@ public abstract class ExportPaperAbstractService {
|
|
* 对相同类型的大题分组,生成不同的集合放入小题,再对小题排序
|
|
* 对相同类型的大题分组,生成不同的集合放入小题,再对小题排序
|
|
*/
|
|
*/
|
|
public void sortPaperDetailUnits(List<PaperDetailExp> details) {
|
|
public void sortPaperDetailUnits(List<PaperDetailExp> details) {
|
|
|
|
+ if (CollectionUtils.isEmpty(details)) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
int index = 0;
|
|
int index = 0;
|
|
Map<Long, List<PaperDetailUnitExp>> map = new HashMap<>();
|
|
Map<Long, List<PaperDetailUnitExp>> map = new HashMap<>();
|
|
|
|
|
|
@@ -1551,6 +1559,10 @@ public abstract class ExportPaperAbstractService {
|
|
* 如果每个小题分数不一致,题干后面添加分数;一致时则不用加
|
|
* 如果每个小题分数不一致,题干后面添加分数;一致时则不用加
|
|
*/
|
|
*/
|
|
public void setQuestionScoreForHtml(List<PaperDetailExp> details) {
|
|
public void setQuestionScoreForHtml(List<PaperDetailExp> details) {
|
|
|
|
+ if (CollectionUtils.isEmpty(details)) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
for (PaperDetailExp detail : details) {
|
|
for (PaperDetailExp detail : details) {
|
|
if (checkPaperDetailUnitScore(detail) != null) {
|
|
if (checkPaperDetailUnitScore(detail) != null) {
|
|
continue;//分数一致
|
|
continue;//分数一致
|
|
@@ -1611,6 +1623,10 @@ public abstract class ExportPaperAbstractService {
|
|
* 4.替换题干中的##为____
|
|
* 4.替换题干中的##为____
|
|
*/
|
|
*/
|
|
public void setQuestionNumberForHtml(List<PaperDetailExp> details) {
|
|
public void setQuestionNumberForHtml(List<PaperDetailExp> details) {
|
|
|
|
+ if (CollectionUtils.isEmpty(details)) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
for (PaperDetailExp detail : details) {
|
|
for (PaperDetailExp detail : details) {
|
|
List<PaperDetailUnitExp> units = detail.getPaperDetailUnits();
|
|
List<PaperDetailUnitExp> units = detail.getPaperDetailUnits();
|
|
for (PaperDetailUnitExp unit : units) {
|
|
for (PaperDetailUnitExp unit : units) {
|