增加考评得分规则的指标下拉子指标查询功能

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

@@ -3,14 +3,17 @@ package com.ims.eval.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ims.eval.config.CustomException;
+import com.ims.eval.entity.dto.request.IndicatorDictionaryDTO;
 import com.ims.eval.entity.dto.result.R;
 import com.ims.eval.entity.Indicator;
 import com.ims.eval.entity.IndicatorDictionary;
+import com.ims.eval.service.IIndicatorDictionaryService;
 import com.ims.eval.service.IIndicatorService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -31,6 +34,9 @@ public class IndicatorController {
 	@Autowired
 	private IIndicatorService iIndicatorService;
 
+	@Autowired
+	private IIndicatorDictionaryService indicatorDictionaryService;
+
 
 	/**
 	 * 查询分页数据
@@ -95,7 +101,12 @@ public class IndicatorController {
 	@GetMapping(value = "selectByCode")
 	public R selectByCode(
 		@RequestParam(value = "indicatorCede", required = false) String indicatorCode) {
-		Map<String,List<IndicatorDictionary>> list = iIndicatorService.selectByCode(indicatorCode);
+
+		List<IndicatorDictionaryDTO> list = new ArrayList<>();
+		Indicator indicator = iIndicatorService.selectByCode(indicatorCode);
+		if(indicator != null){
+			 list = indicatorDictionaryService.list(indicator.getId(),"","");
+		}
 		return R.ok().data(list);
 	}
 

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
 import java.util.List;
 
@@ -50,7 +51,7 @@ public class IntervalScoringTableController {
 	 */
 	@PostMapping(value = "/saveOrUpdate")
 	@ApiOperation(value = "新增(修改)", notes = "新增（修改）")
-	public R saveOrUpdate(@RequestBody IntervalScoringTable intervalScoringTable) {
+	public R saveOrUpdate(HttpServletRequest request,@RequestBody IntervalScoringTable intervalScoringTable) {
 
 		try {
 			boolean b = intervalScoringTableService.saveOrUpdate(intervalScoringTable);

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

@@ -23,5 +23,5 @@ public interface IIndicatorService extends IService<Indicator> {
 
 	List<Indicator> listAll(String id, String indicatorName, String indicatorCede, String binSection, String binStage, String dept, String company);
 
-	Map<String,List<IndicatorDictionary>> selectByCode(String indicatorCode);
+	Indicator selectByCode(String indicatorCode);
 }

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

@@ -12,6 +12,7 @@ import com.ims.eval.config.CustomException;
 import com.ims.eval.entity.Indicator;
 import com.ims.eval.entity.IndicatorDictionary;
 import com.ims.eval.service.IIndicatorService;
+import io.swagger.models.auth.In;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -125,19 +126,10 @@ 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);
-			if(indicator != null){
-				List<IndicatorDictionary> indicatorDictionaryList = indicatorDictionaryMapper.selectByIndicatorId(indicator.getId());
-				map.put(s,indicatorDictionaryList);
-			}
-		}
+	public Indicator selectByCode(String indicatorCode) {
 
-		return map;
+		Indicator indicator = baseMapper.selectByCode(indicatorCode);
+		return indicator;
 	}
 
 	@Override