|
@@ -1,5 +1,6 @@
|
|
|
package com.rf.psychological.module.imports;
|
|
|
|
|
|
+import cn.hutool.core.util.NumberUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.rf.psychological.base.rest.BaseController;
|
|
|
import com.rf.psychological.dao.model.DimensionEntity;
|
|
@@ -11,10 +12,10 @@ import com.rf.psychological.scale.service.ScaleMarksService;
|
|
|
import com.rf.psychological.scale.service.SubjectService;
|
|
|
import com.rf.psychological.utils.ExcelUtil;
|
|
|
import com.rf.psychological.utils.Result;
|
|
|
-import com.rf.psychological.utils.StringUtils;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.apache.commons.lang.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
@@ -199,7 +200,7 @@ public class ScaleRulesImport extends BaseController {
|
|
|
tempUserDB.setIsTotalScoreExplain(String.valueOf(mark.get(8)));
|
|
|
} else {
|
|
|
//如果常模参考值有给且也有标准差,则标准差是由excel表格确定
|
|
|
- if (StringUtils.isNumber(String.valueOf(mark.get(4)))) {
|
|
|
+ if (NumberUtil.isNumber(String.valueOf(mark.get(4)))) {
|
|
|
tempUserDB.setStandardDeviation(String.valueOf(mark.get(4)));
|
|
|
tempUserDB.setSymptom(String.valueOf(mark.get(5)));
|
|
|
tempUserDB.setNameExplain(String.valueOf(mark.get(6)));
|