Merge branch 'master' of http://git_xt.jsxt.jsjtyxt.com/wenhongquan/VisualInspection

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

@@ -1241,7 +1241,19 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 
 	@Override
 	public List<StatisticsBean> getOneFSCheckedInfo(StatisticsBean obj) {
-		return statisticsDao.selectOneCheckedInfo(obj);
+
+        List<StatisticsBean> datas =  statisticsDao.selectOneCheckedInfo(obj);
+        for (StatisticsBean d:
+                datas) {
+            Map<Long,StatisticsBo> p =  getMasterNumAndScore(d.getMth());
+            if(p!=null && p.get(obj.getUser_id())!=null) {
+                StatisticsBo b = p.get(obj.getUser_id());
+                d.setChecked_num(b.getChecked_m_num() + d.getChecked_num());
+                d.setAll_check_score(d.getAll_check_score() + b.getCheck_all_m_score());
+            }
+        }
+
+        return datas;
 	}
 
 	@Override
@@ -1708,18 +1720,18 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
         Date d = DateUtil.strParseDate(month, "yyyy/MM");
         cal.setTime(d);
         cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), 25, 23, 0, 0);
-        temp.setStart_time(cal.getTime());
-        cal.add(Calendar.MONTH, -1);
         temp.setEnd_time(cal.getTime());
+        cal.add(Calendar.MONTH, -1);
+        temp.setStart_time(cal.getTime());
 
         List<TaskAndScore> taskAndScores = statisticsDao.selectMList(temp);
         Map<Long,StatisticsBo> masterMap = new HashMap<Long,StatisticsBo>();
         for(TaskAndScore score:taskAndScores) {
-        	if(!masterMap.containsKey(score.getChecked_person1())){
-        		masterMap.put(score.getChecked_person1(), new StatisticsBo());
+        	if(!masterMap.containsKey(score.getMonitor_user_id())){
+        		masterMap.put(score.getMonitor_user_id(), new StatisticsBo());
         	}
-        	StatisticsBo sb = masterMap.get(score.getChecked_person1());
-        	sb.setCheck_all_m_score(sb.getCheck_all_m_score()+score.getCheck_item_score());
+        	StatisticsBo sb = masterMap.get(score.getMonitor_user_id());
+        	sb.setCheck_all_m_score(sb.getCheck_all_m_score()+(score.getCheck_item_score()==null?0:score.getCheck_item_score()));
         	sb.setChecked_m_num(sb.getChecked_m_num()+1);
         }
         return masterMap;