处理异常

ims-service/ims-eval/src/main/java/com/ims/eval/dao/CalculateIndicatorItemInfoMapper.java

@@ -15,7 +15,6 @@ import java.util.List;
  * @author xugp
  * @since 2023-03-26
  */
-@DataPermission(isPermission = false)
 public interface CalculateIndicatorItemInfoMapper extends BaseMapper<CalculateIndicatorItemInfo> {
 
 

ims-service/ims-eval/src/main/java/com/ims/eval/entity/SelfMathFormulaEnum.java

@@ -26,9 +26,7 @@ public enum SelfMathFormulaEnum {
 		sin("sin", 1, 3,"sin()", "返回数的正弦"),
 		sqrt("sqrt", 1, 4,"sqrt()", "返回数的平方根"),
 		tan("tan", 1, 3,"tan()", "返回角的正切"),
-	    ifs("if",3, 2,"if(,,)", "if表达式"),
-		maxnum("maxnum",1,6,"maxnum()","返回一组数据的最大值"),
-	    minnum("minnum",1,6,"minnum()","返回一组数据的最小值");
+	    ifs("if",3, 2,"if(,,)", "if表达式");
 
 
 		/**

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/OrganizationEvaluationInfoServiceImpl.java

@@ -1019,14 +1019,14 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 				scoreid = entry.getValue().toString();
 				if(null != valueMap.get(entry.getKey().replace("ID_", ""))) {
 
-					//加分 扣分 加扣分原因
-					if (entry.getKey().endsWith("_JFYY")) {
-						jfRemark = valueMap.get(entry.getKey().replace("ID_", "")).toString();
-					}
-
-					if (entry.getKey().endsWith("_KFYY")) {
-						kfRemark = valueMap.get(entry.getKey().replace("ID_", "")).toString();
-					}
+//					//加分 扣分 加扣分原因
+//					if (entry.getKey().endsWith("_JFYY")) {
+//						jfRemark = valueMap.get(entry.getKey().replace("ID_", "")).toString();
+//					}
+//
+//					if (entry.getKey().endsWith("_KFYY")) {
+//						kfRemark = valueMap.get(entry.getKey().replace("ID_", "")).toString();
+//					}
 
 
 					if ("1".equals(quantified)) {
@@ -1062,6 +1062,9 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 				evaluationInfos.add(info);
 			}
 
+			if(null == evaluationInfos || evaluationInfos.size()<=0){
+				return false;
+			}
 			boolean b = this.saveOrUpdateBatch(evaluationInfos);
 			if(b && null !=evaluationInfos && evaluationInfos.size()>0){
 				OrganizationEvaluationInfo info = this.getById(scoreid);

ims-service/ims-eval/src/main/java/com/ims/eval/util/MathCalculatorUtil.java

@@ -681,12 +681,7 @@ public class MathCalculatorUtil {
 					result  = Double.valueOf(calculator(args[2]));
 				}
 				break;
-			case maxnum:
-				result = Double.parseDouble(args[0]);
-				break;
-			case minnum:
-				result = Double.parseDouble(args[0]);
-				break;
+
 			default:
 				throw new RuntimeException("找不到匹配的计算公式！");