连续月统计

VisualInspection/js/statistics/user_check_statistics.js

@@ -63,7 +63,7 @@ function getscore(starttime, endtime, limitnumber, limitscore, limitscore2) {
                 dat += po.p_str + "月、";
             }
             dat = dat.substring(0, dat.length - 1);
-            table += "<tr><td width='5%;'>" + (parseInt(i) + 1) + "</td><td width='15%;'>" + ss.user.workno + "</td><td width='15%;'>" + ss.dept + "</td><td width='20%;'><a href='JavaScript:void(0)' onclick='jumpuser(\"" + ss.user.id + "\",\"" + ss.user.organid + "\")'>" + ss.user.truename + "</a></td><td width='45%;'>" + dat + "</td></tr>";
+            table += "<tr><td width='5%;'>" + (parseInt(i) + 1) + "</td><td width='15%;'>" + ss.user.workno + "</td><td width='15%;'>" + ss.dept + "</td><td width='15%;'><a href='JavaScript:void(0)' onclick='jumpuser(\"" + ss.user.id + "\",\"" + ss.user.organid + "\")'>" + ss.user.truename + "</a></td><td width='50%;'>" + dat + "</td></tr>";
 
 
         }

VisualInspection/view/statistics/user_check_statistics.html

@@ -100,8 +100,8 @@
                         <th width="5%">序号</th>
                         <th width="15%">工号</th>
                         <th width="15%">部门</th>
-                        <th width="20%">姓名</th>
-                        <th width="45%">满足条件月份</th>
+                        <th width="15%">姓名</th>
+                        <th width="50%">满足条件月份</th>
                     </tr>
                 </thead>
             </table>

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/StatisticsServiceImpl.java

@@ -9,7 +9,6 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Method;
 import java.text.DecimalFormat;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.Map.Entry;
@@ -23,21 +22,16 @@ import com.xintong.visualinspection.dao.master.CheckTaskPeriodDao;
 import com.xintong.visualinspection.dao.master.CheckUserStatisticsDao;
 import com.xintong.visualinspection.pojo.StatisiticPojo;
 import com.xintong.visualinspection.pojo.UserRankingData;
-import com.xintong.visualinspection.service.CheckTaskPeriodService;
 import com.xintong.visualinspection.service.ThreadTaskService;
 import org.jxls.common.Context;
 import org.jxls.util.JxlsHelper;
-import org.jxls.util.Util;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-import org.thymeleaf.util.DateUtils;
 
 import com.xintong.visualinspection.dao.cluster.DepartmentDao;
 import com.xintong.visualinspection.dao.cluster.UserInfoDao;
 import com.xintong.visualinspection.dao.master.StatisticsDao;
-import com.xintong.visualinspection.pojo.TaskAndScore;
 import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.StatisticsService;
 import com.xintong.visualinspection.util.CacheUtil;
@@ -2449,9 +2443,10 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 
         List<StatisiticPojo> user_ids = new ArrayList<>();
 
+
         //判断是否连续
         for(Integer k : usm.keySet()){
-
+            List<UserStatistic> user_temp = new ArrayList<>();
             boolean isM = false;
 
             List<UserStatistic> pp = new ArrayList<>();
@@ -2471,9 +2466,9 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
                 }
                 if(isfond){
                     count++;
-                    if(count>=obj.getLimitnumber()){isM = true;break; }
+                    if(count>=obj.getLimitnumber()){isM = true;user_temp.addAll(pp);pp.clear();}
                 }else{
-                    if(count>=obj.getLimitnumber()){isM = true;break; }
+                    if(count>=obj.getLimitnumber()){isM = true;user_temp.addAll(pp);}
                     count=0;
                     pp.clear();
                 }
@@ -2485,7 +2480,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
                 StatisiticPojo p = new StatisiticPojo();
                 p.setUser(CacheUtil.getUserFromMap(k.longValue()));
                 p.setDept(CacheUtil.getOrgannameFromMap(p.getUser().getOrganid().longValue()));
-                p.setUserStatistics(pp);
+                p.setUserStatistics(user_temp);
                 user_ids.add(p);
             }
         }