修改删除指标评分逻辑，关联了指标的评分无法删除

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

@@ -74,8 +74,8 @@ public class IndScorecardCtrl {
 	
 	@ApiOperation(value = "删除", notes = "删除")
 	@PostMapping(value = "/delete")
-	public void delete(@RequestBody List<Integer> ids) {
-		indScorecardService.delete(ids);
+	public String delete(@RequestBody List<Integer> ids) {
+		return indScorecardService.delete(ids);
 	}
 	
 	@ApiOperation(value = "获取所有评分卡", notes = "获取所有评分卡")

src/main/java/com/keymobile/indicators/model/mapper/indicators/DriveIndDefMapper.java

@@ -20,4 +20,6 @@ public interface DriveIndDefMapper extends BaseMapper<DriveIndDef>{
 	public String getMaxIndId(@Param("code")String code,@Param("length")int length);
 	
 	public List<DriveIndDef> getByIdList(@Param("ids")List<String> ids);
+	
+	public List<DriveIndDef> getByScorecardId(@Param("scorecardId")Integer scorecardId);
 }

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

@@ -218,4 +218,9 @@ public class DriveIndDefService {
 		}
 		return maxId;
 	}
+	
+	//根据指标评分规则id获取考核指标
+	public List<DriveIndDef> getByScorecardId(Integer scorecardId){
+		return driveIndDefMapper.getByScorecardId(scorecardId);
+	}
 }

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

@@ -71,10 +71,23 @@ public class IndScorecardService {
 		return indScorecard.getId();
 	}
 	
-	public void delete(List<Integer> ids) {
+	public String delete(List<Integer> ids) {
+		StringBuilder message = new StringBuilder("");
 		for(Integer id : ids) {
-			indScorecardMapper.deleteByPrimaryKey(id);
+			if(!driveIndDefService.getByScorecardId(id).isEmpty()) {
+				IndScorecard scorecard = this.findById(id);
+				if(scorecard!=null) {
+					message.append("'").append(scorecard.getCardName())
+					.append("'").append("关联了考核指标，无法删除;");
+				}
+			}else {
+				indScorecardMapper.deleteByPrimaryKey(id);
+			}
+		}
+		if(StringUtils.isBlank(message.toString())) {
+			message.append("删除成功");
 		}
+		return message.toString();
 	}
 	
 	public List<IndScorecard> getAll(){

src/main/resources/mybatis/mapping/DriveIndDefMapper.xml

@@ -49,4 +49,10 @@
             #{id}
         </foreach>
     </select>
+    
+    <select id="getByScorecardId" parameterType="java.lang.Integer"  resultType="com.keymobile.indicators.model.entity.indicators.DriveIndDef">
+    	select * 
+    	from drive_ind_def 
+    	where ind_cal_score_rule=#{scorecardId}
+    </select>
 </mapper>
\ No newline at end of file