修改

ims-service/ims-eval/src/main/java/com/ims/eval/cache/CacheContext.java

@@ -56,6 +56,8 @@ public class CacheContext implements CommandLineRunner {
 	public static Map<String, BinSection> bsnIdObject = new HashMap<>();
 
 
+	public static Map<String, BinSection> bsnCodeObject = new HashMap<>();
+
 
 
 	@Override
@@ -131,6 +133,10 @@ public class CacheContext implements CommandLineRunner {
 		bsnList.stream().forEach(d -> {
 			bsnIdObject.put(d.getId(), d);
 		});
+
+		bsnList.stream().forEach(d -> {
+			bsnCodeObject.put(d.getSectionCode(), d);
+		});
 	}
 
 

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

@@ -31,4 +31,8 @@ public interface IOrganizationEvaluationRuleService extends IService<Organizatio
 
 	OrganizationEvaluationRule getByIdIsCheck(String id,Boolean isCheck,Boolean delFlag);
 
+
+	List<OrganizationEvaluationRule> getOrganizationEvaluationRuleByIds(String ids, String binSection);
+
+
 }

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

@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ims.common.utils.DateUtils;
 import com.ims.common.utils.StringUtils;
+import com.ims.eval.cache.CacheContext;
 import com.ims.eval.dao.EvaluationScoreCountMapper;
 import com.ims.eval.entity.EvaluationScoreCount;
 import com.ims.eval.service.IEvaluationScoreCountService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -24,6 +26,8 @@ import java.util.stream.Collectors;
 public class EvaluatioinScoreCountServiceImpl extends ServiceImpl<EvaluationScoreCountMapper, EvaluationScoreCount> implements IEvaluationScoreCountService {
 
 
+
+
 	@Override
 	public List<EvaluationScoreCount> getListByEvaluationRuleId(String organizationEvaluationId, String organizationEvaluationRuleId, String binStage) {
 		List<EvaluationScoreCount> list = baseMapper.selelctListByEvaluationRuleId(organizationEvaluationId, organizationEvaluationRuleId, binStage);
@@ -33,6 +37,7 @@ public class EvaluatioinScoreCountServiceImpl extends ServiceImpl<EvaluationScor
 
 	@Override
 	public Map<String, Object> evaluationList(String binSection, String binStage, String type, String condition, String date) {
+		String binSectionId = CacheContext.bsnCodeObject.get(binSection).getId();
 		Map<String, Object> result = new HashMap<>();
 		List<Map<String, Object>> list = new ArrayList<>();
 		String month = null;
@@ -46,7 +51,7 @@ public class EvaluatioinScoreCountServiceImpl extends ServiceImpl<EvaluationScor
 			month = String.valueOf(cal.get(Calendar.MONTH) + 1);
 		}
 		try {
-			list.addAll(baseMapper.selectEvaluationList(binSection, binStage, type, condition, year, month));
+			list.addAll(baseMapper.selectEvaluationList(binSectionId, binStage, type, condition, year, month));
 		} catch (Exception e) {
 			return result;
 		}

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

@@ -232,6 +232,23 @@ public class OrganizationEvaluationRuleServiceImpl extends ServiceImpl<Organizat
 		return null;
 	}
 
+	@Override
+	public List<OrganizationEvaluationRule> getOrganizationEvaluationRuleByIds(String ids, String binSection) {
+
+		QueryWrapper<OrganizationEvaluationRule> qw = new QueryWrapper<>();
+		if (StringUtils.isNotEmpty(ids)) {
+			qw.lambda().in(OrganizationEvaluationRule::getId, ids);
+		}
+
+		if (StringUtils.isNotEmpty(ids)) {
+			qw.lambda().like(OrganizationEvaluationRule::getBinSection, binSection);
+		}
+
+		List<OrganizationEvaluationRule> list  = baseMapper.selectList(qw);
+
+		return list;
+	}
+
 
 	@Transactional
 	@Override