统计

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/StatisticsBean.java

@@ -37,5 +37,5 @@ public class StatisticsBean {
     
     private Integer item_id ;
 
-    
+    private Integer checked_num;
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/master/StatisticsDao.java

@@ -14,5 +14,7 @@ import com.xintong.visualinspection.bean.StatisticsBean;
 public interface StatisticsDao  {
     
 	public List<StatisticsBean> selectStatistics(StatisticsBean obj);
+	
+	public List<StatisticsBean> selectCheckedTimes(StatisticsBean obj);
    
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/StatisticsMapper.xml

@@ -17,5 +17,17 @@
 			u LEFT JOIN check_item s ON u.parent_id = s.id GROUP  BY checked_person,id
     </select>
 
+    <select id="selectCheckedTimes" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
+    	SELECT COUNT(1) AS checked_num , t.checked_person AS user_id FROM check_task t 
+    	WHERE 1=1 
+			<if test="start_date!=null and end_date != null">
+		        AND	 t.start_time &gt;= #{start_date} AND t.end_time &lt;= #{end_date} 
+			</if>
+			<if test="dept_id!=null">
+				AND t.checked_dept =#{dept_id}			
+			</if>
+    	GROUP BY t.checked_person
+    </select>
+    
     
 </mapper>

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

@@ -38,10 +38,8 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		Long organId = obj.getDept_id();
 		// 将检索出来的数据放到如map中
 		List<StatisticsBean> list = statisticsDao.selectStatistics(obj);
-//		Map<Long,StatisticsBean> statisticMap = new HashMap<Long,StatisticsBean>();
-//		for( StatisticsBean statisticsBean : list ){
-//			statisticMap.put(statisticsBean.getUser_id(), statisticsBean);
-//		}
+		
+		List<StatisticsBean> timesList = statisticsDao.selectCheckedTimes(obj);
 		
 		Map<Long,StatisticsBo> statisticBoMap = new HashMap<Long,StatisticsBo>();
 				
@@ -58,9 +56,18 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		for( StatisticsBean statisticsBean : list ){
 			if(statisticBoMap.containsKey(statisticsBean.getUser_id())){
 				StatisticsBo tmp = statisticBoMap.get(statisticsBean.getUser_id());
-				tmp.getChecked_socre_name().add(statisticsBean.getName());
-				tmp.getChecked_score().add(statisticsBean.getScore());
-				tmp.setCheck_all_score(tmp.getCheck_all_score()+statisticsBean.getScore() );
+				if(statisticsBean.getName()!=null && statisticsBean.getScore()!=null){
+					tmp.getChecked_socre_name().add(statisticsBean.getName());
+					tmp.getChecked_score().add(statisticsBean.getScore());
+					tmp.setCheck_all_score(tmp.getCheck_all_score()+statisticsBean.getScore() );					
+				}
+			}
+		}
+		
+		for(StatisticsBean statisticsBean : timesList){
+			if(statisticBoMap.containsKey(statisticsBean.getUser_id())){
+				StatisticsBo tmp = statisticBoMap.get(statisticsBean.getUser_id());
+				tmp.setChecked_num(statisticsBean.getChecked_num());
 			}
 		}