修改指标关系接口

src/main/java/com/keymobile/indicators/api/hytobacco/IndicatorsRelCtrl.java

 package com.keymobile.indicators.api.hytobacco;
 
-import java.util.Map;
+import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.keymobile.indicators.model.entity.indicators.BaseIndDef;
 import com.keymobile.indicators.service.hytobacco.IndicatorsRelService;
 
 import io.swagger.annotations.Api;
@@ -22,7 +23,7 @@ public class IndicatorsRelCtrl {
 	
 	@ApiOperation(value = "根据指标id获取指标关系，type:0 基础指标   1考核指标", notes = "根据指标id获取指标关系，type:0 基础指标   1考核指标")
 	@PostMapping(value = "/getRelByIndId")
-	public Map<String,Object> getRelByIndId(@RequestParam String indId,@RequestParam String type){
+	public List<BaseIndDef> getRelByIndId(@RequestParam String indId,@RequestParam String type){
 		return indRelService.getRelByIndId(indId, type);
 	}
 }

src/main/java/com/keymobile/indicators/service/hytobacco/IndicatorsRelService.java

 package com.keymobile.indicators.service.hytobacco;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -34,8 +32,7 @@ public class IndicatorsRelService {
 	private IndicatorsRelMapper indicatorsRelMapper;
 	
 	//type:0 基础指标    1：考核指标
-	public Map<String,Object> getRelByIndId(String indId,String type){
-		Map<String,Object> resultMap = new HashMap<>();
+	public List<BaseIndDef> getRelByIndId(String indId,String type){
 		List<BaseIndDef> resultList = new ArrayList<>();
 		//先从库里找，找不到再分析公式然后保存进库里
 		List<IndicatorsRel> indRels = indicatorsRelMapper.findByIndId(indId);
@@ -64,8 +61,7 @@ public class IndicatorsRelService {
 				}
 			}
 		}
-		resultMap.put("indList", resultList);
-		return resultMap;
+		return resultList;
 	}
 	
 	public List<BaseIndDef> getRelFromFormula(String indId,String type){

src/main/java/com/keymobile/indicators/service/hytobacco/ShortboardRuleService.java

@@ -112,6 +112,7 @@ public class ShortboardRuleService {
 				map.put("driveId", driveId);
 				map.put("shortboardRuleId", shortboardRuleIdList);
 				map.put("compareCalResults", compareCalResults);
+				map.put("date", date);
 				result.add(map);
 			}
 		}

src/main/java/com/keymobile/indicators/service/hytobacco/ShortboardUnitService.java

@@ -71,7 +71,7 @@ public class ShortboardUnitService {
 	//根据短板规则单元获取
 	public List<Map<String,Object>> getShortboardObjFromUnit(Integer id) throws Exception{
 		List<Map<String,Object>> result = new ArrayList<>();
-		ShortboardUnit shortboardUnit = this.getById(id);
+		ShortboardUnit shortboardUnit = this.getById(id);//根据短板单元id获取短板单元
 		if(shortboardUnit!=null) {
 			List<String> compareObjList = new ArrayList<>();
 			List<String> driveIndIdList = new ArrayList<>();