考核报告调整

ims-service/ims-eval/src/main/java/com/ims/eval/dao/EvaluationScoreCountMapper.java

@@ -29,7 +29,8 @@ public interface EvaluationScoreCountMapper extends BaseMapper<EvaluationScoreCo
 	List<EvaluationScoreCount> selectEvaluationScoreCountList(@Param("organizationEvaluationId")String organizationEvaluationId,
 															  @Param("organizationEvaluationRuleId")String organizationEvaluationRuleId,
 															  @Param("indicatorIds")List<String> indicatorIds,
-															  @Param("stageCode") List<String> stageCode);
+															  @Param("stageCode") List<String> stageCode,
+															  @Param("binSection")  String binSection);
 
 
 	}

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

@@ -27,7 +27,7 @@ public interface IEvaluationScoreCountService extends IService<EvaluationScoreCo
 
 	List<EvaluationScoreCount> getEvaluationScoreCountList(String organizationEvaluationId,String organizationEvaluationRuleId,List<String> indicatorIds);
 
-	List<EvaluationScoreCount> getEvaluationScoreCountList(String organizationEvaluationId,String organizationEvaluationRuleId,List<String> indicatorIds,List<String> stageCode);
+	List<EvaluationScoreCount> getEvaluationScoreCountList(String organizationEvaluationId,String organizationEvaluationRuleId,List<String> indicatorIds,List<String> stageCode,String binSection);
 
 }
 

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

@@ -197,7 +197,7 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 			//获取当前模块得公司
 //			List<OrganizationEvaluationRule> ruleList = organizationEvaluationRuleService.getOrganizationEvaluationRuleByIds(evaluationRuleIds, bi.getId());
 			List<OrganizationEvaluationRule> ruleList = ruleListall.stream()
-				.filter(rule -> rule.getBinSection().equals(bi.getId())).collect(Collectors.toList());
+				.filter(rule -> rule.getBinSection().contains(bi.getId())).collect(Collectors.toList());
 
 			//各板块明细存储
 			List<EvaluateReportInfo> evaluateRuleInfoList = new ArrayList<>();
@@ -255,18 +255,18 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 					totalProfit = totalProfit + mb.getProfit();
 					//累加收入和分数的积
 
-					List<EvaluationScoreCount> scoreCount1 = evaluationScoreCountService.getEvaluationScoreCountList(organizationEvaluationId, rule.getId(), null, Arrays.asList("SCJY".split(",")));
+					List<EvaluationScoreCount> scoreCount1 = evaluationScoreCountService.getEvaluationScoreCountList(organizationEvaluationId, rule.getId(), null, Arrays.asList("SCJY".split(",")),bi.getId());
 					double score1 = scoreCount1.stream().mapToDouble(EvaluationScoreCount::getScore).sum();
-					spMultiply = spMultiply + mb.getProfit() * score1;
+					spMultiply = spMultiply + (mb.getProfit() * score1);
 
-					List<MultipleBrand> parentBrands = multipleBrandService.getMultipleBranList2("", mb.getOrganizationId(), bi.getId(), evaluation.getCheckCycle(), evaluation.getYear(), month);
+					List<MultipleBrand> parentBrands = multipleBrandService.getMultipleBranList2("", mb.getOrganizationId(),"", evaluation.getCheckCycle(), evaluation.getYear(), month);
 					for (MultipleBrand pb : parentBrands) {
 						//累加收入
 						totalProfit = totalProfit + pb.getProfit();
 
-						List<EvaluationScoreCount> scoreCount2 = evaluationScoreCountService.getEvaluationScoreCountList(organizationEvaluationId, ruleMap.get(pb.getOrganizationId()).getId(), null, Arrays.asList("SCJY".split(",")));
+						List<EvaluationScoreCount> scoreCount2 = evaluationScoreCountService.getEvaluationScoreCountList(organizationEvaluationId, ruleMap.get(pb.getOrganizationId()).getId(), null, Arrays.asList("SCJY".split(",")),pb.getBinSection());
 						double score2 = scoreCount2.stream().mapToDouble(EvaluationScoreCount::getScore).sum();
-						spMultiply = spMultiply + mb.getProfit() * score2;
+						spMultiply = spMultiply + (pb.getProfit() * score2);
 					}
 
 					scjyScore = spMultiply / totalProfit;
@@ -282,23 +282,23 @@ public class EvaluateReportServiceImpl extends ServiceImpl<EvaluateReportMapper,
 				if(scjyScore>0){
 					reportInfo.setScjyScore(DoubleUtils.keepPrecision(scjyScore, 2));
 				}else {
-					List<EvaluationScoreCount> scjyScoreCount = evaluationScoreCountService.getEvaluationScoreCountList(organizationEvaluationId, rule.getId(), null, Arrays.asList("SCJY".split(",")));
+					List<EvaluationScoreCount> scjyScoreCount = evaluationScoreCountService.getEvaluationScoreCountList(organizationEvaluationId, rule.getId(), null, Arrays.asList("SCJY".split(",")),bi.getId());
 					scjyScore = scjyScoreCount.stream().mapToDouble(EvaluationScoreCount::getScore).sum();
 					reportInfo.setScjyScore(DoubleUtils.keepPrecision(scjyScore, 2));
 				}
 
 				//前期得分
-				List<EvaluationScoreCount> qqScoreCount = evaluationScoreCountService.getEvaluationScoreCountList(organizationEvaluationId, rule.getId(), null, Arrays.asList("QQXM".split(",")));
+				List<EvaluationScoreCount> qqScoreCount = evaluationScoreCountService.getEvaluationScoreCountList(organizationEvaluationId, rule.getId(), null, Arrays.asList("QQXM".split(",")),"");
 				Double qqScore = qqScoreCount.stream().mapToDouble(EvaluationScoreCount::getScore).sum();
 				reportInfo.setQqScore(DoubleUtils.keepPrecision(qqScore, 2));
 
 				//基建得分
-				List<EvaluationScoreCount> jjScoreCount = evaluationScoreCountService.getEvaluationScoreCountList(organizationEvaluationId, rule.getId(), null, Arrays.asList("JJXM".split(",")));
+				List<EvaluationScoreCount> jjScoreCount = evaluationScoreCountService.getEvaluationScoreCountList(organizationEvaluationId, rule.getId(), null, Arrays.asList("JJXM".split(",")),"");
 				Double jjScore = jjScoreCount.stream().mapToDouble(EvaluationScoreCount::getScore).sum();
 				reportInfo.setJjScore(DoubleUtils.keepPrecision(jjScore, 2));
 
 
-				List<EvaluationScoreCount> addSubScoreCount = evaluationScoreCountService.getEvaluationScoreCountList(organizationEvaluationId, rule.getId(), null, Arrays.asList("ZDZX,GLSX".split(",")));
+				List<EvaluationScoreCount> addSubScoreCount = evaluationScoreCountService.getEvaluationScoreCountList(organizationEvaluationId, rule.getId(), null, Arrays.asList("ZDZX,GLSX".split(",")),"");
 				Double addSubScore = addSubScoreCount.stream().mapToDouble(EvaluationScoreCount::getScore).sum();
 				//加分项
 				double addScore = addSubScoreCount.stream().filter(a->a.getScore()>0).collect(Collectors.toList()).stream().mapToDouble(EvaluationScoreCount::getScore).sum();

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

@@ -145,8 +145,8 @@ public class EvaluatioinScoreCountServiceImpl extends ServiceImpl<EvaluationScor
 	}
 
 	@Override
-	public List<EvaluationScoreCount> getEvaluationScoreCountList(String organizationEvaluationId, String organizationEvaluationRuleId, List<String> indicatorIds, List<String> stageCode) {
-		List<EvaluationScoreCount>  list = baseMapper.selectEvaluationScoreCountList( organizationEvaluationId,  organizationEvaluationRuleId,  indicatorIds,  stageCode);
+	public List<EvaluationScoreCount> getEvaluationScoreCountList(String organizationEvaluationId, String organizationEvaluationRuleId, List<String> indicatorIds, List<String> stageCode,String binSection) {
+		List<EvaluationScoreCount>  list = baseMapper.selectEvaluationScoreCountList( organizationEvaluationId,  organizationEvaluationRuleId,  indicatorIds,  stageCode,binSection);
 		return list;
 	}
 }

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

@@ -926,6 +926,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 
 			List<OrganizationEvaluationInfo> evaluationInfos =new ArrayList<>();
 			double score = 0.00;
+			String scoreid ="";
 			for (Map.Entry<String,Object > entry : idMap.entrySet()) {
 				OrganizationEvaluationInfo info = new OrganizationEvaluationInfo();
 				info.setId(entry.getValue().toString());
@@ -939,6 +940,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 						//得分
 						if (entry.getKey().endsWith("_DF") || entry.getKey().endsWith("_DF2")|| entry.getKey().endsWith("_JHDF")) {
 							score = score + info.getQuantifiedValue();
+							scoreid = entry.getValue().toString();
 						}
 
 
@@ -961,7 +963,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 
 			boolean b = this.saveOrUpdateBatch(evaluationInfos);
 			if(b && null !=evaluationInfos && evaluationInfos.size()>0){
-				OrganizationEvaluationInfo info = this.getById(evaluationInfos.get(0).getId());
+				OrganizationEvaluationInfo info = this.getById(scoreid);
 				List<EvaluationScoreCount>  listcount = evaluatioinScoreCountService.getEvaluationScoreCountList(info.getOrganizationEvaluationId(),info.getOrganizationEvaluationRuleId(),info.getIndicatorId(),"");
 				if(null != listcount && listcount.size()>0){
 					EvaluationScoreCount count = listcount.get(0);
@@ -1025,6 +1027,7 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 					OrganizationEvaluationInfo info = new OrganizationEvaluationInfo();
 					info.setOrganizationEvaluationId(addEvaluationInfoDTO.getOrganizationEvaluationId());
 					info.setOrganizationEvaluationRuleId(evaluationRule.getId());
+					info.setOrganizationId(evaluationRule.getOrganizationId());
 					info.setIndicatorId(addEvaluationInfoDTO.getIndicatorId());
 					info.setIndicatorDictionaryId(d.getId());
 					info.setOptionCode(d.getOptionCode());

ims-service/ims-eval/src/main/resources/mappers/EvaluationScoreCountMapper.xml

@@ -116,6 +116,11 @@
             </if>
 
 
+            <if test="binSection !=null and binSection !=''">
+                AND b.id = #{binSection}
+            </if>
+
+
         </where>
     </select>