From 3bba4b39efa78f8afbabd3576f24af7727efdad0 Mon Sep 17 00:00:00 2001
From: liwen <w790785492@163.com>
Date: Tue, 21 May 2024 21:45:55 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E8=80=83=E8=AF=95=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=8F=8A=E6=A0=BC=E5=88=86=E8=AE=BE=E7=BD=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/hnac/hzims/safeproduct/entity/TestEntity.java     | 10 +++++-----
 .../hzims/safeproduct/service/impl/TestScoreServiceImpl.java   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/TestEntity.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/TestEntity.java
index 27ae3d7..0235e18 100644
--- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/TestEntity.java
+++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/TestEntity.java
@@ -60,11 +60,11 @@ public class TestEntity extends BaseEntity {
     @ApiModelProperty("考试结束时间")
     private Date testEndTime;
 
-    @NotNull
-    @Min(value = 0, message = "及格分必须大于等于0")
-    @Max(value = 100, message = "及格分必须小于等于100")
-    @ApiModelProperty("及格分")
-    private Integer passingScore;
+//    @NotNull
+//    @Min(value = 0, message = "及格分必须大于等于0")
+//    @Max(value = 100, message = "及格分必须小于等于100")
+//    @ApiModelProperty("及格分")
+//    private Integer passingScore;
 
     @NotNull
     @Size(max = 255, message = "考试地点字段长度不能超过255")
diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TestScoreServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TestScoreServiceImpl.java
index ca24f67..a075bb2 100644
--- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TestScoreServiceImpl.java
+++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/TestScoreServiceImpl.java
@@ -126,7 +126,7 @@ public class TestScoreServiceImpl extends ServiceImpl<TestScoreMapper, TestScore
     public TestScoreSumVO testScoreSum(Long testId, String name) {
         TestScoreSumVO testScoreSumVO = new TestScoreSumVO();
         TestEntity testEntity = testMapper.selectById(testId);
-        testScoreSumVO.setPassingScore(testEntity.getPassingScore());
+//        testScoreSumVO.setPassingScore(testEntity.getPassingScore());
         String peopleName = testEntity.getPeopleName();
         if (StringUtils.isNotBlank(peopleName)) {
             String[] split = peopleName.split(",");
@@ -138,7 +138,7 @@ public class TestScoreServiceImpl extends ServiceImpl<TestScoreMapper, TestScore
         list= list.stream().filter(s -> s.getScore() != null).collect(Collectors.toList());
         if (CollectionUtils.isNotEmpty(list)) {
             testScoreSumVO.setActualPeopleNum(list.size());
-            List<TestScoreEntity> passCollect = list.stream().filter(s -> s.getScore() > testEntity.getPassingScore()).collect(Collectors.toList());
+            List<TestScoreEntity> passCollect = list.stream().filter(s -> s.getScore() > 60).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(list)&&CollectionUtils.isNotEmpty(passCollect)) {
                 double result = BigDecimal.valueOf(passCollect.size()).divide(BigDecimal.valueOf(list.size()),2, RoundingMode.UP).doubleValue();
                 testScoreSumVO.setPercentage(result);