优化代码，

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

@@ -1,6 +1,7 @@
 package com.ims.eval.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.eval.dao.result.CustomException;
 import com.ims.eval.dao.result.R;
 import com.ims.eval.entity.EvaluationScoringRule;
@@ -31,16 +32,14 @@ public class EvaluationScoringRuleController {
 	/**
 	 * 查询
 	 *
-	 * @param indicatorUnit       指标单位
-	 * @param type     业务阶段
-	 * @param businessPhase  业务板块
+	 * @param describe  描述
 	 * @return
 	 */
 	@GetMapping(value = "list")
-	public R list(@RequestParam(value = "indicatorUnit", required = false) String indicatorUnit,
-				  @RequestParam(value = "type", required = false) String type,
-				  @RequestParam(value = "businessPhase", required = false) String businessPhase){
-		List<EvaluationScoringRule> list = iEvaluationScoringRuleService.list(indicatorUnit, type, businessPhase);
+	public R list(@RequestParam(value = "pageNum") Integer pageNum,
+				  @RequestParam(value = "pageSize") Integer pageSize,
+				  @RequestParam(value = "describe", required = false) String describe){
+		IPage<EvaluationScoringRule> list = iEvaluationScoringRuleService.list(pageNum,pageSize,describe);
 		return R.ok().data(list);
 	}
 

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

@@ -3,6 +3,7 @@ package com.ims.eval.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ims.eval.entity.IndicatorDictionary;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -14,4 +15,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 public interface IndicatorDictionaryMapper extends BaseMapper<IndicatorDictionary> {
 
+    IndicatorDictionary selectByCode(@Param("code") String code);
 }

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

@@ -2,6 +2,7 @@ package com.ims.eval.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ims.eval.entity.Indicator;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +14,5 @@ import com.ims.eval.entity.Indicator;
  */
 public interface IndicatorMapper extends BaseMapper<Indicator> {
 
+    Indicator selectByCode(@Param("code") String code);
 }

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

@@ -2,10 +2,11 @@ package com.ims.eval.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import com.ims.eval.service.IIndicatorService;
+import lombok.*;
+import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -29,17 +30,59 @@ public class EvaluationScoringRule extends Model {
     /**
      * 指标项ID
      */
-    private String indicatorId;
+    private String indicatorItemId;
+
+	@Getter(AccessLevel.NONE)
+	@Setter(AccessLevel.NONE)
+	@TableField(exist = false)
+    private List<String> indicatorItemIds;
+
+	//转化为集合
+	public List<String> getIndicatorItemIds(){
+		String[] split = this.getIndicatorItemId().split(",");
+		return Arrays.asList(split);
+	}
+ 	/**
+	 * 指标ID
+	 */
+	private String indicatorId;
+
+	@Getter(AccessLevel.NONE)
+	@Setter(AccessLevel.NONE)
+	@TableField(exist = false)
+	private List<String> indicatorIds;
+
+	public  List<String> getIndicatorIds(){
+		String[] split = this.getIndicatorId().split(",");
+		return Arrays.asList(split);
+	}
+
+	/**
+	 * 指标项名称
+	 */
+	private String indicatorItemName;
+
+	@TableField(exist = false)
+	private List<Map<String,String>> indicatorItemNames;
+
+	/**
+	 * 指标名称
+	 */
+	private String indicatorName;
+
+
+	@TableField(exist = false)
+	private List<String> indicatorNames;
 
     /**
      * 业务阶段
-     */
+     *//*
     private String type;
 
-    /**
+    *//**
      * 部门ID
-     */
-    private String departid;
+     *//*
+    private String departid;*/
 
     /**
      * 描述
@@ -53,13 +96,13 @@ public class EvaluationScoringRule extends Model {
 
 	/**
 	 * 业务板块
-	 */
+	 *//*
 	private String businessPhase;
 
-	/**
+	*//**
 	 * 指标单位
-	 */
-	private String indicatorUnit;
+	 *//*
+	private String indicatorUnit;*/
 
 
 

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

@@ -1,5 +1,6 @@
 package com.ims.eval.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.eval.entity.EvaluationScoringRule;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -15,7 +16,7 @@ import java.util.List;
  */
 public interface IEvaluationScoringRuleService extends IService<EvaluationScoringRule> {
 
-	List<EvaluationScoringRule> list(String indicatorUnit,String type,String businessPhase);
+	IPage<EvaluationScoringRule> list(Integer pageNum, Integer pageSize, String describe);
 
 	boolean saveOrUpdateEvaluationScoringRule(EvaluationScoringRule evaluationScoringRule);
 }

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

@@ -20,5 +20,4 @@ public interface IIndicatorService extends IService<Indicator> {
 	IPage<Indicator> list(Integer pageNum, Integer pageSize, String id, String indicatorName, String indicatorCede, String binSection, String binStage, String dept, String company);
 
 	List<Indicator> listAll(String id, String indicatorName, String indicatorCede, String binSection, String binStage, String dept, String company);
-
 }

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

@@ -1,18 +1,26 @@
 package com.ims.eval.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ims.common.utils.StringUtils;
+import com.ims.eval.dao.IndicatorDictionaryMapper;
+import com.ims.eval.dao.IndicatorMapper;
 import com.ims.eval.dao.IntervalScoringTableMapper;
 import com.ims.eval.entity.EvaluationScoringRule;
 import com.ims.eval.dao.EvaluationScoringRuleMapper;
+import com.ims.eval.entity.Indicator;
 import com.ims.eval.entity.IndicatorDictionary;
-import com.ims.eval.entity.IntervalScoringTable;
 import com.ims.eval.service.IEvaluationScoringRuleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 
 /**
  * <p>
@@ -32,22 +40,52 @@ public class EvaluationScoringRuleServiceImpl extends ServiceImpl<EvaluationScor
 	@Autowired
 	private IntervalScoringTableMapper intervalScoringTableMapper;
 
+	@Autowired
+	private IndicatorMapper indicatorMapper;
+
+	@Autowired
+	private IndicatorDictionaryMapper indicatorDictionaryMapper;
+
 
 	@Override
-	public List<EvaluationScoringRule> list(String indicatorUnit,String type,String businessPhase){
+	public IPage<EvaluationScoringRule> list(Integer pageNum, Integer pageSize,String describe){
 
 		QueryWrapper<EvaluationScoringRule> qw = new QueryWrapper<>();
 
-		if (StringUtils.isNotEmpty(indicatorUnit)) {
-			qw.lambda().eq(EvaluationScoringRule::getIndicatorUnit, indicatorUnit);
+		if (null == pageNum || null == pageSize) {
+			throw new RuntimeException("分页参数为空");
 		}
-		if (StringUtils.isNotEmpty(businessPhase)) {
-			qw.lambda().eq(EvaluationScoringRule::getBusinessPhase, businessPhase);
+
+		Page<EvaluationScoringRule> page = new Page<>(pageNum, pageSize);
+
+		if (StringUtils.isNotEmpty(describe)) {
+			qw.lambda().like(EvaluationScoringRule::getDescribe, describe);
 		}
-		if (StringUtils.isNotEmpty(type)) {
-			qw.lambda().eq(EvaluationScoringRule::getType, type);
+
+		IPage<EvaluationScoringRule> evaluationScoringRules = baseMapper.selectPage(page,qw);
+		//设置指标和指标项名称
+		List<EvaluationScoringRule> records = evaluationScoringRules.getRecords();
+		for (EvaluationScoringRule evaluationScoringRule : records){
+			//设置指标名称
+			List<String> list = new ArrayList<>();
+			List<String> indicatorIds = evaluationScoringRule.getIndicatorIds();
+			for (String code : indicatorIds){
+				Indicator indicator = indicatorMapper.selectByCode(code);
+				list.add(indicator.getIndicatorName());
+			}
+			evaluationScoringRule.setIndicatorNames(list);
+			//设置指标项名称
+			List<Map<String,String>> maps = new ArrayList<>();
+			List<String> indicatorItemIds = evaluationScoringRule.getIndicatorItemIds();
+			for (String code : indicatorItemIds){
+				Map<String,String> map = new HashMap<>();
+				IndicatorDictionary indicatorDictionary = indicatorDictionaryMapper.selectByCode(code);
+				map.put(indicatorDictionary.getOptionCode(),indicatorDictionary.getOptionName());
+				maps.add(map);
+			}
+			evaluationScoringRule.setIndicatorItemNames(maps);
 		}
-		List<EvaluationScoringRule> evaluationScoringRules = evaluationScoringRuleMapper.selectList(qw);
+
 		return evaluationScoringRules;
 	}
 

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

@@ -0,0 +1,15 @@
+<?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.IndicatorDictionaryMapper">
+
+    <select id="selectByCode" resultType="com.ims.eval.entity.IndicatorDictionary">
+        SELECT
+            *
+        FROM
+            indicator_dictionary
+        where option_code = #{code}
+
+    </select>
+
+
+</mapper>

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

@@ -0,0 +1,15 @@
+<?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.IndicatorMapper">
+
+    <select id="selectByCode" resultType="com.ims.eval.entity.Indicator">
+        SELECT
+            *
+        FROM
+            indicator
+        where indicator_code = #{code}
+
+    </select>
+
+
+</mapper>