tt

VisualInspection/js/statistics/check_workload_statistics.js

@@ -140,6 +140,8 @@ $(function(){
     }
     select_personal();
 	
+
+
 	/**
 	 * 稽查人员信息
 	 * @param {*} start_date 
@@ -148,55 +150,29 @@ $(function(){
 	 */
 	function checkman_info(start_date,end_date,user_id){
 		var param = {
-					"start_date": start_date,
-					"end_date": end_date,
-					"checkman_id":user_id
-					}
+				"start_date": start_date,
+				"end_date": end_date,
+				"checkman_id":user_id
+		}
 		post_common_service("statistics/checkman/info",param,function(data){
-			if(data!=''){
-				if(data.all_checkman!='' && data.all_checkman!=undefined){
-				 	$(".all_check_personal").text(data.all_checkman);
-				}else{
-					$(".all_check_personal").text(0);
-				}
-				if(data.all_task_num!='' && data.all_task_num!=undefined){
-				 	$(".all_check_task").text(data.all_task_num);
-				}else{
-					$(".all_check_task").text(0);
-				}
-				if(data.all_check_minute!='' && data.all_check_minute!=undefined){
-				    $(".all_check_minute").text(Math.floor(data.all_check_minute/60) + "小时" + (data.all_check_minute%60) + "分");
-				}else{
-					$(".all_check_minute").text(0);
-				}
-				if(data.all_checked_num!='' && data.all_checked_num!=undefined){
-				    $(".all_checkman").text(data.all_checked_num);
-				}else{
-					$(".all_checkman").text(0);
-				}
-				if(data.all_checked_score!='' && data.all_checked_score!=undefined){
-				    $(".all_check_score").text(data.all_checked_score);
-				}else{
-					$(".all_check_score").text(0);
-				}
-				if(data.all_checked_score!='' && data.all_checked_score!=undefined && data.all_checked_num!='' && data.all_checked_num!=undefined){
-				    $(".check_score_avg").text(filter(data.all_checked_score,data.all_checked_num,0));
-				}else{
-					$(".check_score_avg").text(0);
-				}
-				if(data.checked_num!='' && data.checked_num!=undefined){
-				    $(".checked_num").text(data.checked_num);
-				}else{
-					$(".checked_num").text(0);
-				}
+			if(data != null ){
+				WH(".all_check_task",GDV(data.all_task_num,0));
+				WH(".all_check_minute",convertT( GDV(data.all_check_minute,0)));
+				WH(".all_checkman",GDV(data.all_checkman,0));
+				WH(".all_check_score",GDV(data.all_checked_score,0));
+				WH(".checked_num",GDV(data.checked_num,0));
+				WH(".checked_task_num",GDV(data.checked_task_num,0));
+				WH(".unable_task_num",GDV(data.unable_task_num,0));
+				WH(".checked_people_num",GDV(data.checked_people_num,0));
             }else{
-				$(".all_check_personal").text(0);
-				$(".all_check_task").text(0);
-				$(".all_check_minute").text(0);
-				$(".all_checkman").text(0);
-				$(".all_check_score").text(0);
-				$(".check_score_avg").text(0);
-				$(".checked_num").text(0);
+				WH(".all_check_task",0);
+				WH(".all_check_minute",0);
+				WH(".all_checkman",0);
+				WH(".all_check_score",0);
+				WH(".checked_num",0);
+				WH(".checked_task_num",0);
+				WH(".unable_task_num",0);
+				WH(".checked_people_num",0);
             }
         },function(error){
         	return "" ;

VisualInspection/js/statistics/common_statistic.js

@@ -90,6 +90,15 @@ function getFsStationList(center_manage_id,func){
 }
 
 /**
+ * 写html value
+ * @param {*} selector 
+ * @param {*} val 
+ */
+function WH(selector,val){
+    $(selector).html(val);
+}
+
+/**
  * 根据选择器 回去value值
  * param： id 选择器
  * return value

VisualInspection/view/statistics/check_workload_statistics.html

@@ -1,4 +1,5 @@
 <script src="/js/lib/echarts/build/dist/echarts.js"></script>
+<script src="/js/statistics/common_statistic.js?__inline"></script>
 <script src="/js/statistics/check_workload_statistics.js"></script>
 <link rel="stylesheet" type="text/css" href="/css/statistics/check_workload_statistics.css">
 <div class="container-right">
@@ -23,9 +24,26 @@
 
     <div class="row-3">
        <table class="table table-bordered" style="text-align:center;">
-           <tr><td>总稽查人数</td><td>总稽查任务数</td><td>总稽查时长</td><td>稽查扣分次数</td><td>考核人员数量</td><td>总扣分数</td><td>平均人次扣分数</td></tr>
-           <tr><td class="all_check_personal"></td><td class="all_check_task"></td><td class="all_check_minute"></td><td class="checked_num"></td>
-               <td class="all_checkman"></td><td class="all_check_score"></td><td class="check_score_avg"></td></tr>
+           <tr>
+                <td>总稽查任务数</td>
+                <td>扣分任务数</td>
+                <td>无效任务数</td>
+                <td>总稽查时长</td>
+                <td>稽查扣分次数</td>
+                <td>考核人员数量</td>
+                <td>考核人员扣分数量</td>
+                <td>总扣分数</td>
+            </tr>
+           <tr>
+               <td class="all_check_task"></td>
+               <td class="checked_task_num"></td>
+               <td class="unable_task_num"></td>            
+               <td class="all_check_minute"></td>
+               <td class="all_checkman"></td>
+               <td class="checked_num"></td>
+               <td class="checked_people_num"></td>
+               <td class="all_check_score"></td>
+            </tr>
        </table>
     </div>
 

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

@@ -32,6 +32,15 @@ public class CheckmanStatisticsBean {
     // 扣分次数
     private Integer checked_num ;
     
+    // 扣分任务数
+    private Integer checked_task_num ;
+    
+    // 考核扣分人员数量
+    private Integer checked_people_num ;
+    
+    // 无效任务数
+    private Integer unable_task_num ;
+    
     //开始日期
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  

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

@@ -43,6 +43,13 @@ public interface StatisticsDao  {
 	
 	public CheckmanStatisticsBean selectCheckManInfo(CheckmanStatisticsBean obj);
 	
+	public CheckmanStatisticsBean selectCheckManInfo1(CheckmanStatisticsBean obj);
+	
+	public CheckmanStatisticsBean selectCheckManInfo2(CheckmanStatisticsBean obj);
+	
+	public CheckmanStatisticsBean selectCheckManInfo3(CheckmanStatisticsBean obj);
+	
+	
 	
 	public List<StatisticsFsWork> selectFsWork(StatisticsFsWork obj);
 	
@@ -59,4 +66,6 @@ public interface StatisticsDao  {
 	public List<CheckAppealStatistic> selectCheckAppealNum(CheckAppealStatistic obj);
 	
 	public List<TaskAndScore> selectMList(TaskAndScore obj);
+	
+	
 }

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

@@ -349,6 +349,38 @@
 					AND t.check_time < #{end_date}
 				</if>
     </select>
+    <!--稽查人员工作量统计 -->
+    <select id="selectCheckManInfo1" parameterType="com.xintong.visualinspection.bean.CheckmanStatisticsBean" resultType="com.xintong.visualinspection.bean.CheckmanStatisticsBean">
+    		SELECT COUNT(1)  AS all_task_num , sum(
+				TIMESTAMPDIFF(MINUTE, t.start_time,t.end_time)
+			) AS all_check_minute , COUNT(DISTINCT(t.checked_person)) AS checked_num
+				FROM v_check_task t
+				WHERE
+				  t.check_time >= #{start_date}
+					AND t.check_time &lt; #{end_date}
+    </select>
+    
+    
+    
+    <select id="selectCheckManInfo2" parameterType="com.xintong.visualinspection.bean.CheckmanStatisticsBean" resultType="com.xintong.visualinspection.bean.CheckmanStatisticsBean">
+    	SELECT
+			SUM(cs.check_item_score ) AS all_checked_score , COUNT(DISTINCT cs.checked_person) AS checked_people_num , COUNT(DISTINCT cs.task_id) AS checked_task_num , count(1) AS all_checkman
+				FROM
+					check_score cs
+				LEFT JOIN v_check_task t  ON t.id = cs.task_id AND t.check_status != 22
+				WHERE
+				  t.check_time >= #{start_date}
+					AND t.check_time &lt; #{end_date}
+    </select>
+    
+     <select id="selectCheckManInfo3" parameterType="com.xintong.visualinspection.bean.CheckmanStatisticsBean" resultType="com.xintong.visualinspection.bean.CheckmanStatisticsBean">
+    	SELECT COUNT(1) AS unable_task_num FROM  v_check_task t WHERE  
+    		t.check_time >= #{start_date}
+			AND t.check_time &lt; #{end_date}
+    		AND t.check_status = 22
+    </select>
+    <!--稽查人员工作量统计 end  -->
+    
     
     <sql id="select_Fswork_condition">
     	AND t.user_id IS NOT NULL

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

@@ -1023,7 +1023,18 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 
 	@Override
 	public CheckmanStatisticsBean getCheckmanStatisticInfo(CheckmanStatisticsBean obj) {
-		return statisticsDao.selectCheckManInfo(obj);
+		
+		CheckmanStatisticsBean obj1 = statisticsDao.selectCheckManInfo1(obj);
+		CheckmanStatisticsBean obj2 = statisticsDao.selectCheckManInfo2(obj);
+		CheckmanStatisticsBean obj3 = statisticsDao.selectCheckManInfo3(obj);
+		obj1.setAll_checked_score(obj2.getAll_checked_score());
+		obj1.setChecked_people_num(obj2.getChecked_people_num());
+		obj1.setChecked_task_num(obj2.getChecked_task_num());
+		obj1.setAll_checkman(obj2.getAll_checkman());
+		
+		obj1.setUnable_task_num(obj3.getUnable_task_num());
+		
+		return obj1;
 	}
 
 	// 根据调剂获取用户列表