代码调整

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TCFinalScoreServiceImpl.java

@@ -130,15 +130,15 @@ public class TCFinalScoreServiceImpl extends ServiceImpl<TCFinalScoreMapper, TCF
                                 } else if (Objects.equals(columnNames[j].trim(), "姓名")) {
                                     tcFinalScore.setName(strs[j]);
                                 } else if (Objects.equals(columnNames[j].trim(), "成绩")) {
-                                    if (SystemConstant.isDouble(strs[j])) {
-                                        Double scoreTemp = Double.valueOf(SystemConstant.df.format(Double.valueOf(strs[j])));
+                                    Double scoreTemp = SystemConstant.isDouble(strs[j]);
+                                    if (Objects.nonNull(scoreTemp)) {
                                         tcFinalScore.setScore(scoreTemp);
                                     } else {
                                         errorData.add("excel第").add((i + 1) + "").add("行[").add(columnNames[j]).add("]请输入数字").add("\r\n");
                                         error = true;
                                     }
                                 } else {
-                                    if (SystemConstant.isDouble(strs[j])) {
+                                    if (Objects.nonNull(SystemConstant.isDouble(strs[j]))) {
                                         score = score.add(new BigDecimal(strs[j]));
                                         tcFinalScoreDtoList.add(new TCFinalScoreDto(strs[j], columnNames[j]));
                                     } else {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TCUsualScoreServiceImpl.java

@@ -112,8 +112,8 @@ public class TCUsualScoreServiceImpl extends ServiceImpl<TCUsualScoreMapper, TCU
                                 } else if (Objects.equals(columnNames[j].trim(), "姓名")) {
                                     tcUsualScore.setName(strs[j]);
                                 } else {
-                                    if (SystemConstant.isDouble(strs[j])) {
-                                        Double score = Double.valueOf(SystemConstant.df.format(Double.valueOf(strs[j])));
+                                    Double score = SystemConstant.isDouble(strs[j]);
+                                    if (Objects.nonNull(score)) {
                                         if (score.doubleValue() > totalScore.doubleValue()) {
                                             errorData.add("excel第").add((i + 1) + "").add("行[").add(columnNames[j]).add("]总分大于试卷总分").add("\r\n");
                                             error = true;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -1263,17 +1263,12 @@ public class SystemConstant {
      * @param str
      * @return
      */
-    public static boolean isDouble(String str) {
-        Double scoreTemp = null;
+    public static Double isDouble(String str) {
+        Double score = null;
         try {
-            scoreTemp = Double.valueOf(SystemConstant.df.format(Double.valueOf(str)));
+            score = Double.valueOf(SystemConstant.df.format(Double.valueOf(str)));
         } catch (Exception e) {
-        } finally {
-            if (Objects.nonNull(scoreTemp)) {
-                return true;
-            } else {
-                return false;
-            }
         }
+        return score;
     }
 }

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/utils/BatchGetDataUtil.java

@@ -12,7 +12,6 @@ import org.apache.commons.collections4.CollectionUtils;
  */
 public abstract  class BatchGetDataUtil<R,P> {
 	/**
-	 * @param resultList 全部结果集合
 	 * @param paramList 全部参数集合
 	 * @param batchSize 每批参数数量
 	 */
@@ -43,8 +42,6 @@ public abstract  class BatchGetDataUtil<R,P> {
 	}
 	/**
 	 * 	每批获取数据方法
-	 * @param <R>
-	 * @param <P>
 	 * @param paramList 获取每批数据时参数
 	 * @return
 	 */