xiatian hace 4 años
padre
commit
c5442a9d26

+ 1 - 4
themis-backend/src/main/java/com/qmth/themis/backend/api/TIeInvigilateWarnInfoController.java

@@ -50,12 +50,9 @@ public class TIeInvigilateWarnInfoController {
     @ApiOperation(value = "预警提醒接口")
     @RequestMapping(value = "/notify", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"count\":1}", response = Result.class)})
-    public Result notify(@ApiParam(value = "考试批次id", required = true) @RequestParam(required = true) Long examId,
+    public Result notify(@ApiParam(value = "考试批次id", required = false) @RequestParam(required = false) Long examId,
                          @ApiParam(value = "考试场次id", required = false) @RequestParam(required = false) Long examActivityId,
                          @ApiParam(value = "虚拟考场代码", required = false) @RequestParam(required = false) String roomCode) {
-        if (Objects.isNull(examId) || Objects.equals(examId, "")) {
-            throw new BusinessException(ExceptionResultEnum.EXAM_ID_IS_NULL);
-        }
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
         AuthDto authDto = (AuthDto) redisUtil.get(SystemConstant.userOauth + "::" + tbUser.getId());
         //如果有监考员角色,只能查看自己所监考的考场,巡考员和管理员则可以查看全部考场

+ 3 - 3
themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskExamPaperImportTemplete.java

@@ -217,10 +217,10 @@ public class TaskExamPaperImportTemplete implements TaskImportTemplete {
 	}
 
 	private Map<Long, Double> paperWeight(List<TEExamPaper> list) {
-		BigDecimal b1 = new BigDecimal(1.0);// 基数总数
+		BigDecimal b1 = new BigDecimal(100.0);// 基数总数
 		BigDecimal b2 = new BigDecimal(list.size());// 份数
-		BigDecimal b3 = b1.divide(b2, 2, BigDecimal.ROUND_FLOOR);// 平均数
-		BigDecimal b4 = b1.subtract(b3.multiply(b2).setScale(2, BigDecimal.ROUND_FLOOR));// 余数
+		BigDecimal b3 = b1.divide(b2, 0, BigDecimal.ROUND_FLOOR);// 平均数
+		BigDecimal b4 = b1.subtract(b3.multiply(b2).setScale(0, BigDecimal.ROUND_FLOOR));// 余数
 		Map<Long, Double> map = new HashMap<Long, Double>();
 		for (int i = 0; i < list.size(); i++) {
 			TEExamPaper p = list.get(i);