工作台年度考试合格率统计修改

cloud-web-manage/src/main/java/com/yizhi/application/portal/controller/EventTrackManageController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.Date;
@@ -86,9 +87,7 @@ public class EventTrackManageController {
         contextAndPageSizeVO.setYear(year);
         contextAndPageSizeVO.setCompanyId(companyId);
         contextAndPageSizeVO.setSiteId(siteId);
-        List<ExamDetailsMarkingVO> detailsMarkingVOList = examClient.selectExamListBySta(contextAndPageSizeVO);
 
-        Integer count = accountClient.getSiteAccountNum(siteId, companyId);
         Integer examTotal = eventTrackApiClients.getExamTotal("培训",year);
         ExamStaVo examStaVo = new ExamStaVo();
         if(examTotal!=null){
@@ -96,26 +95,15 @@ public class EventTrackManageController {
         }else{
             examStaVo.setExamNum(0);
         }
-        Integer qualifidNum = 0;
-        Integer qualifidNumFrist = 0;
-        Integer accountNum = 0;
-        Integer joinNum =0;
-
-        if(CollectionUtil.isNotEmpty(detailsMarkingVOList)){
-            for(ExamDetailsMarkingVO detailsMarkingVO :detailsMarkingVOList){
-                if (detailsMarkingVO.getVisibleRange() == 1) { // 平台用户可见
-                    accountNum+=count;
-                }else{
-                    accountNum+=(detailsMarkingVO.getShouldExamNum()!=null?detailsMarkingVO.getShouldExamNum():0);
-                }
-                qualifidNum+=(detailsMarkingVO.getQualifidNum()!=null?detailsMarkingVO.getQualifidNum():0);
-                joinNum+=(detailsMarkingVO.getCommitExamNum()!=null?detailsMarkingVO.getCommitExamNum():0);
-                qualifidNumFrist+=(detailsMarkingVO.getQualifiedNumFrist()!=null?detailsMarkingVO.getQualifiedNumFrist():0);
-            }
-
-            examStaVo.setJoinNum(joinNum);
-            examStaVo.setQualifidNum(percnet(Float.valueOf(accountNum),Float.valueOf(qualifidNum)));
-            examStaVo.setQualifiedNumFrist(percnet(Float.valueOf(accountNum),Float.valueOf(qualifidNumFrist)));
+        ExamDetailsMarkingVO examDetailsMarkingVO = examClient.selectExamListBySta(contextAndPageSizeVO);
+        if(examDetailsMarkingVO != null){
+            examStaVo.setJoinNum(examDetailsMarkingVO.getCommitExamNum());
+            BigDecimal passRate = new BigDecimal(examDetailsMarkingVO.getQualifidNum())
+                    .divide(new BigDecimal(examDetailsMarkingVO.getCommitExamNum()), 4, BigDecimal.ROUND_DOWN);
+            examStaVo.setQualifidNum(passRate.toString());
+            BigDecimal firstPassRate = new BigDecimal(examDetailsMarkingVO.getQualifiedNumFrist())
+                    .divide(new BigDecimal(examDetailsMarkingVO.getCommitExamNum()), 4, BigDecimal.ROUND_DOWN);
+            examStaVo.setQualifiedNumFrist(firstPassRate.toString());
         }else{
             examStaVo.setJoinNum(0);
             examStaVo.setQualifidNum("0");