fix

sop-api/src/main/java/com/qmth/sop/server/api/TBDingController.java

@@ -146,21 +146,21 @@ public class TBDingController {
     }
 
 
-    @ApiOperation(value = "考勤明细统计接口")
-    @RequestMapping(value = "/attendance/count", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "考勤明细统计结果", response = TBDingAttendanceCountResult.class)})
-    public Result attendanceCount(@ApiParam(value = "服务单元", required = false) @RequestParam(required = false) Long serviceId,
-                                  @ApiParam(value = "姓名（模糊查询）", required = false) @RequestParam(required = false) String userName,
-                                  @ApiParam(value = "考勤日期开始", required = false) @RequestParam(required = false) Long startTime,
-                                  @ApiParam(value = "考勤日期结束", required = false) @RequestParam(required = false) Long endTime,
-                                  @ApiParam(value = "供应商", required = false) @RequestParam(required = false) Long supplierId,
-                                  @ApiParam(value = "客户名称（模糊查询）", required = false) @RequestParam(required = false) String custom,
-                                  @ApiParam(value = "SOP流水号（模糊查询）", required = false) @RequestParam(required = false) String sopNo
-    ) {
-        TBDingAttendanceCountResult result = tBDingService.attendanceCount(serviceId, userName, startTime, endTime, supplierId, custom, sopNo);
-
-        return ResultUtil.ok(result);
-    }
+//    @ApiOperation(value = "考勤明细统计接口")
+//    @RequestMapping(value = "/attendance/count", method = RequestMethod.POST)
+//    @ApiResponses({@ApiResponse(code = 200, message = "考勤明细统计结果", response = TBDingAttendanceCountResult.class)})
+//    public Result attendanceCount(@ApiParam(value = "服务单元", required = false) @RequestParam(required = false) Long serviceId,
+//                                  @ApiParam(value = "姓名（模糊查询）", required = false) @RequestParam(required = false) String userName,
+//                                  @ApiParam(value = "考勤日期开始", required = false) @RequestParam(required = false) Long startTime,
+//                                  @ApiParam(value = "考勤日期结束", required = false) @RequestParam(required = false) Long endTime,
+//                                  @ApiParam(value = "供应商", required = false) @RequestParam(required = false) Long supplierId,
+//                                  @ApiParam(value = "客户名称（模糊查询）", required = false) @RequestParam(required = false) String custom,
+//                                  @ApiParam(value = "SOP流水号（模糊查询）", required = false) @RequestParam(required = false) String sopNo
+//    ) {
+//        TBDingAttendanceCountResult result = tBDingService.attendanceCount(serviceId, userName, startTime, endTime, supplierId, custom, sopNo);
+//
+//        return ResultUtil.ok(result);
+//    }
 
 
 //    @ApiOperation(value = "考勤明细导出")

sop-business/src/main/java/com/qmth/sop/business/service/impl/SopScheduleServiceImpl.java

@@ -109,7 +109,7 @@ public class SopScheduleServiceImpl extends ServiceImpl<SopScheduleMapper, TBSop
         tempList.stream().collect(Collectors.groupingBy(map -> map.get("datetime"))).forEach((k, v) -> {
             Map<String, Object> map = new HashMap<>();
             map.put("datetime", k);
-            map.put("count", v.stream().mapToInt(m -> Integer.parseInt(m.get("count").toString())).sum());
+            map.put("count", v.stream().filter(map1->map1.get("count")!=null).mapToInt(m -> Integer.parseInt(m.get("count").toString())).sum());
             plan.add(map);
         });