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

VisualInspection/js/statistics/appeal.js

@@ -0,0 +1,83 @@
+
+$(function(){
+
+    // 当前月份初始化
+    $("#sel_month").val(getM()-1);
+
+    $("#month_name").html( $("#sel_month").find("option:selected").text());
+
+    // 导管中心选择
+    $("#center_manage").change(function(){
+        var center_manage_id = GV(this);
+        if(center_manage_id == ''){
+            $("#fs_station,#fs_employee").html('');
+        }else{
+            getFsStationList(center_manage_id,function(obj){
+                 $("#fs_station").html(obj);
+            });
+        }
+    })
+
+    // 查询
+    $("#searchBtn").click(function(){        
+        $("#month_name").html( $("#sel_month").find("option:selected").text()  )
+        getFsWorkInfo();
+    })
+    // 导出excel
+    $("#exportExcel").click(function(){
+        var param = '';
+        if( GV("#fs_station") != '' &&  GV("#fs_station")!=null ){
+            param = "&deptId="+ GV("#fs_station");
+        }else if(GV("#center_manage")!='' ){
+            param = "&centerId=" + GV("#center_manage");
+        }
+        window.location.href = getserveraddr() +"/file/appeal/info?month="+GV("#sel_month")+param;
+    })
+
+    // 初始化查询
+     getFsWorkInfo();
+
+    // end
+})
+
+/**
+ * 检索出勤明细数据
+ * @param {*} param 
+ */
+function getFsWorkInfo(){
+
+    var param = {
+        "start_time": "2017-"+(GV("#sel_month")-1)+"-25 23:00:00" ,
+        "end_time": "2017-"+GV("#sel_month")+"-25 23:00:00"
+    }
+    
+    if(GV("#fs_station")!=''){
+        param[ 'dept_id' ] = GV("#fs_station");
+    }else if(GV("#center_manage") != ''){
+            param[ 'parent_dept_id' ] = GV("#center_manage");
+    }
+
+    post_common_service("statistics/check/appeal",param,function(data){
+   
+        $(".table-tbody").empty();
+        if(data.length >0){
+            for(var i=0;i< data.length;i++){
+                $(".table-tbody").append( getTableContent(data[i],i+1));
+            }
+        }
+    },function(error){
+    });
+}
+
+/**
+ * 拼接表格内容
+ * @param {*} obj 
+ * @param {*} seq 
+ */
+function getTableContent(obj,seq){
+ 
+    var content = "<tr><td>"+seq+"</td> <td >"+obj.fee_station_name+"</td> <td >"+GDV(obj.appeal_num,0)+
+            "</td> <td >"+GDV(obj.appeal_success_num,0)+"</td><td>"+ GDV(obj.appeal_fail_num,0) +"</td><td>"+ GDV(obj.appeal_other_num,0) +"</td> </tr>";
+
+    return content;
+}

VisualInspection/js/statistics/change_attendance.js

@@ -0,0 +1,148 @@
+
+$(function(){
+
+    // 初始化部门下的收费站
+     getFsStationList(GV("#center_manage"),function(obj){
+        $("#fs_station").html(obj);
+        // 初始化收费站下的人数
+        getFsEmployee(GV("#fs_station"),function(obj){
+            $("#fs_employee").html(obj);
+            // 检索
+            getFsWorkInfo();
+        });
+    });
+
+    // 当前月份初始化
+    $("#sel_month").val(getM()-1);
+
+    // 根据月份确定天数
+    monthChange();
+     $("#month_name").html( $("#sel_month").find("option:selected").text());
+
+
+    // 收费站中心选择
+    $("#fs_station").change(function(){
+        var fee_station_id = GV(this);
+        if(fee_station_id == ''){
+            $("#fs_employee").html('');
+        }else{
+            getFsEmployee(fee_station_id,function(obj){
+                $("#fs_employee").html(obj);
+            });
+        }
+    })
+
+    // 导管中心选择
+    $("#center_manage").change(function(){
+        var center_manage_id = GV(this);
+        if(center_manage_id == ''){
+            $("#fs_station,#fs_employee").html('');
+        }else{
+            getFsStationList(center_manage_id,function(obj){
+                 $("#fs_station").html(obj);
+            });
+        }
+    })
+
+    // 查询
+    $("#searchBtn").click(function(){        
+        $("#month_name").html( $("#sel_month").find("option:selected").text()  )
+        getFsWorkInfo();
+    })
+    // end
+})
+
+/**
+ * 检索出勤明细数据
+ * @param {*} param 
+ */
+function getFsWorkInfo(){
+
+    var param = {
+        "start_time": "2017-"+(GV("#sel_month")-1)+"-25 23:00:00" ,
+        "end_time": "2017-"+GV("#sel_month")+"-25 23:00:00"
+    }
+    
+    if(GV("#fs_employee")!=''){
+            param[ 'user_id'] = GV("#fs_employee");
+    }else if(GV("#fs_station")!=''){
+        param[ 'dept_id' ] = GV("#fs_station");
+    }else if(GV("#center_manage") != ''){
+            param[ 'parent_dept_id' ] = GV("#center_manage");
+    }
+
+    post_common_service("statistics/fs/unregular/work/info",param,function(data){
+        // 月份变化
+        monthChange();
+        $(".table-tbody").empty();
+        if(data.length >0){
+            for(var i=0;i< data.length;i++){
+                $(".table-tbody").append( getTableContent(data[i],i+1));
+            }
+        }
+    },function(error){
+    });
+}
+
+/**
+ * 拼接表格内容
+ * @param {*} obj 
+ * @param {*} seq 
+ */
+function getTableContent(obj,seq){
+    var days = getDays(GV("#sel_month")-1);
+    var map_class = {};
+    for(var z=0; z < obj.subStatisticsFsWork.length ;z++){
+        if(obj.subStatisticsFsWork[z].check_id !=undefined){
+            map_class[getD(obj.subStatisticsFsWork[z].work_date)+"-"+obj.subStatisticsFsWork[z].class_type] = 2;
+        }else{
+            map_class[getD(obj.subStatisticsFsWork[z].work_date)+"-"+obj.subStatisticsFsWork[z].class_type] = 1;
+        }
+    }
+    var class_html = [];
+    for(var d=0;d<3;d++){
+        var class_type = 3;
+        if(d != 0){
+            class_type = d ;
+        }
+
+        for(var i=26; i<=days; i++){
+            if( map_class[i+"-"+class_type] !=undefined ){
+                if( map_class[i+"-"+class_type]==1){
+                    class_html[d] += '<td>/</td>' ;
+                }else{
+                    class_html[d] += '<td class="b-grey">/</td>' ;
+                }
+            }else{
+                class_html[d] += '<td></td>' ;
+            }
+        }
+        for(var i=1; i<=25; i++){
+            if( map_class[i+"-"+class_type] !=undefined ){
+                if( map_class[i+"-"+class_type]==1){
+                    class_html[d] += '<td>/</td>' ;
+                }else{
+                    class_html[d] += '<td class="b-grey">/</td>' ;
+                }
+            }else{
+                class_html[d] += '<td></td>' ;
+            }
+        }
+    }
+
+    var content = "<tr><td rowspan='3'>"+seq+"</td> <td rowspan='3'>"+obj.feeStationName+"</td> <td rowspan='3'>"+obj.userName+
+            "</td> <td rowspan='3'>"+obj.positionName+"</td><td rowspan='3'>"+ obj.workno +"</td><td>夜班</td> "+class_html[0]+"<td rowspan='3'>"+
+            obj.work_days+"</td><td rowspan='3'>"+convertT(obj.work_minutes)+"</td><td rowspan='3'></td> </tr>\
+        <tr><td>早班</td> "+class_html[1]+" </tr>\
+        <tr><td>中班</td> "+ class_html[2] +" </tr>" ;
+
+    return content;
+}
+
+/**
+ * 月份变化 , 天数变化
+ */
+function monthChange(){
+    $(".m28").show();
+    $(".m"+getDays(GV("#sel_month")-1)).hide();
+}

VisualInspection/js/statistics/change_work.js

@@ -0,0 +1,102 @@
+
+$(function(){
+
+    // 初始化部门下的收费站
+     getFsStationList(GV("#center_manage"),function(obj){
+        $("#fs_station").html(obj);
+        // 初始化收费站下的人数
+        getFsEmployee(GV("#fs_station"),function(obj){
+            $("#fs_employee").html(obj);
+            // 检索
+            getFsWorkInfo();
+        });
+    });
+
+    // 当前月份初始化
+    $("#sel_month").val(getM()-1);
+
+    $("#month_name").html( $("#sel_month").find("option:selected").text());
+
+
+    // 收费站中心选择
+    $("#fs_station").change(function(){
+        var fee_station_id = GV(this);
+        if(fee_station_id == ''){
+            $("#fs_employee").html('');
+        }else{
+            getFsEmployee(fee_station_id,function(obj){
+                $("#fs_employee").html(obj);
+            });
+        }
+    })
+
+    // 导管中心选择
+    $("#center_manage").change(function(){
+        var center_manage_id = GV(this);
+        if(center_manage_id == ''){
+            $("#fs_station,#fs_employee").html('');
+        }else{
+            getFsStationList(center_manage_id,function(obj){
+                 $("#fs_station").html(obj);
+            });
+        }
+    })
+
+    // 查询
+    $("#searchBtn").click(function(){        
+        $("#month_name").html( $("#sel_month").find("option:selected").text()  )
+        getFsWorkInfo();
+    })
+    // end
+})
+
+/**
+ * 检索出勤明细数据
+ * @param {*} param 
+ */
+function getFsWorkInfo(){
+
+    var param = {
+        "start_time": "2017-"+(GV("#sel_month")-1)+"-25 23:00:00" ,
+        "end_time": "2017-"+GV("#sel_month")+"-25 23:00:00"
+    }
+    
+    if(GV("#fs_employee")!=''){
+        param[ 'user_id'] = GV("#fs_employee");
+    }else if(GV("#fs_station")!=''){
+        param[ 'dept_id' ] = GV("#fs_station");
+    }else if(GV("#center_manage") != ''){
+        param[ 'parent_dept_id' ] = GV("#center_manage");
+    }
+
+    post_common_service("statistics/fs/unregular/work/person",param,function(data){
+   
+        $(".table-tbody").empty();
+        if(data.length >0){
+            for(var i=0;i< data.length;i++){
+                $(".table-tbody").append( getTableContent(data[i],i+1));
+            }
+        }
+    },function(error){
+    });
+}
+
+/**
+ * 拼接表格内容
+ * @param {*} obj 
+ * @param {*} seq 
+ */
+function getTableContent(obj,seq){
+    
+    var map_class = {};
+    var workdays = 0;
+    for(var z=0; z < obj.subStatisticsFsWork.length ;z++){
+        map_class[obj.subStatisticsFsWork[z].class_type] = obj.subStatisticsFsWork[z].work_days ;
+        workdays += GDV(obj.subStatisticsFsWork[z].work_days,0);
+    }
+
+    var content = "<tr><td>"+seq+"</td> <td >"+obj.feeStationName+"</td> <td >"+obj.userName+
+            "</td> <td >"+obj.positionName+"</td><td>"+ GDV(map_class[3],0) +"</td><td>"+ GDV(map_class[1],0) +"</td><td>"+ GDV(map_class[2],0) +"</td><td>"+workdays+"</td><td>"+"</td> </tr>";
+
+    return content;
+}

VisualInspection/js/statistics/common_attendance.js

@@ -7,6 +7,8 @@ $(function(){
         // 初始化收费站下的人数
         getFsEmployee(GV("#fs_station"),function(obj){
             $("#fs_employee").html(obj);
+            // 检索
+            getFsWorkInfo();
         });
     });
 
@@ -43,38 +45,50 @@ $(function(){
     })
 
     // 查询
-    $("#searchBtn").click(function(){
-        
+    $("#searchBtn").click(function(){        
         $("#month_name").html( $("#sel_month").find("option:selected").text()  )
-
-        var param = {
-           "start_time": "2017-"+(GV("#sel_month")-1)+"-25 23:00:00" ,
-           "end_time": "2017-"+GV("#sel_month")+"-25 23:00:00"
-        }
-        
-        if(GV("#fs_employee")!=''){
-             param[ 'user_id'] = GV("#fs_employee");
-        }else if(GV("#fs_station")!=''){
-            param[ 'dept_id' ] = GV("#fs_station");
-        }else if(GV("#center_manage") != ''){
-             param[ 'parent_dept_id' ] = GV("#center_manage");
-        }
-
-        post_common_service("statistics/fs/work/info",param,function(data){
-            // 月份变化
-            monthChange();
-            $(".table-tbody").empty();
-            if(data.length >0){
-                for(var i=0;i< data.length;i++){
-                    $(".table-tbody").append( getTableContent(data[i],i+1));
-                }
-            }
-        },function(error){
-        });
+        getFsWorkInfo();
     })
     // end
 })
 
+/**
+ * 检索出勤明细数据
+ * @param {*} param 
+ */
+function getFsWorkInfo(){
+
+    var param = {
+        "start_time": "2017-"+(GV("#sel_month")-1)+"-25 23:00:00" ,
+        "end_time": "2017-"+GV("#sel_month")+"-25 23:00:00"
+    }
+    
+    if(GV("#fs_employee")!=''){
+            param[ 'user_id'] = GV("#fs_employee");
+    }else if(GV("#fs_station")!=''){
+        param[ 'dept_id' ] = GV("#fs_station");
+    }else if(GV("#center_manage") != ''){
+            param[ 'parent_dept_id' ] = GV("#center_manage");
+    }
+
+    post_common_service("statistics/fs/work/info",param,function(data){
+        // 月份变化
+        monthChange();
+        $(".table-tbody").empty();
+        if(data.length >0){
+            for(var i=0;i< data.length;i++){
+                $(".table-tbody").append( getTableContent(data[i],i+1));
+            }
+        }
+    },function(error){
+    });
+}
+
+/**
+ * 拼接表格内容
+ * @param {*} obj 
+ * @param {*} seq 
+ */
 function getTableContent(obj,seq){
     var days = getDays(GV("#sel_month")-1);
     var map_class = {};
@@ -117,7 +131,7 @@ function getTableContent(obj,seq){
     }
 
     var content = "<tr><td rowspan='3'>"+seq+"</td> <td rowspan='3'>"+obj.feeStationName+"</td> <td rowspan='3'>"+obj.userName+
-            "</td> <td rowspan='3'>"+obj.positionName+"</td><td rowspan='3'>"+ "workno" +"</td><td>夜班</td> "+class_html[0]+"<td rowspan='3'>"+
+            "</td> <td rowspan='3'>"+obj.positionName+"</td><td rowspan='3'>"+ obj.workno +"</td><td>夜班</td> "+class_html[0]+"<td rowspan='3'>"+
             obj.work_days+"</td><td rowspan='3'>"+convertT(obj.work_minutes)+"</td><td rowspan='3'></td> </tr>\
         <tr><td>早班</td> "+class_html[1]+" </tr>\
         <tr><td>中班</td> "+ class_html[2] +" </tr>" ;
@@ -131,123 +145,4 @@ function getTableContent(obj,seq){
 function monthChange(){
     $(".m28").show();
     $(".m"+getDays(GV("#sel_month")-1)).hide();
-}
-
-/**
- * xxx分钟 转化 xx时xx分
- */
-function convertT(minute){
-    return minute/60 +"时"+minute%60+"分";
-}
-
-/**
- * 获取当前月份值
- */
-function getM(datet){
-    var date = new Date();
-    if(date!=undefined && datet instanceof Date){
-        date = datet ;
-    }
-    return date.getMonth() +1 ;
-}
-
-/**
- * 根据Date 获取天数值
- * parm： string date 
- * return int
- */
-function getD(date){
-    var datev = new Date(date) ;
-    return datev.getDate() ;
-}
-
-/**
- * 根据收费站id获取该收费站下的人员列表
- * param： fs_station_id , func 异步回调
- * return： String , List Option
- */
-function getFsEmployee(fs_station_id , func){ 
-    var param = {
-            "organid":fs_station_id
-    }
-    post_common_service("user/getFsUserList",param,function(data){
-        var resultStr = ''
-        if(data.length > 0){
-            resultStr = "<option value=''>全部</option>";  
-            for(var i=0;i<data.length;i++){
-                resultStr += "<option value="+data[i].id+">"+data[i].truename+"</option>";  
-            }
-        }
-        func(resultStr);
-    },function(error){
-    });
-}
-
-/**
- * 根据道管中心id 获取收费站select 列表
- * param： center_manage_id , func 异步回调方法
- * return: String select 下 List<Option>
- */
-function getFsStationList(center_manage_id,func){ 
-    var param = {
-            "parentid":center_manage_id
-    }
-    post_common_service("dept/getDeptInfosByDeptId",param,function(data){
-         var str = '';
-        if(data.length > 0){
-            str = "<option value=''>全部</option>";  
-            for(var i=0;i<data.length;i++){
-                str += "<option value="+data[i].id+">"+data[i].organname+"</option>";  
-            }
-        }
-       func(str);
-    },function(error){
-    });
-}
-
-/**
- * 根据选择器 回去value值
- * param： id 选择器
- * return value
- */ 
-function GV(selector){
-    return $(selector).val();
-}
-
-/**
- * 根据选择器，获取html值
- * param：selector 选择器
- * return： html value
- */ 
-function GH(selector){
-    return $(selector).html();
-}
-
-/**
- * 根据月份，判断当前月份天数
- * param： month String 月份 ，datet Date 年份
- * return：days（ 28,29,30,31 ）
- */
-function getDays(mouth,datet){
-    //构造当前日期对象
-    var date = new Date();
-    if(date!=undefined && datet instanceof Date){
-        date = datet ;
-    }
-    //获取年份
-    var year = date.getFullYear();
-    //定义当月的天数；
-    var days ;
-    //当月份为二月时，根据闰年还是非闰年判断天数
-    if(mouth == 2){
-            days= year % 4 == 0 ? 29 : 28;
-    }
-    else if(mouth == 1 || mouth == 3 || mouth == 5 || mouth == 7 || mouth == 8 || mouth == 10 || mouth == 12){
-        //月份为：1,3,5,7,8,10,12 时，为大月.则天数为31；
-        days= 31;
-    }
-    else{
-        days= 30;   
-    }
-    return days ;
 }

VisualInspection/js/statistics/common_statistic.js

@@ -0,0 +1,137 @@
+/**
+ * 过滤掉undefined值，等于默认值，默认 ''
+ * @param {*} value 
+ * @param {*} default_value 
+ */
+function GDV(value,default_value){
+    if(value != undefined){
+        return value ;
+    }else{
+        if(default_value == undefined){
+            return '';
+        }else{
+            return default_value ;
+        }
+    }
+}
+
+/**
+ * xxx分钟 转化 xx时xx分
+ */
+function convertT(minute){
+    return parseInt(minute/60) +"时"+minute%60+"分";
+}
+
+/**
+ * 获取当前月份值
+ * param： datet Date ,
+ * return: month int 
+ */
+function getM(datet){
+    var date = new Date();
+    if(date!=undefined && datet instanceof Date){
+        date = datet ;
+    }
+    return date.getMonth() +1 ;
+}
+
+/**
+ * 根据Date 获取天数值
+ * parm： string date 
+ * return int
+ */
+function getD(date){
+    var datev = new Date(date) ;
+    return datev.getDate() ;
+}
+
+/**
+ * 根据收费站id获取该收费站下的人员列表
+ * param： fs_station_id , func 异步回调
+ * return： String , List Option
+ */
+function getFsEmployee(fs_station_id , func){ 
+    var param = {
+            "organid":fs_station_id
+    }
+    post_common_service("user/getFsUserList",param,function(data){
+        var resultStr = ''
+        if(data.length > 0){
+            resultStr = "<option value=''>全部</option>";  
+            for(var i=0;i<data.length;i++){
+                resultStr += "<option value="+data[i].id+">"+data[i].truename+"</option>";  
+            }
+        }
+        func(resultStr);
+    },function(error){
+    });
+}
+
+/**
+ * 根据道管中心id 获取收费站select 列表
+ * param： center_manage_id , func 异步回调方法
+ * return: String select 下 List<Option>
+ */
+function getFsStationList(center_manage_id,func){ 
+    var param = {
+            "parentid":center_manage_id
+    }
+    post_common_service("dept/getDeptInfosByDeptId",param,function(data){
+         var str = '';
+        if(data.length > 0){
+            str = "<option value=''>全部</option>";  
+            for(var i=0;i<data.length;i++){
+                str += "<option value="+data[i].id+">"+data[i].organname+"</option>";  
+            }
+        }
+       func(str);
+    },function(error){
+    });
+}
+
+/**
+ * 根据选择器 回去value值
+ * param： id 选择器
+ * return value
+ */ 
+function GV(selector){
+    return $(selector).val();
+}
+
+/**
+ * 根据选择器，获取html值
+ * param：selector 选择器
+ * return： html value
+ */ 
+function GH(selector){
+    return $(selector).html();
+}
+
+/**
+ * 根据月份，判断当前月份天数
+ * param： month String 月份 ，datet Date 年份
+ * return：days（ 28,29,30,31 ）
+ */
+function getDays(mouth,datet){
+    //构造当前日期对象
+    var date = new Date();
+    if(date!=undefined && datet instanceof Date){
+        date = datet ;
+    }
+    //获取年份
+    var year = date.getFullYear();
+    //定义当月的天数；
+    var days ;
+    //当月份为二月时，根据闰年还是非闰年判断天数
+    if(mouth == 2){
+            days= year % 4 == 0 ? 29 : 28;
+    }
+    else if(mouth == 1 || mouth == 3 || mouth == 5 || mouth == 7 || mouth == 8 || mouth == 10 || mouth == 12){
+        //月份为：1,3,5,7,8,10,12 时，为大月.则天数为31；
+        days= 31;
+    }
+    else{
+        days= 30;   
+    }
+    return days ;
+}

VisualInspection/js/statistics/common_work.js

@@ -0,0 +1,102 @@
+
+$(function(){
+
+    // 初始化部门下的收费站
+     getFsStationList(GV("#center_manage"),function(obj){
+        $("#fs_station").html(obj);
+        // 初始化收费站下的人数
+        getFsEmployee(GV("#fs_station"),function(obj){
+            $("#fs_employee").html(obj);
+            // 检索
+            getFsWorkInfo();
+        });
+    });
+
+    // 当前月份初始化
+    $("#sel_month").val(getM()-1);
+
+    $("#month_name").html( $("#sel_month").find("option:selected").text());
+
+
+    // 收费站中心选择
+    $("#fs_station").change(function(){
+        var fee_station_id = GV(this);
+        if(fee_station_id == ''){
+            $("#fs_employee").html('');
+        }else{
+            getFsEmployee(fee_station_id,function(obj){
+                $("#fs_employee").html(obj);
+            });
+        }
+    })
+
+    // 导管中心选择
+    $("#center_manage").change(function(){
+        var center_manage_id = GV(this);
+        if(center_manage_id == ''){
+            $("#fs_station,#fs_employee").html('');
+        }else{
+            getFsStationList(center_manage_id,function(obj){
+                 $("#fs_station").html(obj);
+            });
+        }
+    })
+
+    // 查询
+    $("#searchBtn").click(function(){        
+        $("#month_name").html( $("#sel_month").find("option:selected").text()  )
+        getFsWorkInfo();
+    })
+    // end
+})
+
+/**
+ * 检索出勤明细数据
+ * @param {*} param 
+ */
+function getFsWorkInfo(){
+
+    var param = {
+        "start_time": "2017-"+(GV("#sel_month")-1)+"-25 23:00:00" ,
+        "end_time": "2017-"+GV("#sel_month")+"-25 23:00:00"
+    }
+    
+    if(GV("#fs_employee")!=''){
+            param[ 'user_id'] = GV("#fs_employee");
+    }else if(GV("#fs_station")!=''){
+        param[ 'dept_id' ] = GV("#fs_station");
+    }else if(GV("#center_manage") != ''){
+            param[ 'parent_dept_id' ] = GV("#center_manage");
+    }
+
+    post_common_service("statistics/fs/work/person",param,function(data){
+   
+        $(".table-tbody").empty();
+        if(data.length >0){
+            for(var i=0;i< data.length;i++){
+                $(".table-tbody").append( getTableContent(data[i],i+1));
+            }
+        }
+    },function(error){
+    });
+}
+
+/**
+ * 拼接表格内容
+ * @param {*} obj 
+ * @param {*} seq 
+ */
+function getTableContent(obj,seq){
+    
+    var map_class = {};
+    var workdays = 0;
+    for(var z=0; z < obj.subStatisticsFsWork.length ;z++){
+        map_class[obj.subStatisticsFsWork[z].class_type] = obj.subStatisticsFsWork[z].work_days ;
+        workdays += GDV(obj.subStatisticsFsWork[z].work_days,0);
+    }
+
+    var content = "<tr><td>"+seq+"</td> <td >"+obj.feeStationName+"</td> <td >"+obj.userName+
+            "</td> <td >"+obj.positionName+"</td><td>"+ GDV(map_class[3],0) +"</td><td>"+ GDV(map_class[1],0) +"</td><td>"+ GDV(map_class[2],0) +"</td><td>"+workdays+"</td><td>"+"</td> </tr>";
+
+    return content;
+}

VisualInspection/view/statistics/appeal.html

@@ -0,0 +1,69 @@
+<script src="/js/statistics/common_statistic.js?__inline"></script>
+<script src="/js/statistics/appeal.js?__inline"></script>
+<link rel="stylesheet" type="text/css" href="/css/statistics/atendance_style.css">
+<div class="container-fluid ">
+    <div class="row">
+        <form  class="form-horizontal">
+            <div class="form-group">
+                <label for="exampleInputAccount1" class="col-sm-1">月份</label>
+                <div class="col-sm-2">
+                    <select class="form-control" id="sel_month">
+                        <option value="1">一月</option>
+                        <option value="2">二月</option>
+                        <option value="3">三月</option>
+                        <option value="4">四月</option>
+                        <option value="5">五月</option>
+                        <option value="6">六月</option>
+                        <option value="7">七月</option>
+                        <option value="8">八月</option>
+                        <option value="9">九月</option>
+                        <option value="10">十月</option>
+                        <option value="11">十一月</option>
+                        <option value="12">十二月</option>
+                    </select>
+                </div>
+                <label for="exampleInputAccount1" class="col-sm-1">部门</label>
+                <div class="col-sm-2">
+                    <select class="form-control" id="center_manage">
+                        <option selected value="">全部</option>
+                        <option value="30">连云港</option>
+                        <option value="31">盐城</option>
+                        <option value="32">南通</option>
+                    </select>
+                </div>
+                <div class="col-sm-2">
+                    <select class="form-control" id="fs_station"></select>
+                </div>
+                <div class="col-sm-2">
+                    <button class="btn btn-primary" id="searchBtn" type="button" >查询</button>
+                </div>
+                <div class="col-sm-2">
+                    <button class="btn btn-primary" id="exportExcel" type="button" >导出</button>
+                </div>
+            </div>
+        </form>
+    </div>
+
+    <div class="table-title"><span id="month_name"></span><span>份收费站申诉情况统计</span></div>
+
+    <div class="row">
+          
+              <div class="table-head" ><table  width="100%" min-height="190px" align="center" >
+                  <thead>
+                    <tr>
+                        <th  width="80px">序号</th>
+                        <th  width="120px">站名</th>
+                        <th  width="120px">申诉次数</th>
+                        <th>申诉成功（次数）<br> (已修改考核结果) </th>
+                        <th>申诉失败（次数）<br> (维持原稽查结果)</th>
+                        <th>其他情况（次数）<br>(更换被考核人等)</th>
+                    </tr>
+                  </thead>
+                  <tbody class="table-tbody" style="background:white" align="center" height="500px">
+
+                  </tbody>
+                  </table>
+                </div>
+         
+    </div>
+</div>

VisualInspection/view/statistics/change_attendance.html

@@ -1 +1,117 @@
-222
+<script src="/js/statistics/common_statistic.js?__inline"></script>
+<script src="/js/statistics/change_attendance.js?__inline"></script>
+<link rel="stylesheet" type="text/css" href="/css/statistics/atendance_style.css">
+<div class="container-fluid ">
+    <div class="row">
+        <form  class="form-horizontal">
+            <div class="form-group">
+                <label for="exampleInputAccount1" class="col-sm-1">月份</label>
+                <div class="col-sm-2">
+                    <select class="form-control" id="sel_month">
+                        <option value="1">一月</option>
+                        <option value="2">二月</option>
+                        <option value="3">三月</option>
+                        <option value="4">四月</option>
+                        <option value="5">五月</option>
+                        <option value="6">六月</option>
+                        <option value="7">七月</option>
+                        <option value="8">八月</option>
+                        <option value="9">九月</option>
+                        <option value="10">十月</option>
+                        <option value="11">十一月</option>
+                        <option value="12">十二月</option>
+                    </select>
+                </div>
+                <label for="exampleInputAccount1" class="col-sm-1">部门</label>
+                <div class="col-sm-2">
+                    <select class="form-control" id="center_manage">
+                        <option value="">全部</option>
+                        <option selected value="30">连云港</option>
+                        <option value="31">盐城</option>
+                        <option value="32">南通</option>
+                    </select>
+                </div>
+                <div class="col-sm-2">
+                    <select class="form-control" id="fs_station">
+
+                    </select>
+                </div>
+                <div class="col-sm-2">
+                    <select class="form-control" id="fs_employee">
+
+                    </select>
+                </div>
+                <div class="col-sm-2">
+                    <button class="btn btn-primary" id="searchBtn" type="button" >查询</button>
+                </div>
+            </div>
+        </form>
+    </div>
+
+
+
+    <div class="table-title"><span id="month_name"></span><span>份机动人员顶岗明细统计表</span></div>
+
+    <div class="row">
+          
+              <div class="table-head" ><table  width="100%" min-height="190px" align="center" >
+                  <thead>
+                    <tr>
+                        <th rowspan="2" width="45px">序号</th>
+                        <th rowspan="2" width="80px">站名</th>
+                        <th rowspan="2" width="90px">姓名</th>
+                        <th rowspan="2" width="80px">岗位</th>
+                        <th rowspan="2" width="80px">工号</th>
+                        <th width="80px">日期</th>
+                        <th  rowspan="2">26</th>
+                        <th  rowspan="2">27</th>
+                        <th  rowspan="2">28</th>
+                        <th class="m28"  rowspan="2">29</th>
+                        <th class="m28 m29"  rowspan="2">30</th>
+                        <th class="m28 m29 m30"  rowspan="2">31</th>
+                        <th  rowspan="2">1</th>
+                        <th  rowspan="2">2</th>
+                        <th  rowspan="2">3</th>
+                        <th rowspan="2">4</th>
+                        <th  rowspan="2">5</th>
+                        <th  rowspan="2">6</th>
+                        <th  rowspan="2">7</th>
+                        <th rowspan="2">8</th>
+                        <th  rowspan="2">9</th>
+                        <th rowspan="2">10</th>
+                        <th  rowspan="2">11</th>
+                        <th rowspan="2">12</th>
+                        <th  rowspan="2">13</th>
+                        <th  rowspan="2">14</th>
+                        <th  rowspan="2">15</th>
+                        <th  rowspan="2">16</th>
+                        <th  rowspan="2">17</th>
+                        <th  rowspan="2">18</th>
+                        <th  rowspan="2">19</th>
+                        <th  rowspan="2">20</th>
+                        <th  rowspan="2">21</th>
+                        <th  rowspan="2">22</th>
+                        <th  rowspan="2">23</th>
+                        <th  rowspan="2">24</th>
+                        <th  rowspan="2">25</th>
+                        <th  rowspan="2"  width="60px">出勤天数</th>
+                        <th  rowspan="2"  width="60px">在亭时长</th>
+                        <th  rowspan="2"  width="45px">备注</th>
+                    </tr>
+                    <tr> 
+                        <th>班次</th>
+                    </tr>
+                  </thead>
+                  <tbody class="table-tbody" style="background:white" align="center" height="500px">
+
+                  </tbody>
+                  </table>
+                </div>
+         
+    </div>
+</div>
+<script>
+    $(document).ready(function() {
+
+    });
+</script>

VisualInspection/view/statistics/change_work.html

@@ -1 +1,86 @@
-111
+<script src="/js/statistics/common_statistic.js?__inline"></script>
+<script src="/js/statistics/change_work.js?__inline"></script>
+<link rel="stylesheet" type="text/css" href="/css/statistics/atendance_style.css">
+<div class="container-fluid ">
+    <div class="row">
+        <form  class="form-horizontal">
+            <div class="form-group">
+                <label for="exampleInputAccount1" class="col-sm-1">月份</label>
+                <div class="col-sm-2">
+                    <select class="form-control" id="sel_month">
+                        <option value="1">一月</option>
+                        <option value="2">二月</option>
+                        <option value="3">三月</option>
+                        <option value="4">四月</option>
+                        <option value="5">五月</option>
+                        <option value="6">六月</option>
+                        <option value="7">七月</option>
+                        <option value="8">八月</option>
+                        <option value="9">九月</option>
+                        <option value="10">十月</option>
+                        <option value="11">十一月</option>
+                        <option value="12">十二月</option>
+                    </select>
+                </div>
+                <label for="exampleInputAccount1" class="col-sm-1">部门</label>
+                <div class="col-sm-2">
+                    <select class="form-control" id="center_manage">
+                        <option value="">全部</option>
+                        <option selected value="30">连云港</option>
+                        <option value="31">盐城</option>
+                        <option value="32">南通</option>
+                    </select>
+                </div>
+                <div class="col-sm-2">
+                    <select class="form-control" id="fs_station">
+
+                    </select>
+                </div>
+                <div class="col-sm-2">
+                    <select class="form-control" id="fs_employee">
+
+                    </select>
+                </div>
+                <div class="col-sm-2">
+                    <button class="btn btn-primary" id="searchBtn" type="button" >查询</button>
+                </div>
+            </div>
+        </form>
+    </div>
+
+
+
+    <div class="table-title"><span id="month_name"></span><span>份机动人员出勤统计</span></div>
+
+    <div class="row">
+          
+              <div class="table-head" ><table  width="100%" min-height="190px" align="center" >
+                  <thead>
+                    <tr>
+                        <th rowspan="2" width="80px">序号</th>
+                        <th rowspan="2" width="120px">站名</th>
+                        <th rowspan="2" width="120px">姓名</th>
+                        <th rowspan="2" width="120px">岗位</th>
+                        <th width="120px" colspan="3">月份出勤统计（上月26 ~ 本月25）</th>
+                        <th  rowspan="2"  min-width="120px">合计</th>
+                        <th  rowspan="2" >备注</th>
+                    </tr>
+                    <tr> 
+                        <th>夜</th>
+                        <th>早</th>
+                        <th>中</th>
+                    </tr>
+                  </thead>
+                  <tbody class="table-tbody" style="background:white" align="center" height="500px">
+
+                  </tbody>
+                  </table>
+                </div>
+         
+    </div>
+</div>
+<script>
+    $(document).ready(function() {
+
+    });
+</script>

VisualInspection/view/statistics/common_attendance.html

@@ -1,3 +1,4 @@
+<script src="/js/statistics/common_statistic.js?__inline"></script>
 <script src="/js/statistics/common_attendance.js?__inline"></script>
 <link rel="stylesheet" type="text/css" href="/css/statistics/atendance_style.css">
 <div class="container-fluid ">
@@ -49,7 +50,7 @@
 
 
 
-    <div class="table-title"><span id="month_name"></span><span>份出勤明细统计表</span></div>
+    <div class="table-title"><span id="month_name"></span><span>份正常出勤明细统计表</span></div>
 
     <div class="row">
           

VisualInspection/view/statistics/common_work.html

@@ -1 +1,86 @@
-44
+<script src="/js/statistics/common_statistic.js?__inline"></script>
+<script src="/js/statistics/common_work.js?__inline"></script>
+<link rel="stylesheet" type="text/css" href="/css/statistics/atendance_style.css">
+<div class="container-fluid ">
+    <div class="row">
+        <form  class="form-horizontal">
+            <div class="form-group">
+                <label for="exampleInputAccount1" class="col-sm-1">月份</label>
+                <div class="col-sm-2">
+                    <select class="form-control" id="sel_month">
+                        <option value="1">一月</option>
+                        <option value="2">二月</option>
+                        <option value="3">三月</option>
+                        <option value="4">四月</option>
+                        <option value="5">五月</option>
+                        <option value="6">六月</option>
+                        <option value="7">七月</option>
+                        <option value="8">八月</option>
+                        <option value="9">九月</option>
+                        <option value="10">十月</option>
+                        <option value="11">十一月</option>
+                        <option value="12">十二月</option>
+                    </select>
+                </div>
+                <label for="exampleInputAccount1" class="col-sm-1">部门</label>
+                <div class="col-sm-2">
+                    <select class="form-control" id="center_manage">
+                        <option value="">全部</option>
+                        <option selected value="30">连云港</option>
+                        <option value="31">盐城</option>
+                        <option value="32">南通</option>
+                    </select>
+                </div>
+                <div class="col-sm-2">
+                    <select class="form-control" id="fs_station">
+
+                    </select>
+                </div>
+                <div class="col-sm-2">
+                    <select class="form-control" id="fs_employee">
+
+                    </select>
+                </div>
+                <div class="col-sm-2">
+                    <button class="btn btn-primary" id="searchBtn" type="button" >查询</button>
+                </div>
+            </div>
+        </form>
+    </div>
+
+
+
+    <div class="table-title"><span id="month_name"></span><span>份正常在岗人员出勤统计</span></div>
+
+    <div class="row">
+          
+              <div class="table-head" ><table  width="100%" min-height="190px" align="center" >
+                  <thead>
+                    <tr>
+                        <th rowspan="2" width="80px">序号</th>
+                        <th rowspan="2" width="120px">站名</th>
+                        <th rowspan="2" width="120px">姓名</th>
+                        <th rowspan="2" width="120px">岗位</th>
+                        <th width="120px" colspan="3">月份出勤统计（上月26 ~ 本月25）</th>
+                        <th  rowspan="2"  min-width="120px">合计</th>
+                        <th  rowspan="2" >备注</th>
+                    </tr>
+                    <tr> 
+                        <th>夜</th>
+                        <th>早</th>
+                        <th>中</th>
+                    </tr>
+                  </thead>
+                  <tbody class="table-tbody" style="background:white" align="center" height="500px">
+
+                  </tbody>
+                  </table>
+                </div>
+         
+    </div>
+</div>
+<script>
+    $(document).ready(function() {
+
+    });
+</script>

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

@@ -12,6 +12,10 @@ import lombok.Data;
 @Data
 public class CheckAppealStatistic {
 	
+	private Integer id;
+	
+	private String month_name ;
+	
 	// 开始时间
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") 
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")  
@@ -24,13 +28,13 @@ public class CheckAppealStatistic {
     
     private Integer appeal_result ;
     
-    private Integer appeal_success_num ;
+    private int appeal_success_num ;
     
-    private Integer appeal_other_num;
+    private int appeal_other_num;
     
-    private Integer appeal_fail_num ;
+    private int appeal_fail_num ;
     
-    private Integer appeal_num;
+    private int appeal_num;
     
     private String fee_station_name;
     

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

@@ -31,6 +31,9 @@ public class StatisticsFsWork {
     // 岗位名字
     private String positionName ;
     
+    // 工号
+    private String workno ;
+    
     // 父部门id
     private Long parent_dept_id ;
     

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/FileExcelController.java

@@ -15,8 +15,10 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.xintong.visualinspection.bean.CheckAppealStatistic;
 import com.xintong.visualinspection.bean.StatisticsBean;
 import com.xintong.visualinspection.service.StatisticsService;
+import com.xintong.visualinspection.util.DateUtil;
 
 /**
  * 文件名：StatisticsController
@@ -42,18 +44,15 @@ public class FileExcelController extends BaseController {
     		@RequestParam String start_date,@RequestParam String end_date,
     		@RequestParam String start_score,@RequestParam String end_score){
     	StatisticsBean obj = new StatisticsBean();
-    	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss" );
-    	try {
-			Date start = sdf.parse(start_date);
-			Date end = sdf.parse(end_date);
-			obj.setDept_id(dept_id);
-			obj.setStart_date(start);
-			obj.setEnd_date(end);
-			obj.setStart_score(start_score);
-			obj.setEnd_score(end_score);
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
+    
+		Date start =  DateUtil.strParseDate(start_date);
+		Date end =  DateUtil.strParseDate(end_date);
+		obj.setDept_id(dept_id);
+		obj.setStart_date(start);
+		obj.setEnd_date(end);
+		obj.setStart_score(start_score);
+		obj.setEnd_score(end_score);
+		
     	statisticsService.getEmployeeCheckedInfo(obj, req, resp);
     	return super.returnSuccessResult(null);
     }
@@ -66,16 +65,14 @@ public class FileExcelController extends BaseController {
     @RequestMapping(value = "/score/info",method=RequestMethod.GET)
     public String getScoreInfo(HttpServletRequest req,HttpServletResponse resp,
     		@RequestParam String start_date,@RequestParam String end_date){
-    	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss" );
+    	
     	StatisticsBean obj = new StatisticsBean();
-    	try {
-			Date start = sdf.parse(start_date);
-			Date end = sdf.parse(end_date);
-			obj.setStart_date(start);
-			obj.setEnd_date(end);
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
+    
+		Date start =  DateUtil.strParseDate(start_date);
+		Date end =  DateUtil.strParseDate(end_date);
+		obj.setStart_date(start);
+		obj.setEnd_date(end);
+		
     	statisticsService.getFeeStationCheckedScore(obj, req, resp);
     	return super.returnSuccessResult(null);
     }
@@ -86,17 +83,33 @@ public class FileExcelController extends BaseController {
     @RequestMapping(value = "/score/item/info",method=RequestMethod.GET)
     public String getScoreItemInfo(HttpServletRequest req,HttpServletResponse resp,
     		@RequestParam String start_date,@RequestParam String end_date){
-    	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss" );
     	StatisticsBean obj = new StatisticsBean();
-    	try {
-			Date start = sdf.parse(start_date);
-			Date end = sdf.parse(end_date);
-			obj.setStart_date(start);
-			obj.setEnd_date(end);
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
+		Date start = DateUtil.strParseDate(start_date);
+		Date end = DateUtil.strParseDate(end_date);
+		obj.setStart_date(start);
+		obj.setEnd_date(end);
     	statisticsService.getFeeStationCheckItemScore(obj, req, resp);
     	return super.returnSuccessResult(null);
     }
+    
+    /**
+     * 收费站申诉统计
+     */
+    @RequestMapping(value = "/appeal/info",method=RequestMethod.GET)
+    public String getAppealStatisticExcel(HttpServletRequest req,HttpServletResponse resp,
+    		@RequestParam Integer month,
+    		@RequestParam(required=false) Integer centerId,
+    		@RequestParam(required=false) Integer deptId){
+    	CheckAppealStatistic obj = new CheckAppealStatistic();
+    	if(deptId!=null){
+    		obj.setDept_id(deptId);
+    	}else if(centerId!=null){
+    		obj.setParent_dept_id(centerId);
+    	}
+    	obj.setStart_time(DateUtil.strParseDate("2017-"+(month-1)+"-25 23:00:00"));
+    	obj.setEnd_time(DateUtil.strParseDate("2017-"+month+"-25 23:00:00"));
+    	statisticsService.getExcelAppealInfo(obj,month.toString(), req, resp);
+    	return super.returnSuccessResult(null);
+    }
+    
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/StatisticsService.java

@@ -86,4 +86,7 @@ public interface StatisticsService {
 	
 	// 申诉情况统计
 	public List<CheckAppealStatistic> getCheckAppealStatistic(CheckAppealStatistic obj); 
+	
+	// 收费站Excel申诉
+	public void getExcelAppealInfo(CheckAppealStatistic obj,String monthName,HttpServletRequest req,HttpServletResponse resp);
 }

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

@@ -415,6 +415,19 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		exportExcel("温馨服务检查情况统计表", "checked_item_info", list, resp);
 	}
 
+	
+	@Override
+	public void getExcelAppealInfo(CheckAppealStatistic obj,String monthName, HttpServletRequest req, HttpServletResponse resp) {
+		List<CheckAppealStatistic> list = getCheckAppealStatistic(obj);
+		for(Integer i=0;i<list.size();i++){
+			if(i==0){
+				list.get(0).setMonth_name(monthName);
+			}
+			list.get(i).setId(i+1);
+		}
+		exportExcel(monthName+"月份收费站申诉情况统计", "appeal_info", list, resp);
+	}
+
 	private void exportExcel(String fileName, String excelTemplateName, List<?> list, HttpServletResponse resp) {
 		String path = "./" + fileName + ".xls";
 		try (InputStream is = this.getClass().getResourceAsStream("/" + excelTemplateName + ".xls")) {
@@ -1016,6 +1029,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			if(mapSta.containsKey(userObj.getId())){
 				StatisticsFsWork staobj = map.get(userObj.getId());
 				staobj.setFeeStationName(userObj.getFee_station_name());
+				staobj.setWorkno(userObj.getWorkno());
 				staobj.setPositionName(CacheUtil.getJobnameFromMap(new Long(userObj.getPositionid())));
 				staobj.setUserName(userObj.getTruename());
 				staobj.setWork_days( mapSta.get(userObj.getId()).getWork_days() );
@@ -1059,6 +1073,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			if(mapSta.containsKey(userObj.getId())){
 				StatisticsFsWork staobj = map.get(userObj.getId());
 				staobj.setFeeStationName(userObj.getFee_station_name());
+				staobj.setWorkno(userObj.getWorkno());
 				staobj.setPositionName(CacheUtil.getJobnameFromMap(new Long(userObj.getPositionid())));
 				staobj.setUserName(userObj.getTruename());
 				staobj.setWork_days( mapSta.get(userObj.getId()).getWork_days() );

VisualInspection_server/src/main/java/com/xintong/visualinspection/util/DateUtil.java

@@ -0,0 +1,23 @@
+package com.xintong.visualinspection.util;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class DateUtil {
+	
+	/**
+	 * string date parse Date
+	 * @param strDate 
+	 * @return Date (Exception null)
+	 */
+	public static Date strParseDate(String strDate){
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss" );
+		try {
+			return sdf.parse(strDate);
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+}