|
@@ -85,7 +85,10 @@ public class ScoreCalculationServiceNum13 implements ScoreCalculationService {
|
|
|
return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
|
|
|
}
|
|
|
// 获取已完成审查的项目数量 分子
|
|
|
- List<JtScsdl> ywcscList = jtScsdlService.list(new LambdaQueryWrapper<JtScsdl>().eq(BaseDo::getDeleted, "0").in(JtScsdl::getMainid, khbmList.stream().map(JtXmkh::getId)).in(JtScsdl::getXmmc, gcsjqd.stream().map(JtKcsjxm::getXmmc).collect(Collectors.toList())).between(JtScsdl::getPzsj, jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime()));
|
|
|
+ List<JtScsdl> ywcscList = jtScsdlService.list(new LambdaQueryWrapper<JtScsdl>().eq(BaseDo::getDeleted, "0")
|
|
|
+ .in(JtScsdl::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList()))
|
|
|
+ .in(JtScsdl::getXmmc, gcsjqd.stream().map(JtKcsjxm::getXmmc).collect(Collectors.toList()))
|
|
|
+ .between(JtScsdl::getPzsj, jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime()));
|
|
|
// 分子 已审定的项目数量: 最终节点审定责任人(审查审定-审查审定率)、批准时间(审查审定-审查审定率)不为空的且批准时间在考核区间内的项目数量
|
|
|
List<String> numerator = ywcscList.stream().filter(data -> StringUtils.isNotBlank(data.getZzjdsdzrr()) && data.getPzsj() != null).map(JtScsdl::getXmmc).distinct().collect(Collectors.toList());
|
|
|
if (numerator.isEmpty()) {
|