公式相关

blade-service/blade-manager/src/main/java/com/mixsmart/utils/CustomFunction.java

@@ -1930,12 +1930,12 @@ public class CustomFunction {
 	 * @Author yangyj
 	 * @Date 2022.02.11 10:09
 	 **/
-	public static Object checkpoints(Object data ,Object remark,Object design,Object dev){
+	public static Object checkpoints(Object data ,Object remark,Object design,Object dev,Object xN){
 		if(data!=null){
 			    if(data instanceof  String &&((String) data).contains("NumberFormatException")){
 			    	return data;
 				}
-				Object[] R=ck(data,design,dev);
+				Object[] R=ck(data,design,dev,xN);
 				if(R[0]!=null&&R[1]!=null&&R[2]!=null){
 					int checkpoints=Integer.parseInt(R[0].toString());
 					int passpoints=Integer.parseInt(R[1].toString());
@@ -1966,7 +1966,7 @@ public class CustomFunction {
 		return "/";
 	}
 
-	public static Object[] ck(Object data ,Object design,Object dev){
+	public static Object[] ck(Object data ,Object design,Object dev,Object xN){
 		Object[] r=new Object[3];
 		List<Object> result = new ArrayList<>();
 		List<Object> datas = obj2List(removeEmpty(data));
@@ -1993,7 +1993,7 @@ public class CustomFunction {
 			}
 			result=result.stream().map(StringUtils::handleNull).map(String::trim).filter(e->!StringUtils.isEquals("/",e)).collect(Collectors.toList());
 			if(result.size()>0){
-				List<Object> pl = passList(design,dev,result,1);
+				List<Object> pl = passList(design,dev,result,xN);
 				passpoints+= pl.size();
 				result=obj2List(result);
 				checkpoints+=result.size();
@@ -2037,7 +2037,7 @@ public class CustomFunction {
 	 **/
 	public static Object qrate(Object design,Object dev,Object data,Object scale,Object xN){
 		 if(data!=null&&StringUtils.isNotEmpty(design,dev,xN)){
-              Object[] R=ck(data,design,dev);
+              Object[] R=ck(data,design,dev,xN);
               if(R[0]!=null&&R[1]!=null&&Math.abs(Double.parseDouble(R[0].toString()))>0){
                 	String result=StringUtils.number2String(Double.parseDouble(R[1].toString())*100/Double.parseDouble(R[0].toString()),scale);
 				  if(result.contains(".")){

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/FormulaController.java

@@ -107,9 +107,6 @@ public class FormulaController {
     public R<FormulaBean> detail(Formula f) {
         Formula detail = service.getOne(Condition.getQueryWrapper(f));
         if(detail!=null){
-//            if(detail.getFormula().contains("<")||detail.getFormula().contains(">")){
-//                detail.setFormula(detail.getFormula().replace("<","\\<").replace(">","\\>"));
-//            }
            return R.data(BeanUtil.copy(detail,FormulaBean.class));
         }
         return R.success("无数据");