计算两个时间戳相差的天数完善

区域作业/预习人均用时完善
教师统计-作业概况-作业详情完善

sapi/src/main/java/com/xhkjedu/sapi/service/region/RPaperAnalyzeService.java

@@ -261,7 +261,7 @@ public class RPaperAnalyzeService {
                 Integer usetimes = Integer.parseInt(map.get("costtime").toString());
                 Integer stunum = Integer.parseInt(map.get("stunum").toString());
 
-                double avgtime = N_Utils.formatAvg(day * stunum,usetimes);
+                double avgtime = N_Utils.formatAvg(usetimes, day * stunum);
                 map.put("avgtime",avgtime);
             }
         }
@@ -280,7 +280,7 @@ public class RPaperAnalyzeService {
                 Integer usetimes = Integer.parseInt(map.get("costtime").toString());
                 Integer stunum = Integer.parseInt(map.get("stunum").toString());
 
-                double avgtime = N_Utils.formatAvg(day * stunum,usetimes);
+                double avgtime = N_Utils.formatAvg(usetimes, day * stunum);
                 map.put("avgtime",avgtime);
             }
         }

sapi/src/main/resources/mapper/analyze/SchoolTaskMapper.xml

@@ -46,7 +46,7 @@
         left join t_paper_student ps1 on ps1.paperid=pg.paperid and ps1.classid=pg.classid
         left join t_class c on c.classid=pg.classid
         left join t_director d on p.directorid=d.directorid
-        where d.deleted=0 and p.schoolid=#{sparams.schoolid} and p.paperstate=22 and pg.schoolid=#{sparams.schoolid}
+        where p.deleted=0 and p.schoolid=#{sparams.schoolid} and p.paperstate=22 and pg.schoolid=#{sparams.schoolid}
         and c.gradeid=#{sparams.gradeid} and p.year=#{sparams.year} and (d.disabled=0 or p.directorid is null)
         <if test="sparams.starttime!=null and sparams.starttime!=0">
             AND pg.starttime>=#{sparams.starttime}

scommons/src/main/java/com/xhkjedu/utils/N_Utils.java

@@ -124,12 +124,17 @@ public class N_Utils {
     //计算两个时间戳相差的天数
     public static Integer getTimestampDay(Integer begintime,Integer endtime){
         if(isEmptyInteger(begintime)) return 365;//默认时间差为一年
-        Integer day = 0;
+        /*Integer day = 0;
 
         Integer cha = endtime - begintime;
-        day = cha / (3600 * 24);
 
-        return day;
+        day = cha / (3600 * 24);*/
+
+        BigDecimal b1 = new BigDecimal(String.valueOf(endtime - begintime));
+        BigDecimal b2 = new BigDecimal(String.valueOf(3600 * 24));
+
+        BigDecimal count = b1.divide(b2,2,BigDecimal.ROUND_UP);
+        return count.intValue();
     }
 
     /**