新增多指标查询指标项接口，得分规则调整

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

@@ -5,6 +5,7 @@ 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.Indicator;
+import com.ims.eval.entity.IndicatorDictionary;
 import com.ims.eval.service.IIndicatorService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -85,6 +87,19 @@ public class IndicatorController {
 	}
 
 	/**
+	 * 根据多指标查询指标项
+	 *
+	 * @param indicatorCode 指标编码
+	 * @return
+	 */
+	@GetMapping(value = "selectByCode")
+	public R selectByCode(
+		@RequestParam(value = "indicatorCede", required = false) String indicatorCode) {
+		Map<String,List<IndicatorDictionary>> list = iIndicatorService.selectByCode(indicatorCode);
+		return R.ok().data(list);
+	}
+
+	/**
 	 * 添加
 	 *
 	 * @param indicator

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

@@ -5,6 +5,8 @@ import com.ims.eval.entity.IndicatorDictionary;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 指标字典表 Mapper 接口
@@ -16,4 +18,6 @@ import org.apache.ibatis.annotations.Param;
 public interface IndicatorDictionaryMapper extends BaseMapper<IndicatorDictionary> {
 
     IndicatorDictionary selectByCode(@Param("code") String code);
+
+    List<IndicatorDictionary> selectByIndicatorId(@Param("id") String id);
 }

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

@@ -37,11 +37,11 @@ public class EvaluationScoringRule extends Model {
 	@TableField(exist = false)
     private List<String> indicatorItemIds;
 
-	//转化为集合
+	/*//转化为集合
 	public List<String> getIndicatorItemIds(){
 		String[] split = this.getIndicatorItemId().split(",");
 		return Arrays.asList(split);
-	}
+	}*/
  	/**
 	 * 指标ID
 	 */

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

@@ -3,8 +3,10 @@ package com.ims.eval.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ims.eval.entity.Indicator;
+import com.ims.eval.entity.IndicatorDictionary;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -20,4 +22,6 @@ 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);
+
+	Map<String,List<IndicatorDictionary>> selectByCode(String indicatorCode);
 }

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

@@ -74,7 +74,7 @@ public class EvaluationScoringRuleServiceImpl extends ServiceImpl<EvaluationScor
 				list.add(indicator.getIndicatorName());
 			}
 			evaluationScoringRule.setIndicatorNames(list);
-			//设置指标项名称
+			/*//设置指标项名称
 			List<Map<String,String>> maps = new ArrayList<>();
 			List<String> indicatorItemIds = evaluationScoringRule.getIndicatorItemIds();
 			for (String code : indicatorItemIds){
@@ -83,7 +83,7 @@ public class EvaluationScoringRuleServiceImpl extends ServiceImpl<EvaluationScor
 				map.put(indicatorDictionary.getOptionCode(),indicatorDictionary.getOptionName());
 				maps.add(map);
 			}
-			evaluationScoringRule.setIndicatorItemNames(maps);
+			evaluationScoringRule.setIndicatorItemNames(maps);*/
 		}
 
 		return evaluationScoringRules;

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

@@ -16,9 +16,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.io.Serializable;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * <p>
@@ -127,6 +125,20 @@ public class IndicatorServiceImpl extends ServiceImpl<IndicatorMapper, Indicator
 	}
 
 	@Override
+	public Map<String,List<IndicatorDictionary>> selectByCode(String indicatorCode) {
+
+		Map<String,List<IndicatorDictionary>> map = new HashMap<>();
+		String[] split = indicatorCode.split(",");
+		for (String s : split){
+			Indicator indicator = baseMapper.selectByCode(s);
+			List<IndicatorDictionary> indicatorDictionaryList = indicatorDictionaryMapper.selectByIndicatorId(indicator.getId());
+			map.put(s,indicatorDictionaryList);
+		}
+
+		return map;
+	}
+
+	@Override
 	public boolean saveOrUpdate(Indicator entity) {
 
 		if (null != entity && (null == entity.getId() || "".equals(entity.getId().trim()))) {

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

@@ -11,5 +11,14 @@
 
     </select>
 
+    <select id="selectByIndicatorId" resultType="com.ims.eval.entity.IndicatorDictionary">
+        SELECT
+            *
+        FROM
+            indicator_dictionary
+        where indicator_id = #{id}
+
+    </select>
+
 
 </mapper>