单位评级规则

ims-common/src/main/java/com/ims/common/utils/FormulaUtils.java

@@ -70,6 +70,11 @@ public class FormulaUtils {
 	}
 
 
+	/**
+	 * 计算结果返回double类型
+	 * @param formula
+	 * @return
+	 */
 	public static double calculateFormula(String formula){
 		try {
 			FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
@@ -92,5 +97,38 @@ public class FormulaUtils {
 	}
 
 
+	/**
+	 * 计算结果返回String类型
+	 * @param formula
+	 * @return
+	 */
+	public static String calculateFormulaString(String formula){
+		try {
+			FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
+
+			Sheet sheet = workbook.createSheet();
+			Row row = sheet.createRow(0);
+			Cell cell = row.createCell(0);
+			cell.setCellFormula(formula);
+			cell.setCellType(CellType.FORMULA);
+
+			String  value = evaluator.evaluate(cell).getStringValue();
+			log.info("计算结果："+value+" = "+formula);
+			return value;
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.error("FormulaUtils==excel公式解析异常： ", e.getMessage());
+		}
+
+		return "";
+	}
+
+
+	public static void main(String[] args) {
+		String va = calculateFormulaString("IF(AND(50<=50,50>=0),\"a\",IF(AND(50>50,50<=100),\"b\",IF(50>100,\"c\",\"\")))");
+		System.out.println(va);
+	}
+
+
 
 }

ims-service/ims-eval/src/main/java/com/ims/eval/controller/BinSectionController.java

@@ -1,6 +1,7 @@
 package com.ims.eval.controller;
 
 
+import com.ims.common.utils.StringUtils;
 import com.ims.eval.cache.CacheContext;
 import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.BinSection;
@@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -44,8 +46,13 @@ public class BinSectionController {
 	@GetMapping(value = "list")
 	public R list(@RequestParam(value = "id", required = false) String id,
 				  @RequestParam(value = "sectionName", required = false) String sectionName,
-				  @RequestParam(value = "sectionCode", required = false) String sectionCode) {
+				  @RequestParam(value = "sectionCode", required = false) String sectionCode,
+				  @RequestParam(value = "type", required = false) String type) {
 		List<BinSection> list =CacheContext.bsnList;
+		if(StringUtils.isNotEmpty(list)){
+			list = list.stream().filter(s -> s.getType().equals(type)).collect(Collectors.toList());
+		}
+
 		return R.ok().data(list);
 	}
 

ims-service/ims-eval/src/main/java/com/ims/eval/controller/EvaluationPortalController.java

@@ -1,7 +1,10 @@
 package com.ims.eval.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.eval.entity.EvaluationPersonnel;
+import com.ims.eval.entity.EvaluationPortal;
+import com.ims.eval.entity.Indicator;
 import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.service.IEvaluationPortalService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,4 +38,14 @@ public class EvaluationPortalController {
 		return R.ok().data(data);
 	}
 
+
+	@GetMapping(value = "listPage")
+	public R listpage(String binSection, String year, String season) {
+		Map<String, Object> data = portalService.getPortalData(binSection, year, season);
+
+		IPage<EvaluationPortal> list = portalService.listPage(binSection, year, season);
+		return R.ok().data(data);
+	}
+
+
 }

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

@@ -54,6 +54,10 @@ public class BinSection extends Model {
 
 
 	/**
+	 * 类型（更具实际情况设设置）
+	 */
+	private String type;
+	/**
 	 * 父id
 	 */
 //	@TableField(exist = false)

ims-service/ims-eval/src/main/java/com/ims/eval/service/IEvaluationPortalService.java

@@ -1,5 +1,6 @@
 package com.ims.eval.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.eval.entity.EvaluationPortal;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ims.eval.entity.EvaluationPortalAttach;
@@ -50,4 +51,14 @@ public interface IEvaluationPortalService extends IService<EvaluationPortal> {
 	 */
 	void rating(String organizationEvaluationId);
 
+
+	/**
+	 * 分页查询
+	 * @param binSection
+	 * @param year
+	 * @param season
+	 * @return
+	 */
+	IPage<EvaluationPortal> listPage(String binSection, String year, String season);
+
 }

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

@@ -1,6 +1,7 @@
 package com.ims.eval.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.common.utils.DateUtils;
 import com.ims.common.utils.StringUtils;
 import com.ims.eval.config.CustomException;
@@ -115,5 +116,10 @@ public class EvaluationPortalServiceImpl extends ServiceImpl<EvaluationPortalMap
 
 	}
 
+	@Override
+	public IPage<EvaluationPortal> listPage(String binSection, String year, String season) {
+		return null;
+	}
+
 
 }

ims-service/ims-eval/src/main/resources/mappers/OrganizationRatingMapper.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ims.eval.dao.OrganizationRatingMapper">
+
+
+    <select id="selectList" resultType="com.ims.eval.entity.OrganizationRating">
+
+        select
+            r.*,
+            bs.section_name binsectionname,
+        from
+            organization_rating r
+            left join bin_section bs on bs.id = r.bin_stage
+        <where>
+
+
+            <if test="id !=null and id !=''">
+                and r.id=#{id}
+            </if>
+
+            <if test="binSection !=null and binSection !=''">
+                and r.bin_section=#{binSection}
+            </if>
+
+
+            <if test="ruleName !=null and ruleName !=''">
+                AND  r.rule_name like CONCAT('%',#{ruleName},'%')
+            </if>
+
+            <if test="checkCycle !=null and checkCycle !=''">
+                and r.check_cycle=#{checkCycle}
+            </if>
+
+        </where>
+
+    </select>
+</mapper>
+-

ims-service/ims-eval/src/main/resources/mappers/EvaluationWarningRuleMapper.xml

@@ -11,7 +11,7 @@
             be.stage_name binstagename
         from
             organization_rating_rule r
-            left join bin_section bs on bs.id = r.bin_stage
+            left join bin_section bs on bs.id = r.bin_section
             left join bin_stage be on be.id = r.bin_stage
         <where>
 
@@ -40,3 +40,4 @@
 
     </select>
 </mapper>
+-