|
@@ -109,7 +109,7 @@ public class ScoreCalculationServiceNum17 implements ScoreCalculationService {
|
|
|
*/
|
|
|
public JtYcpfhzDetail calculateFinalSource(BigDecimal finalScore, BigDecimal rate, JtYcpfhz jtYcpfhz, JkAssessmentRules jkAssessmentRules,
|
|
|
SysUserVo currentUser) {
|
|
|
- String errorMsg = "审查审定率为:" + rate.toString() + "%";
|
|
|
+ String errorMsg = "覆盖率为:" + rate.toString() + "%";
|
|
|
if (rate.compareTo(BigDecimal.valueOf(100)) >= 0) {
|
|
|
// 不扣分
|
|
|
} else if (rate.compareTo(BigDecimal.valueOf(60)) <= 0) {
|
|
@@ -144,7 +144,8 @@ public class ScoreCalculationServiceNum17 implements ScoreCalculationService {
|
|
|
//该模块的数据量
|
|
|
long allNameCount = jtSjjdqdList.stream().map(JtSjjdqd::getXmmc).distinct().count();
|
|
|
long count = jtSjjdqdList.stream().filter(data -> data.getJhjdsj() != null &&
|
|
|
- compareDatesIgnoringTime(jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime(), data.getJhjdsj())).map(JtSjjdqd::getXmmc)
|
|
|
+ compareDatesIgnoringTime(jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime(), data.getJhjdsj()))
|
|
|
+ .map(JtSjjdqd::getXmmc)
|
|
|
.distinct()
|
|
|
.count();
|
|
|
return (int) (allNameCount - count);
|
|
@@ -158,7 +159,8 @@ public class ScoreCalculationServiceNum17 implements ScoreCalculationService {
|
|
|
public int calculateDenominator(List<JtFjglxm> jtFjglxmList, List<JtSjjdqd> jtSjjdqdList, JtGsjtbsj jtGsjtbsj) {
|
|
|
long count = jtFjglxmList.stream().map(JtFjglxm::getXmmc).distinct().count();
|
|
|
long count1 = jtSjjdqdList.stream().filter(data -> data.getJhjdsj() != null &&
|
|
|
- !compareDatesIgnoringTime(jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime(), data.getJhjdsj())).map(JtSjjdqd::getXmmc)
|
|
|
+ !compareDatesIgnoringTime(jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime(), data.getJhjdsj()))
|
|
|
+ .map(JtSjjdqd::getXmmc)
|
|
|
.distinct()
|
|
|
.count();
|
|
|
return (int) (count - count1);
|