时间转化2

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ScreenshotServiceImpl.java

@@ -443,6 +443,10 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
     //每次获取到截屏后计算并处理
     private void calculateTime(Screenshot screenshot) {
         try {
+            //如果图片类型为空 则认为是0-编程
+            if(screenshot.getPicType() == null){
+                screenshot.setPicType(0);
+            }
             //默认状态为不连续 如果下面判断是连续才会修改为true
             Boolean isConsecutive = false;
             //获取本人当天结束时间为准的最后一条记录
@@ -483,8 +487,8 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
                 TimeCalculation timeCalculation = new TimeCalculation();
                 timeCalculation
                         .setUserId(screenshot.getUid())
-                        //根据截图种类设置行为代号 如果为空则默认为正常 即0
-                        .setActionType(screenshot.getPicType() != null ? screenshot.getPicType() : 0)
+                        //根据截图种类设置行为代号
+                        .setActionType(screenshot.getPicType())
                         .setDate(screenshot.getIndate().toLocalDate())
                         //设置开始时间和结束时间都为当前时间
                         .setStartTime(currentTime)