首页考试限制考试时间考试完成合格取消弹框提醒-优化代码

去除多余代码，避免空指针

ibps-provider-root/modules/provider-platform-default/src/main/java/com/lc/ibps/common/provider/DesktopFacadeProvider.java

@@ -255,10 +255,12 @@ public class DesktopFacadeProvider extends GenericProvider implements IDesktopFa
 				if (BeanUtils.isEmpty(bean.getMarkDate()) || !bean.getMarkDate().equals(currentDate)){
 					bean.setPopUp(1);// 标记为弹窗提醒
 				}
-				String flag = desktopFacadeService.chargeExamPassingStatus(bean.getDataSourceId());
-				if("pass".equals(flag)){
-					logger.warn("已限制时间考试id{}，已通过取消弹窗提醒",bean.getDataSourceId());
-					bean.setPopUp(0);// 取消弹窗提醒
+				if(BeanUtils.isNotEmpty(bean.getDataSourceId())){
+					String flag = desktopFacadeService.chargeExamPassingStatus(bean.getDataSourceId());
+					if("pass".equals(flag)){
+						logger.warn("已限制时间考试{},id{}，已通过取消弹窗提醒",bean.getTitle(),bean.getDataSourceId());
+						bean.setPopUp(0);// 取消弹窗提醒
+					}
 				}
 			}
 			result.setData(calendarPoList);
@@ -268,41 +270,6 @@ public class DesktopFacadeProvider extends GenericProvider implements IDesktopFa
 		return result;
 	}
 
-	public String chargeExamPassingStatus(String dataSourceId) {
-		//List<Map<String,Object>> list = desktopFacadeDao.selectExamViewInfo(dataSourceId);
-		String sql = " select * from v_examination ;";
-		List<Map<String,Object>> list = (List<Map<String, Object>>) commonDao.query(sql);
-		if (list == null || list.isEmpty()) {
-			return "empt";//未发布考试或者非考试弹窗
-		}
-		Map<String, Object> record = list.get(0);
-		String flag ="NotExaminedStatus";//考试已发布但是未考试完成状态
-		// 获取字段
-		Object limitDateObj = record.get("limitDate");
-		String examState = (String) record.get("examState");
-		String paperState = (String) record.get("paperState");
-		// 检查条件
-		if (limitDateObj != null && !limitDateObj.toString().isEmpty() && "已发布".equals(examState) && "已完成".equals(paperState)) {
-			// 获取分数相关字段
-			Number totalScore = (Number) record.get("totalScore");
-			Number qualifiedRadio = (Number) record.get("qualifiedRadio");
-			String scoringType = (String) record.get("scoringType");
-			Number curScore = null;
-			if ("平均分".equals(scoringType)) {
-				curScore = (Number) record.get("averageScore");
-			} else if ("最高分".equals(scoringType)) {
-				curScore = (Number) record.get("maxScore");
-			} else if ("最近得分".equals(scoringType)) {
-				curScore = (Number) record.get("recentScore");
-			}
-			if (totalScore != null && qualifiedRadio != null && curScore != null) {
-				double passScore = totalScore.doubleValue() * qualifiedRadio.doubleValue() / 100.0;
-				return curScore.doubleValue() >= passScore?flag="pass":"failure";//pass 考试已通过
-			}
-		}
-		return flag;
-	}
-
 	@ApiOperation(value = "批量删除用户日历日程", notes = "批量删除用户日历日程")
 	@Override
 	public APIResult<Void> removeCalendar(