fixbugs

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/common/domain/card/CardFile.java

@@ -1,16 +1,20 @@
 package cn.com.qmth.stmms.biz.common.domain.card;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+
 import cn.com.qmth.stmms.biz.mark.model.MarkConfigItem;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.lang3.StringUtils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.List;
 
 /**
  * 卡格式文件内容结构
@@ -90,11 +94,17 @@ public class CardFile {
     }
 
     public String getMarkConfigAdd(List<MarkConfig.ConfigItem> list, double position) {
+        DecimalFormat format = new DecimalFormat("####.###");
         for (MarkConfig.ConfigItem configItem : list) {
             configItem.left = configItem.left < position ? configItem.left : configItem.left - position;
             configItem.top = configItem.top < position ? configItem.top : configItem.top - position;
             configItem.width = configItem.width + position * 2;
             configItem.height = configItem.height + position * 2;
+
+            configItem.left = Double.valueOf(format.format(configItem.left));
+            configItem.top = Double.valueOf(format.format(configItem.top));
+            configItem.width = Double.valueOf(format.format(configItem.width));
+            configItem.height = Double.valueOf(format.format(configItem.height));
         }
         return StringUtils.join(list, MarkConfigItem.DB_ITEM_JOINER);
     }

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/PaperController.java

@@ -922,7 +922,7 @@ public class PaperController extends BaseExamController {
                         for (Integer number : mainMap.keySet()) {
                             MarkGroup group = new MarkGroup(examId, subject.getCode(), number, null,
                                     mainMap.get(number), null, null, null, null, 0, false, false, null, false);
-                            group.setPicList(cardFile.getMarkConfigAdd(cardFile.getMarkConfig(number), 0.01));
+                            group.setPicList(cardFile.getMarkConfigAdd(cardFile.getMarkConfig(number), 0.015));
                             groupService.save(group);
                         }
                         subjectService.updateScore(examId, subject.getCode(), false,

stmms-web/src/main/webapp/sql/stmms_ft.sql

@@ -412,7 +412,7 @@ CREATE TABLE `eb_mark_group`
     `exam_id`             int(11)     NOT NULL COMMENT '考试ID',
     `subject_code`        varchar(32) NOT NULL COMMENT '科目代码',
     `number`              int(11)     NOT NULL COMMENT '序号',
-    `pic_list`            varchar(255) DEFAULT NULL COMMENT '小图配置',
+    `pic_list`            text 		  DEFAULT NULL COMMENT '小图配置',
     `total_score`         double      NOT NULL COMMENT '满分',
     `double_rate`         double       DEFAULT NULL COMMENT '双评比例',
     `arbitrate_threshold` double       DEFAULT NULL COMMENT '仲裁阈值',