添加单位得分结果表和存储逻辑代码

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

@@ -76,10 +76,10 @@ public class ObjScoreRuleCtrl {
 	
 	@ApiOperation(value = "根据单位评分规则计算单位评分", notes = "根据单位评分规则计算单位评分")
 	@PostMapping(value = "/calculateObjectScore")
-	public List<Map<String,String>> calculateObjectScore(@RequestParam String reportId,
+	public void calculateObjectScore(
 			@RequestParam String compareId,@RequestParam List<String> indIds,
 			@RequestParam List<String> compareObjs,@RequestParam int date,
 			@RequestParam Integer scoreRuleId){
-		return scoreRuleService.calObjScore(reportId, compareId, indIds, compareObjs, date, scoreRuleId);
+		scoreRuleService.calObjScore(compareId, indIds, compareObjs, date, scoreRuleId);
 	}
 }

src/main/java/com/keymobile/indicators/model/entity/objscorerule/ObjScoreCalResult.java

+package com.keymobile.indicators.model.entity.objscorerule;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import lombok.Data;
+
+/**
+ *author:zhangkb  time:2020-6-22  desc:单位评分结果存放实体
+ */
+@Data
+@Table(name ="obj_score_cal_result")
+public class ObjScoreCalResult {
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+	
+	private String compareId;//对标单元id
+	private String compareObj;//对标对象
+	private String indIds;//对标考核指标id
+	private Integer date;//对标日期
+	private String scoreValue;//考核对象得分
+	private String improveValue;//考核对象改善得分
+}

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

@@ -4,10 +4,9 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import com.keymobile.indicators.model.entity.indicators.BaseIndDef;
-
-import feign.Param;
 import tk.mybatis.mapper.common.BaseMapper;
 
 @Mapper
@@ -16,7 +15,7 @@ public interface BaseIndDefMapper extends BaseMapper<BaseIndDef>{
 	
 	public int getByKeywordCount(Map<String,Object> param);
 	
-	public void deleteByCatalogIdIn(@Param("list")List<Integer> catalogIds);
+	public void deleteByCatalogIdIn(@Param("catalogIds")List<Integer> catalogIds);
 	
 	public String getMaxIndId(@Param("code")String code,@Param("length")int length);
 }

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

@@ -4,10 +4,9 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import com.keymobile.indicators.model.entity.indicators.DriveIndDef;
-
-import feign.Param;
 import tk.mybatis.mapper.common.BaseMapper;
 
 @Mapper
@@ -16,9 +15,9 @@ public interface DriveIndDefMapper extends BaseMapper<DriveIndDef>{
 	
 	public int getByKeywordCount(Map<String,Object> param);
 	
-	public void deleteByCatalogIdIn(@Param("list")List<Integer> catalogIds);
+	public void deleteByCatalogIdIn(@Param("catalogIds")List<Integer> catalogIds);
 	
 	public String getMaxIndId(@Param("code")String code,@Param("length")int length);
 	
-	public List<DriveIndDef> getByIdList(@Param("list")List<String> ids);
+	public List<DriveIndDef> getByIdList(@Param("ids")List<String> ids);
 }

src/main/java/com/keymobile/indicators/model/mapper/indmapper/DriveIndCalResultDefMapper.java

@@ -4,10 +4,9 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import com.keymobile.indicators.model.entity.indicators.DriveIndCalResultDef;
-
-import feign.Param;
 import tk.mybatis.mapper.common.BaseMapper;
 
 @Mapper

src/main/java/com/keymobile/indicators/model/mapper/indmapper/DriveIndCatalogMapper.java

@@ -4,14 +4,14 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import com.keymobile.indicators.model.entity.indicators.DriveIndCatalog;
-
-import feign.Param;
 import tk.mybatis.mapper.common.BaseMapper;
+
 @Mapper
 public interface DriveIndCatalogMapper extends BaseMapper<DriveIndCatalog>{
-	public void deleteByIdIn(@Param("list")List<Integer> ids);
+	public void deleteByIdIn(@Param("ids")List<Integer> ids);
 	
 	public List<DriveIndCatalog> findByParentIdAndCodeInOrderByLastUpdateTimeDesc(Map<String,Object> params);
 	

src/main/java/com/keymobile/indicators/model/mapper/indmapper/IndCatalogMapper.java

@@ -4,15 +4,15 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import com.keymobile.indicators.model.entity.indicators.IndCatalog;
-
-import feign.Param;
 import tk.mybatis.mapper.common.BaseMapper;
+
 @Mapper
 public interface IndCatalogMapper extends BaseMapper<IndCatalog>{
 	
-	public void deleteByIdIn(@Param("list")List<Integer> ids);
+	public void deleteByIdIn(@Param("ids")List<Integer> ids);
 	
 	public List<IndCatalog> findByParentIdAndCodeInOrderByLastUpdateTimeDesc(Map<String,Object> params);
 	

src/main/java/com/keymobile/indicators/model/mapper/indmapper/IndScorecardMapper.java

@@ -3,20 +3,19 @@ package com.keymobile.indicators.model.mapper.indmapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import com.keymobile.indicators.model.entity.scorecard.IndScorecard;
-
-import feign.Param;
 import tk.mybatis.mapper.common.BaseMapper;
 
 @Mapper
 public interface IndScorecardMapper extends BaseMapper<IndScorecard>{
-	public void deleteByCatalogIdIn(@Param("list")List<Integer> catalogIds);
+	public void deleteByCatalogIdIn(@Param("catalogIds")List<Integer> catalogIds);
 	
 	public List<IndScorecard> findByCatalogId(@Param("catalogId")Integer catalogId,
 			@Param("start") int start,@Param("end") int end);
 	
 	public int countByCatalogId(@Param("catalogId")Integer catalogId);
 	
-	public List<IndScorecard> findByIdList(@Param("list")List<Integer> ids);
+	public List<IndScorecard> findByIdList(@Param("ids")List<Integer> ids);
 }

src/main/java/com/keymobile/indicators/model/mapper/indmapper/ObjScoreCalResultMapper.java

+package com.keymobile.indicators.model.mapper.indmapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import com.keymobile.indicators.model.entity.objscorerule.ObjScoreCalResult;
+
+import tk.mybatis.mapper.common.BaseMapper;
+
+@Mapper
+public interface ObjScoreCalResultMapper extends BaseMapper<ObjScoreCalResult>{
+	public ObjScoreCalResult getObjScoreCalResultByParam(@Param("compareId")String compareId,
+			@Param("compareObj")String compareObj,@Param("date")Integer date);
+}

src/main/java/com/keymobile/indicators/model/mapper/indmapper/ScoreRuleCatalogMapper.java

@@ -4,15 +4,14 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import com.keymobile.indicators.model.entity.objscorerule.ScoreRuleCatalog;
-
-import feign.Param;
 import tk.mybatis.mapper.common.BaseMapper;
 
 @Mapper
 public interface ScoreRuleCatalogMapper extends BaseMapper<ScoreRuleCatalog>{
-	public void deleteByIdIn(@Param("list")List<Integer> ids);
+	public void deleteByIdIn(@Param("ids")List<Integer> ids);
 	
 	public List<ScoreRuleCatalog> findByParentIdAndCodeInOrderByLastUpdateTimeDesc(Map<String,Object> params);
 	

src/main/java/com/keymobile/indicators/model/mapper/indmapper/ScoreRuleMapper.java

@@ -3,17 +3,16 @@ package com.keymobile.indicators.model.mapper.indmapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import com.keymobile.indicators.model.entity.objscorerule.ScoreRule;
-
-import feign.Param;
 import tk.mybatis.mapper.common.BaseMapper;
 
 @Mapper
 public interface ScoreRuleMapper extends BaseMapper<ScoreRule>{
 	public List<ScoreRule> findByCode(@Param("code")String code);
 	
-	public void deleteByCatalogIdIn(@Param("list")List<Integer> ids);
+	public void deleteByCatalogIdIn(@Param("ids")List<Integer> ids);
 	
 	public List<ScoreRule> findByCatalogId(@Param("catalogId")Integer catalogId,
 			@Param("start") int start,@Param("end") int end);

src/main/java/com/keymobile/indicators/model/mapper/indmapper/ScorecardCatalogMapper.java

@@ -4,15 +4,14 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import com.keymobile.indicators.model.entity.scorecard.ScorecardCatalog;
-
-import feign.Param;
 import tk.mybatis.mapper.common.BaseMapper;
 
 @Mapper
 public interface ScorecardCatalogMapper extends BaseMapper<ScorecardCatalog>{
-	public void deleteByIdIn(@Param("list")List<Integer> ids);
+	public void deleteByIdIn(@Param("ids")List<Integer> ids);
 	
 	public List<ScorecardCatalog> findByParentIdAndCodeInOrderByLastUpdateTimeDesc(Map<String,Object> params);
 	

src/main/java/com/keymobile/indicators/model/mapper/indmapper/ShortboardCatalogMapper.java

@@ -4,14 +4,14 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
-import com.keymobile.indicators.model.entity.shortboard.ShortboardCatalog;
+import org.apache.ibatis.annotations.Param;
 
-import feign.Param;
+import com.keymobile.indicators.model.entity.shortboard.ShortboardCatalog;
 import tk.mybatis.mapper.common.BaseMapper;
 
 @Mapper
 public interface ShortboardCatalogMapper extends BaseMapper<ShortboardCatalog>{
-	public void deleteByIdIn(@Param("list")List<Integer> ids);
+	public void deleteByIdIn(@Param("ids")List<Integer> ids);
 	
 	public List<ShortboardCatalog> findByParentIdAndCodeInOrderByLastUpdateTimeDesc(Map<String,Object> params);
 	

src/main/java/com/keymobile/indicators/model/mapper/indmapper/ShortboardDriveIndRelMapper.java

@@ -3,10 +3,9 @@ package com.keymobile.indicators.model.mapper.indmapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import com.keymobile.indicators.model.entity.shortboard.ShortboardDriveIndRel;
-
-import feign.Param;
 import tk.mybatis.mapper.common.BaseMapper;
 
 @Mapper

src/main/java/com/keymobile/indicators/model/mapper/indmapper/ShortboardRuleMapper.java

@@ -3,15 +3,14 @@ package com.keymobile.indicators.model.mapper.indmapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import com.keymobile.indicators.model.entity.shortboard.ShortboardRule;
-
-import feign.Param;
 import tk.mybatis.mapper.common.BaseMapper;
 
 @Mapper
 public interface ShortboardRuleMapper extends BaseMapper<ShortboardRule>{
-	public void deleteByCatalogIdIn(@Param("list")List<Integer> ids);
+	public void deleteByCatalogIdIn(@Param("ids")List<Integer> ids);
 	
 	public List<ShortboardRule> findByCatalogId(@Param("catalogId")Integer catalogId,
 			@Param("start") int start,@Param("end") int end);

src/main/java/com/keymobile/indicators/model/mapper/indmapper/ShortboardUnitCatalogMapper.java

@@ -4,15 +4,14 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import com.keymobile.indicators.model.entity.shortboard.ShortboardUnitCatalog;
-
-import feign.Param;
 import tk.mybatis.mapper.common.BaseMapper;
 
 @Mapper
 public interface ShortboardUnitCatalogMapper extends BaseMapper<ShortboardUnitCatalog>{
-	public void deleteByIdIn(@Param("list")List<Integer> ids);
+	public void deleteByIdIn(@Param("ids")List<Integer> ids);
 	
 	public List<ShortboardUnitCatalog> findByParentIdAndCodeInOrderByLastUpdateTimeDesc(Map<String,Object> params);
 	

src/main/java/com/keymobile/indicators/model/mapper/indmapper/ShortboardUnitMapper.java

@@ -3,15 +3,14 @@ package com.keymobile.indicators.model.mapper.indmapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import com.keymobile.indicators.model.entity.shortboard.ShortboardUnit;
-
-import feign.Param;
 import tk.mybatis.mapper.common.BaseMapper;
 
 @Mapper
 public interface ShortboardUnitMapper extends BaseMapper<ShortboardUnit>{
-	public void deleteByCatalogIdIn(@Param("list")List<Integer> ids);
+	public void deleteByCatalogIdIn(@Param("ids")List<Integer> ids);
 	
 	public List<ShortboardUnit> findByCatalogId(@Param("catalogId")Integer catalogId,
 			@Param("start") int start,@Param("end") int end);

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

@@ -19,9 +19,11 @@ import com.googlecode.aviator.AviatorEvaluator;
 import com.keymobile.indicators.model.entity.indicators.DriveIndCalResultDef;
 import com.keymobile.indicators.model.entity.indicators.DriveIndDef;
 import com.keymobile.indicators.model.entity.objscorerule.IndTypeWeight;
+import com.keymobile.indicators.model.entity.objscorerule.ObjScoreCalResult;
 import com.keymobile.indicators.model.entity.objscorerule.ScoreRule;
 import com.keymobile.indicators.model.mapper.indicators.DriveIndDefMapper;
 import com.keymobile.indicators.model.mapper.indmapper.DriveIndCalResultDefMapper;
+import com.keymobile.indicators.model.mapper.indmapper.ObjScoreCalResultMapper;
 import com.keymobile.indicators.model.mapper.indmapper.ScoreRuleMapper;
 import com.keymobile.indicators.utils.CalculateUtils;
 
@@ -35,6 +37,8 @@ public class ScoreRuleService {
 	private DriveIndDefMapper driveIndDefMapper;
 	@Autowired
 	private DriveIndCalResultDefMapper driveIndCalResultDefMapper;
+	@Autowired
+	private ObjScoreCalResultMapper objScoreCalResultMapper;
 	
 	private static final Pattern P = Pattern.compile("(\\[[^\\]]*\\])");
 	
@@ -84,13 +88,13 @@ public class ScoreRuleService {
 	}
 	
 	//计算组内考核指标平均值
-	private Map<String,String> calGroupIndAverage(ScoreRule scoreRule,List<String> indIds,
+	private ObjScoreCalResult calGroupIndAverage(ObjScoreCalResult objResult,ScoreRule scoreRule,List<String> indIds,
 			String compareObj,int date){
-		Map<String,String> result = new HashMap<>();
-		result.put("compareObj", compareObj);
-		result.put("scoreValue", "0.0");
-		result.put("improveValue", "0.0");
-		result.put("date",String.valueOf(date));
+		objResult.setCompareObj(compareObj);
+		objResult.setScoreValue("0.0");
+		objResult.setImproveValue("0.0");
+		objResult.setDate(date);
+		objResult.setIndIds(String.join(",", indIds));
 		//根据日期，对标对象和考核的指标获取考核指标结果详情
 		Map<String,Object> paremMap = new HashMap<>();
 		paremMap.put("compareObj", compareObj);
@@ -140,19 +144,19 @@ public class ScoreRuleService {
 			if(!improveValues.isEmpty()) {
 				averageImproveValue = CalculateUtils.averageValue(improveValues,0);
 			}
-			result.put("scoreValue", averageValue);
-			result.put("improveValue", averageImproveValue);
+			objResult.setScoreValue(averageValue);
+			objResult.setImproveValue(averageImproveValue);
 		}
-		return result;
+		return objResult;
 	}
 	
-	private Map<String,String> calSingleIndWeight(ScoreRule scoreRule,
+	private ObjScoreCalResult calSingleIndWeight(ObjScoreCalResult objResult,ScoreRule scoreRule,
 			String compareObj,int date){
-		Map<String,String> result = new HashMap<>();
-		result.put("compareObj", compareObj);
-		result.put("scoreValue", "0.0");
-		result.put("improveValue", "0.0");
-		result.put("date",String.valueOf(date));
+		objResult.setCompareObj(compareObj);
+		objResult.setScoreValue("0.0");
+		objResult.setImproveValue("0.0");
+		objResult.setDate(date);
+		
 		String calFormula = scoreRule.getCalFormula();//计算综合评分分数
 		String improveCalFormula = scoreRule.getCalFormula();//计算改善提升分数
 		if(StringUtils.isNotBlank(calFormula)) {
@@ -211,25 +215,24 @@ public class ScoreRuleService {
 			//得分类型：0 指标值直接参与计算
 			if("0".equals(scoreRule.getScoreType()) || 
 					"2".equals(scoreRule.getScoreType())) {
-				result.put("scoreValue", AviatorEvaluator.execute(calFormula).toString());
-				result.put("improveValue","0.0");
+				objResult.setScoreValue(AviatorEvaluator.execute(calFormula).toString());
+				objResult.setImproveValue("0.0");
 			}else if("1".equals(scoreRule.getScoreType())) {//1 指标得分分数参与计算（综合评分和改善提升分开算）
-				result.put("scoreValue", AviatorEvaluator.execute(calFormula).toString());
-				result.put("improveValue",AviatorEvaluator.execute(improveCalFormula).toString());
+				objResult.setScoreValue(AviatorEvaluator.execute(calFormula).toString());
+				objResult.setImproveValue(AviatorEvaluator.execute(improveCalFormula).toString());
 			}
 		}
-		return result;
+		return objResult;
 	}
 	
 	//按照指标类别进行分类分别计算平均分后再跟类别权重相乘后相加得到最终分数
-	private Map<String,String> calIndCatalogTypeAverage(ScoreRule scoreRule,
+	private ObjScoreCalResult calIndCatalogTypeAverage(ObjScoreCalResult objResult,ScoreRule scoreRule,
 			String compareObj,int date){
-		Map<String,String> result = new HashMap<>();
 		Gson gson = new Gson();
-		result.put("compareObj", compareObj);
-		result.put("scoreValue", "0.0");
-		result.put("improveValue", "0.0");
-		result.put("date",String.valueOf(date));
+		objResult.setCompareObj(compareObj);
+		objResult.setScoreValue("0.0");
+		objResult.setImproveValue("0.0");
+		objResult.setDate(date);
 		
 		//根据对标对象，日期查找该对标对象对标的所有指标结果
 		List<DriveIndCalResultDef> calResults = driveIndCalResultDefMapper.
@@ -247,9 +250,9 @@ public class ScoreRuleService {
 				}
 			}
 		}
-		result.put("scoreValue", String.valueOf(scoreValue));
-		result.put("improveValue", String.valueOf(improveValue));
-		return result;
+		objResult.setScoreValue(String.valueOf(scoreValue));
+		objResult.setImproveValue(String.valueOf(improveValue));
+		return objResult;
 	}
 	
 	//根据指标分类计算指标平均值
@@ -308,29 +311,38 @@ public class ScoreRuleService {
 	}
 	
 	//根据单位评分规则计算单位分数
-	public List<Map<String,String>> calObjScore(String reportId,String compareId,List<String> indIds,
+	public void calObjScore(String compareId,List<String> indIds,
 			List<String> compareObjs,int date,Integer scoreRuleId) {
-		List<Map<String,String>> results = new ArrayList<>();
 		//根据单位得分评分卡id获取评分卡详情
 		ScoreRule scoreRule = this.getById(scoreRuleId);
 		if(scoreRule!=null) {
 			for(String compareObj : compareObjs) {
-				Map<String,String> resultMap = new HashMap<>();
+				//判断库表是否已存在改结果数据
+				ObjScoreCalResult objScoreCalResult = objScoreCalResultMapper.
+						getObjScoreCalResultByParam(compareId, compareObj, date);
+				if(objScoreCalResult == null) {
+					objScoreCalResult = new ObjScoreCalResult();
+				}
 				//计算类型：0 计算组内所有考核指标平均数 
 				if("0".equals(scoreRule.getCalType())) {
-					resultMap = this.calGroupIndAverage(scoreRule, indIds, compareObj, date);
+					objScoreCalResult = this.calGroupIndAverage(objScoreCalResult, scoreRule, 
+							indIds, compareObj, date);
 				}else if("1".equals(scoreRule.getCalType())) {//1 根据目录类别分类算平均分后根据权重计算考核指标
-					resultMap = this.calIndCatalogTypeAverage(scoreRule, compareObj, date);
+					objScoreCalResult = this.calIndCatalogTypeAverage(objScoreCalResult, scoreRule, 
+							compareObj, date);
 				}else {//2单个指标权重计算
-					resultMap = this.calSingleIndWeight(scoreRule, compareObj, date);
+					objScoreCalResult = this.calSingleIndWeight(objScoreCalResult ,scoreRule, 
+							compareObj, date);
+				}
+				objScoreCalResult.setCompareId(compareId);
+				if(objScoreCalResult.getId()==null) {
+					objScoreCalResultMapper.insert(objScoreCalResult);
+				}else {
+					objScoreCalResultMapper.updateByPrimaryKey(objScoreCalResult);
 				}
-				resultMap.put("reportId", reportId);
-				resultMap.put("compareId", compareId);
-				results.add(resultMap);
 			}
 		}else {
 			logger.info("单位评分卡id："+scoreRuleId+" 不存在");
 		}
-		return results;
 	}
 }

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

@@ -30,7 +30,7 @@
     	delete 
     	from base_ind_def 
     	where catalog_id in
-        <foreach item="id" collection="list" open="(" close=")" separator=",">
+        <foreach item="id" collection="catalogIds" open="(" close=")" separator=",">
             #{id}
         </foreach>
     </delete>

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

@@ -5,7 +5,7 @@
     	delete 
     	from drive_ind_catalog 
     	where id in
-        <foreach item="id" collection="list" open="(" close=")" separator=",">
+        <foreach item="id" collection="ids" open="(" close=")" separator=",">
             #{id}
         </foreach>
     </delete>

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

@@ -30,7 +30,7 @@
     	delete 
     	from drive_ind_def 
     	where catalog_id in
-        <foreach item="id" collection="list" open="(" close=")" separator=",">
+        <foreach item="id" collection="catalogIds" open="(" close=")" separator=",">
             #{id}
         </foreach>
     </delete>
@@ -45,7 +45,7 @@
     	select * 
     	from drive_ind_def 
     	where ind_id in
-        <foreach item="id" collection="list" open="(" close=")" separator=",">
+        <foreach item="id" collection="ids" open="(" close=")" separator=",">
             #{id}
         </foreach>
     </select>

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

@@ -5,7 +5,7 @@
     	delete 
     	from base_ind_catalog 
     	where id in
-        <foreach item="id" collection="list" open="(" close=")" separator=",">
+        <foreach item="id" collection="ids" open="(" close=")" separator=",">
             #{id}
         </foreach>
     </delete>

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

@@ -18,7 +18,7 @@
     	delete 
     	from drive_ind_score_card 
     	where catalog_id in
-        <foreach item="id" collection="list" open="(" close=")" separator=",">
+        <foreach item="id" collection="catalogIds" open="(" close=")" separator=",">
             #{id}
         </foreach>
     </delete>
@@ -27,7 +27,7 @@
     	select *  
     	from drive_ind_score_card 
     	where id in
-        <foreach item="id" collection="list" open="(" close=")" separator=",">
+        <foreach item="id" collection="ids" open="(" close=")" separator=",">
             #{id}
         </foreach>
     </select>

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

+<?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.keymobile.indicators.model.mapper.indmapper.ObjScoreCalResultMapper">
+	<select id="getObjScoreCalResultByParam" resultType="com.keymobile.indicators.model.entity.objscorerule.ObjScoreCalResult" >
+        select * 
+        from obj_score_cal_result 
+        where compare_id=#{compareId} and
+        		compare_obj=#{compareObj} and
+        		date=#{date}
+    </select>
+</mapper>
\ No newline at end of file

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

@@ -5,7 +5,7 @@
     	delete 
     	from obj_score_rule_catalog 
     	where id in
-        <foreach item="id" collection="list" open="(" close=")" separator=",">
+        <foreach item="id" collection="ids" open="(" close=")" separator=",">
             #{id}
         </foreach>
     </delete>

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

@@ -24,7 +24,7 @@
     	delete 
     	from obj_score_rule 
     	where catalog_id in
-        <foreach item="id" collection="list" open="(" close=")" separator=",">
+        <foreach item="id" collection="ids" open="(" close=")" separator=",">
             #{id}
         </foreach>
     </delete>

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

@@ -5,7 +5,7 @@
     	delete 
     	from score_card_catalog 
     	where id in
-        <foreach item="id" collection="list" open="(" close=")" separator=",">
+        <foreach item="id" collection="ids" open="(" close=")" separator=",">
             #{id}
         </foreach>
     </delete>

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

@@ -5,7 +5,7 @@
     	delete 
     	from ind_short_board_catalog 
     	where id in
-        <foreach item="id" collection="list" open="(" close=")" separator=",">
+        <foreach item="id" collection="ids" open="(" close=")" separator=",">
             #{id}
         </foreach>
     </delete>

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

@@ -18,7 +18,7 @@
     	delete 
     	from short_board_rule 
     	where catalog_id in
-        <foreach item="id" collection="list" open="(" close=")" separator=",">
+        <foreach item="id" collection="ids" open="(" close=")" separator=",">
             #{id}
         </foreach>
     </delete>

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

@@ -5,7 +5,7 @@
     	delete 
     	from short_board_unit_catalog 
     	where id in
-        <foreach item="id" collection="list" open="(" close=")" separator=",">
+        <foreach item="id" collection="ids" open="(" close=")" separator=",">
             #{id}
         </foreach>
     </delete>

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

@@ -18,7 +18,7 @@
     	delete 
     	from short_board_unit 
     	where catalog_id in
-        <foreach item="id" collection="list" open="(" close=")" separator=",">
+        <foreach item="id" collection="ids" open="(" close=")" separator=",">
             #{id}
         </foreach>
     </delete>