|
@@ -13,6 +13,7 @@ import com.ims.eval.entity.dto.response.IndicatorResDTO;
|
|
|
import com.ims.eval.entity.dto.response.OrganizationEvaluationInfoResDTO;
|
|
|
import com.ims.eval.service.*;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import com.ims.eval.util.MathCalculatorUtil;
|
|
|
import lombok.extern.log4j.Log4j2;
|
|
|
import org.apache.commons.io.output.ByteArrayOutputStream;
|
|
|
import org.apache.poi.hssf.usermodel.HSSFCell;
|
|
@@ -726,7 +727,13 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
|
|
|
info.setId(entry.getValue().toString());
|
|
|
boolean quantified = Boolean.valueOf(valueMap.get(entry.getKey().replace("ID_","IS_LH_")).toString());
|
|
|
if(quantified){
|
|
|
- info.setQuantifiedValue(Double.valueOf(valueMap.get(entry.getKey().replace("ID_","")).toString()));
|
|
|
+
|
|
|
+ if(MathCalculatorUtil.isNumber(String.valueOf(valueMap.get(entry.getKey().replace("ID_","")).toString()))){
|
|
|
+ info.setQuantifiedValue(Double.valueOf(valueMap.get(entry.getKey().replace("ID_","")).toString()));
|
|
|
+ }else {
|
|
|
+ info.setQuantifiedValue(0);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
System.out.println(entry.getKey().replace("ID_","")+"="+valueMap.get(entry.getKey().replace("ID_","")).toString());
|
|
|
|