update

src/main/java/cn/com/qmth/scancentral/service/impl/AnswerCardServiceImpl.java

@@ -116,7 +116,10 @@ public class AnswerCardServiceImpl extends MppServiceImpl<AnswerCardDao, AnswerC
             throw new ParameterException("文件解析失败", e);
         }
 
-        int number = this.findMaxCardNumberByExamId(info.getExamId()) + 1;
+        Integer number = info.getNumber();
+        if(number==null){
+            number=this.findMaxCardNumberByExamId(info.getExamId()) + 1;
+        }
 
         String filePath;
         try {
@@ -134,16 +137,21 @@ public class AnswerCardServiceImpl extends MppServiceImpl<AnswerCardDao, AnswerC
             answerCardSubjectService.saveOrUpdateByMultiId(as);
         }
 
-        AnswerCardEntity entity = new AnswerCardEntity();
-        entity.setExamId(info.getExamId());
-        entity.setNumber(number);
+        AnswerCardEntity entity = this.findByExamAndNumber(info.getExamId(),number);
+        if(entity == null ){
+            entity = new AnswerCardEntity();
+            entity.setExamId(info.getExamId());
+            entity.setNumber(number);
+        }
         entity.setSliceConfig(sliceConfig);
         entity.setSliceName(sliceName);
         entity.setPath(filePath);
         entity.setNeedAdapte(false);
         entity.setSource(CardSource.CLIENT);
-        entity.setSinglePage(cardFile.isDuplex()==null?true:!cardFile.isDuplex());
-        entity.setPaperCount(entity.getSinglePage()?cardFile.getPages().size():cardFile.getPages().size()/2);
+        entity.setSinglePage(info.getSinglePage());
+        entity.setPaperCount(info.getPaperCount());
+//        entity.setSinglePage(cardFile.isDuplex()==null?true:!cardFile.isDuplex());
+//        entity.setPaperCount(entity.getSinglePage()?cardFile.getPages().size():cardFile.getPages().size()/2);
         entity.setParameter(info.getParameter());
         entity.setRemark(info.getRemark());
         if(cardFile.getPageSize()!=null){

src/main/java/cn/com/qmth/scancentral/vo/card/CardEdit.java

@@ -7,7 +7,7 @@ public class CardEdit {
     @ApiModelProperty(value = "考试ID", required = true)
     private Long examId;
 
-    @ApiModelProperty(value = "卡格式编号", hidden = true)
+    @ApiModelProperty(value = "卡格式编号", required = false,hidden = false)
     private Integer number;
 
     @ApiModelProperty(value = "科目代码")
@@ -25,10 +25,10 @@ public class CardEdit {
     @ApiModelProperty(value = "DPI", hidden = true)
     private Integer dpi;
 
-    @ApiModelProperty(value = "张数", hidden = true)
+    @ApiModelProperty(value = "张数", required = true)
     private Integer paperCount;
 
-    @ApiModelProperty(value = "单页题卡", hidden = true)
+    @ApiModelProperty(value = "单页题卡", required = true)
     private Boolean singlePage;
 
     public Long getExamId() {