Merge branch 'master' of http://git_xt.git.topm.win:8080/wenhongquan/VisualInspection

VisualInspection/css/statistics/assess_situation.css

@@ -0,0 +1,54 @@
+.col-sm-1{
+    width:102px;
+    float:left;
+}
+
+.col-sm-2{
+    width:130px;
+    float:left;
+}
+
+.col-sm-3,.col-sm-4{
+    width:165px;
+    float:left;
+}
+
+#start-time,#end-time{
+ width:150px;
+}
+
+.col-sm-4{
+    padding-left: 0px;
+}
+
+.col-sm-5{
+    width:50px;
+    float:left;
+}
+
+.btn-primary{
+    width:80px;
+}
+
+.table-title{
+    line-height: 50px;
+    text-align:center;
+}
+
+.table-title span{
+    font-size: 22px;
+    color:#333;
+}
+
+.table-head{
+    background-color: #EBF3FD;
+    margin-top:10px;
+    width:100%;
+}
+
+.table-head table tr th{
+    font-size: 12px;
+    color:#333;
+    text-align:center;
+}
+

VisualInspection/js/statistics/assess_ranking.js

@@ -0,0 +1,87 @@
+
+function queryEmpClick(){
+    //每次点击前清空表格数据
+    $(".table-tbody").empty('');
+    var start_date = $("#start-time").val();
+    var end_date = $("#end-time").val();
+    if(start_date==null||start_date==''||start_date==undefined||end_date==null||end_date==''||end_date==undefined){
+        alert("请选择起止日期");
+                return ;
+    }else{
+        start_date += " 00:00:00";
+        end_date += " 00:00:00";
+    }
+    // if(end_date < start_date){
+    //     alert("结束时间不能比开始时间小");
+    //             return ;
+    // }
+    var param = {
+        "dept_id": $("#fsList").val(),
+        "start_date": start_date,
+        "end_date": end_date,
+    }
+    var url = "statistics/employee/order";
+    var strTbody='';
+    post_common_service( url,param,function(data){
+                for(var i=0;i<data.length;i++){
+                     strTbody+="<tr>";
+      
+       strTbody+="<td>"+(i+1)+"</td><td>"+"</td>"
+                 +"<td>"+data[i].user.truename+"</td><td>"+"</td>"
+                 +"<td>"+data[i].user.workno+"</td><td>"+0+"</td>"
+                 +"<td>"+0+"</td><td>"+0+"</td>"
+                 +"<td>"+0+"</td><td>"+0+"</td>"
+                 +"<td>"+0+"</td><td>"+data[i].check_all_score+"</td>"
+                 +"<td>"+"</td><td>"+"</td>"
+                 +"<td>"+"</td><td>"+"</td>";
+                 strTbody+="</tr>";
+                }
+       $(".table-tbody").append(strTbody);
+               
+            },function(error){
+                return "" ;
+            });
+}
+
+
+function initQueryEmp(){
+    // 默认初始化前两天查所有
+    var endD = new Date();
+    var now = new Date();
+    var startD = new Date(now.getTime() - 2 * 24 * 3600 * 1000);
+    var start_date = startD.getFullYear()+"-"+(startD.getMonth()+1)+"-"+startD.getDate()+" 00:00:00"; 
+    var end_date = endD.getFullYear()+"-"+(endD.getMonth()+1)+"-"+endD.getDate()+" 00:00:00"; 
+
+     var param = {
+        "start_date": start_date,
+        "end_date": end_date,
+    }
+    var url = "statistics/employee/order";
+    var strTbody='';
+   
+    post_common_service( url,param,function(data){
+                for(var i=0;i<data.length;i++){
+                     strTbody+="<tr>";
+      
+       strTbody+="<td>"+(i+1)+"</td><td>"+"</td>"
+                 +"<td>"+data[i].user.truename+"</td><td>"+"</td>"
+                 +"<td>"+data[i].user.workno+"</td><td>"+0+"</td>"
+                 +"<td>"+0+"</td><td>"+0+"</td>"
+                 +"<td>"+0+"</td><td>"+0+"</td>"
+                 +"<td>"+0+"</td><td>"+data[i].check_all_score+"</td>"
+                 +"<td>"+"</td><td>"+"</td>"
+                 +"<td>"+"</td><td>"+"</td>";
+                 strTbody+="</tr>";
+                }
+       $(".table-tbody").append(strTbody);
+               
+            },function(error){
+                return "" ;
+            });
+    
+}
+
+
+
+
+

VisualInspection/js/statistics/assess_situation.js

@@ -0,0 +1,92 @@
+
+function queryEmpClick(){
+    //每次点击前清空表格数据
+    $(".table-tbody").empty('');
+    var start_date = $("#start-time").val();
+    var end_date = $("#end-time").val();
+    if(start_date==null||start_date==''||start_date==undefined||end_date==null||end_date==''||end_date==undefined){
+        alert("请选择起止日期");
+                return ;
+    }else{
+        start_date += " 00:00:00";
+        end_date += " 00:00:00";
+    }
+    // if(end_date < start_date){
+    //     alert("结束时间不能比开始时间小");
+    //             return ;
+    // }
+    var param = {
+        "dept_id": $("#fsList").val(),
+        "start_date": start_date,
+        "end_date": end_date,
+    }
+    var url = "statistics/employee/order";
+    var strTbody='';
+    post_common_service( url,param,function(data){
+                for(var i=0;i<data.length;i++){
+                     strTbody+="<tr>";
+      
+       strTbody+="<td>"+(i+1)+"</td><td>"+"</td>"
+                 +"<td>"+data[i].user.truename+"</td><td>"+"</td>"
+                 +"<td>"+data[i].user.workno+"</td><td>"+0+"</td>"
+                 +"<td>"+0+"</td><td>"+0+"</td>"
+                 +"<td>"+0+"</td><td>"+0+"</td>"
+                 +"<td>"+0+"</td><td>"+data[i].check_all_score+"</td>"
+                 +"<td>"+"</td><td>"+"</td>"
+                 +"<td>"+"</td><td>"+"</td>";
+                 strTbody+="</tr>";
+                }
+       $(".table-tbody").append(strTbody);
+               
+            },function(error){
+                return "" ;
+            });
+}
+
+
+function initQueryEmp(){
+    // 默认初始化前两天查所有
+    var endD = new Date();
+    var now = new Date();
+    var startD = new Date(now.getTime() - 2 * 24 * 3600 * 1000);
+    var start_date = startD.getFullYear()+"-"+(startD.getMonth()+1)+"-"+startD.getDate()+" 00:00:00"; 
+    var end_date = endD.getFullYear()+"-"+(endD.getMonth()+1)+"-"+endD.getDate()+" 00:00:00"; 
+
+     var param = {
+        "start_date": start_date,
+        "end_date": end_date,
+    }
+    var url = "statistics/employee/order";
+    var strTbody='';
+   
+    post_common_service( url,param,function(data){
+                for(var i=0;i<data.length;i++){
+                     strTbody+="<tr>";
+      
+       strTbody+="<td>"+(i+1)+"</td><td>"+"</td>"
+                 +"<td>"+data[i].user.truename+"</td><td>"+"</td>"
+                 +"<td>"+data[i].user.workno+"</td><td>"+0+"</td>"
+                 +"<td>"+0+"</td><td>"+0+"</td>"
+                 +"<td>"+0+"</td><td>"+0+"</td>"
+                 +"<td>"+0+"</td><td>"+data[i].check_all_score+"</td>"
+                 +"<td>"+"</td><td>"+"</td>"
+                 +"<td>"+"</td><td>"+"</td>";
+                 strTbody+="</tr>";
+                }
+       $(".table-tbody").append(strTbody);
+               
+            },function(error){
+                return "" ;
+            });
+    
+}
+
+
+
+
+
+
+
+
+
+

VisualInspection/view/statistics/assess_situation.html

@@ -0,0 +1,82 @@
+<script src="/js/statistics/assess_situation.js"></script>
+<link rel="stylesheet" type="text/css" href="/css/statistics/assess_situation.css">
+<div class="container-fluid ">
+    <div class="form-div">
+        <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="fsList">
+                    </select>
+                </div>
+            
+                <div class="col-sm-3">
+                    <input type="text" id="start-time" class="form-control form-date" placeholder="开始日期">
+                </div>
+                <div class="col-sm-4">
+                    <input type="text" id="end-time" class="form-control form-date" placeholder="结束日期">
+                </div>
+                <div class="col-sm-5">
+                    <button class="btn btn-primary " type="button" onclick="querySituationClick()">导出</button>
+                </div>
+            </div>
+        </form>
+    </div>
+    <div class="table-title"><span>温馨服务检查千分考核扣分情况汇总表</span></div>
+
+    <div class="row">
+          <!-- 使用一个div来显示数据表格 -->
+          <div class="datatable" data-checkable="false" data-sortable="false">
+              <div class="table-head" ><table border="1" width="100%" height="90px" align="center">
+                  <thead>
+                  <tr>
+                  <th rowspan="2" width="120px">道管</th><th rowspan="2" width="80px">道管内排名</th><th rowspan="2" width="80px">站名</th>
+                  <th rowspan="2" width="80px">收费值机人数</th><th rowspan="2" width="80px">受检人数</th>
+                  <th rowspan="2" width="80px">受检次数</th><th colspan="6" height="40px">扣分情况</th><th rowspan="2" width="85px">平均得分(千分)</th>
+                  </tr>
+                <tr> 
+                  <th width="80px">满分（人）</th><th width="80px">≤15分（人）</th><th width="80px">≤50分（人）</th>
+                  <th width="80px">>50分（人）</th><th width="80px">总扣分（人）</th><th width="80px">平均每人次扣分（分）</th>
+                  </tr>
+                  </thead>
+                  <tbody class="table-tbody" style="background:white" align="center">
+                      
+                  </tbody>
+                  </table></div>
+                  
+          </div>
+    </div>
+</div>
+<script>
+    $(document).ready(function() {
+        // 仅选择日期
+        $("#start-time").datetimepicker(
+        {
+            language:  "zh-CN",
+            weekStart: 1,
+            todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            startView: 2,
+            minView: 2,
+            forceParse: 0,
+            format: "yyyy-mm-dd"
+        });
+        // 仅选择日期
+        $("#end-time").datetimepicker(
+        {
+            language:  "zh-CN",
+            weekStart: 1,
+            todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            startView: 2,
+            minView: 2,
+            forceParse: 0,
+            format: "yyyy-mm-dd"
+        });
+        setFeSelect("#fsList");
+        initQueryTask();
+    });
+</script>

VisualInspection/view/statistics/assess_type.html

@@ -0,0 +1,92 @@
+<!--<script src="/js/statistics/assess_type.js"></script>-->
+<link rel="stylesheet" type="text/css" href="/css/statistics/assess_situation.css">
+<div class="container-fluid ">
+    <div class="form-div">
+        <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="fsList">
+                    </select>
+                </div>
+                <div class="col-sm-3">
+                    <input type="text" id="start-time" class="form-control form-date" placeholder="开始日期">
+                </div>
+                <div class="col-sm-4">
+                    <input type="text" id="end-time" class="form-control form-date" placeholder="结束日期">
+                </div>
+                <div class="col-sm-5">
+                    <button class="btn btn-primary " type="button">导出</button>
+                </div>
+            </div>
+        </form>
+    </div>
+    <div class="table-title"><span>温馨服务检查情况统计表</span></div>
+
+    <div class="row">
+          <!-- 使用一个div来显示数据表格 -->
+          <div class="datatable" data-checkable="false" data-sortable="false">
+              <div class="table-head" ><table border="1" width="100%" height="90px" align="center">
+                 <thead>
+                        <tr>
+                        <th rowspan="2" width="67px">道管整体排名</th><th rowspan="2" width="67px">单位</th><th rowspan="2" width="67px">管道内收费站排名</th>
+                        <th rowspan="2" width="67px">单位</th><th rowspan="2" width="67px">收费值机岗位人数</th><th rowspan="2" width="67px">被检查人数</th>
+                        <th rowspan="2" width="67px">受检次数</th><th colspan="7" height="40px">存在问题扣分详情</th>
+                        <th rowspan="2" width="75px">受检人平均每人次扣分（千分制）</th><th rowspan="2" width="75px;">管道中心受检人平均每人次扣分（千分制）</th>
+                        </tr>
+                        <tr> 
+                        <th width="67px">环境卫生</th><th width="67px">仪容仪表</th><th width="67px">表情</th>
+                        <th width="67px">收费动作</th><th width="67px">文明用语</th><th width="67px">工作纪律</th><th width="67px">扣分合计</th>
+                        </tr>
+                 </thead>
+                    <tbody class="test">
+                        <tr>
+                            <td>0
+                            </td>
+                            <td>1
+                            </td>
+                            <td>2
+                            </td>
+                            
+                        </tr>
+                    </tbody>
+                  </table></div>
+          </div>
+    </div>
+</div>
+<script>
+    $(".test").append('\<tr>\
+                            \<td>0\</td>\
+                            \<td>1\</td>\
+                            \<td>2\</td>\
+                            \</tr>');
+    $(document).ready(function() {
+        // 仅选择日期
+        $("#start-time").datetimepicker(
+        {
+            language:  "zh-CN",
+            weekStart: 1,
+            todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            startView: 2,
+            minView: 2,
+            forceParse: 0,
+            format: "yyyy-mm-dd"
+        });
+        // 仅选择日期
+        $("#end-time").datetimepicker(
+        {
+            language:  "zh-CN",
+            weekStart: 1,
+            todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            startView: 2,
+            minView: 2,
+            forceParse: 0,
+            format: "yyyy-mm-dd"
+        });
+        setFeSelect("#fsList");
+    });
+</script>

VisualInspection/view/statistics/emp_ranking.html

@@ -0,0 +1,83 @@
+<script src="/js/statistics/assess_ranking.js"></script>
+<link rel="stylesheet" type="text/css" href="/css/statistics/assess_situation.css">
+<div class="container-fluid ">
+    <div class="form-div">
+        <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="fsList">
+                    </select>
+                </div>
+                <div class="col-sm-3">
+                    <input type="text" id="start-time" class="form-control form-date" placeholder="开始日期">
+                </div>
+                <div class="col-sm-4">
+                    <input type="text" id="end-time" class="form-control form-date" placeholder="结束日期">
+                </div>
+                <div class="col-sm-5">
+                    <button class="btn btn-primary " type="button" onclick="queryEmpClick()">导出</button>
+                </div>
+            </div>
+        </form>
+    </div>
+    <div class="table-title"><span>温馨服务考核情况反馈表（所有员工排名）</span></div>
+
+    <div class="row">
+          <!-- 使用一个div来显示数据表格 -->
+          <div class="datatable" data-checkable="false" data-sortable="false">
+              <div class="table-head" >
+                  <table border="1" width="100%" height="90px" align="center">
+                      <thead class="table-thead" align="center">
+                  <tr>
+                  <th rowspan="2" width="67px;">序号</th><th rowspan="2" width="67px">站名</th><th rowspan="2" width="67px">姓名</th>
+                  <th rowspan="2" width="67px">岗位</th><th rowspan="2" width="67px">工号</th><th colspan="7" height="40px">考核扣分</th>
+                  <th rowspan="2" width="67px">受检次数</th><th rowspan="2" width="67px">平均扣分（千分制）</th>
+                  <th rowspan="2" width="75px">服务评价</th><th rowspan="2" width="75px">备注</th>
+                  </tr>
+                  <tr> 
+                  <th width="67px">环境卫生</th><th width="67px">仪容仪表</th><th width="67px">表情</th>
+                  <th width="67px">收费动作</th><th width="67px">文明用语</th><th width="67px">工作纪律</th>
+                  <th width="67px">扣分合计</th>
+                  </tr>
+                      </thead>
+                      <tbody class="table-tbody" style="background:white" align="center">
+
+                      </tbody>
+
+                  </table></div>
+            </div>
+    </div>
+</div>
+<script>
+    $(document).ready(function() {
+        // 仅选择日期
+        $("#start-time").datetimepicker(
+        {
+            language:  "zh-CN",
+            weekStart: 1,
+            todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            startView: 2,
+            minView: 2,
+            forceParse: 0,
+            format: "yyyy-mm-dd"
+        });
+        // 仅选择日期
+        $("#end-time").datetimepicker(
+        {
+            language:  "zh-CN",
+            weekStart: 1,
+            todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            startView: 2,
+            minView: 2,
+            forceParse: 0,
+            format: "yyyy-mm-dd"
+        });
+        setFeSelect("#fsList");
+        initQueryEmp();
+    });
+</script>

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

@@ -38,4 +38,14 @@ public class StatisticsBean {
     private Integer item_id ;
 
     private Integer checked_num;
+    
+    private Integer people_num;
+    
+    private int score_fifteen;
+    
+    private int score_fifty;
+    
+    private int score_over_fifty ;
+    
+    private int all_check_score ;
 }

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

@@ -23,15 +23,27 @@ public class StatisticsController extends BaseController {
 	private StatisticsService statisticsService;
     
     /**
-     * 通过方法id获取考核项
+     * 温馨服务考核情况反馈表（所有员工排名）
      * @return
      * String
      * @exception
      * @since  1.0.0
      */
     @RequestMapping(value = "/employee/order")
-    public String getByRuleId(@RequestBody StatisticsBean obj){
+    public String getEmployeeOrder(@RequestBody StatisticsBean obj){
     	List<StatisticsBo> lists=  statisticsService.getEmployeeCheckedInfo(obj);
     	return super.returnSuccessResult(lists);
     }
+    
+    /**
+     * 温馨服务检查千分考核扣分情况汇总表
+     * @param obj
+     * @return
+     */
+    @RequestMapping(value = "/score/info")
+    public String getScoreInfo(@RequestBody StatisticsBean obj){
+    	List<StatisticsBean> lists=  statisticsService.getFeeStationCheckedScore(obj);
+    	return super.returnSuccessResult(lists);
+    }
+    
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/dao/cluster/DepartmentDao.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 
 import com.xintong.visualinspection.bean.FeeStation;
 import com.xintong.visualinspection.bean.Organ;
+import com.xintong.visualinspection.bean.StatisticsBean;
 
 /**
  * 文件名：UserInfoDao
@@ -20,4 +21,6 @@ public interface DepartmentDao  {
     public void delete(Integer id);
     public List<FeeStation> getAllFS();
     public FeeStation getFsBydeptId(Integer id);
+    
+    public List<StatisticsBean> selectFeeStationGroup(StatisticsBean obj);
 }

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

@@ -16,5 +16,10 @@ public interface StatisticsDao  {
 	public List<StatisticsBean> selectStatistics(StatisticsBean obj);
 	
 	public List<StatisticsBean> selectCheckedTimes(StatisticsBean obj);
+	
+	public List<StatisticsBean> selectFeeStationCheckNum(StatisticsBean obj);
+	
+	public List<StatisticsBean> selectFeeStationCheckedScore(StatisticsBean obj);
    
+	public List<StatisticsBean> selectFeeStationCheckedPersonScoreDetail(StatisticsBean obj);
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/DepartmentMapper.xml

@@ -90,6 +90,10 @@
         id =#{id} or parentid=#{id}
     </delete>
 
-
+	<select id="selectFeeStationGroup" resultType="com.xintong.visualinspection.bean.StatisticsBean"  >
+		SELECT COUNT(1) AS people_num,s.ORGAN_ID AS dept_id, s.name from t_sys_users t 
+			       LEFT JOIN t_br_layer_fee_station s ON t.ORGANID = s.ORGAN_ID
+			WHERE t.POSITIONID =1 AND s.ORGAN_ID IS NOT NULL GROUP BY s.ORGAN_ID 
+	</select>
     
 </mapper>

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

@@ -29,5 +29,35 @@
     	GROUP BY t.checked_person
     </select>
     
+    <select id="selectFeeStationCheckNum" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
+    	SELECT COUNT(DISTINCT( t.checked_person )) AS check_num ,t.checked_dept AS dept_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>
+    	 GROUP BY t.checked_dept
+    </select>
+    
+    <select id="selectFeeStationCheckedScore" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
+    	SELECT sum(t.score) AS score ,t.checked_dept AS dept_id 
+    		FROM check_score 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>
+    		GROUP BY t.checked_dept,t.checked_person
+    </select>
+    
+    <select id="selectFeeStationCheckedPersonScoreDetail" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
+    	SELECT  u.checked_person AS user_id , u.checked_dept AS dept_id ,u.parent_id AS item_id ,sum(u.score) AS score ,s.name  FROM (
+			SELECT t.checked_person , t.checked_dept,ci.parent_id, t.score  FROM check_score t 
+			LEFT JOIN check_item ci ON t.check_item_id = ci.id
+			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>
+			 )
+			u LEFT JOIN check_item s ON u.parent_id = s.id GROUP  BY checked_person,id
+    </select>
     
 </mapper>

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

@@ -23,4 +23,8 @@ public interface StatisticsService {
    
 	public List<StatisticsBo> getEmployeeCheckedInfo(StatisticsBean obj);
 	
+	public List<StatisticsBean> getFeeStationCheckedScore(StatisticsBean obj);
+	
+	public List<StatisticsBean> getFeeStationCheckItemScore(StatisticsBean obj);
+	
 }

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

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 import com.xintong.visualinspection.bean.StatisticsBean;
 import com.xintong.visualinspection.bean.StatisticsBo;
 import com.xintong.visualinspection.bean.User;
+import com.xintong.visualinspection.dao.cluster.DepartmentDao;
 import com.xintong.visualinspection.dao.master.StatisticsDao;
 import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.StatisticsService;
@@ -32,6 +33,9 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
     @Autowired
     private StatisticsDao statisticsDao ;
     
+    @Autowired
+    private DepartmentDao departmentDao ;
+    
 	@Override
 	public List<StatisticsBo> getEmployeeCheckedInfo(StatisticsBean obj) {
 		// 查看是否有部门id
@@ -87,5 +91,46 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 	
 		return lists;
 	}
+
+	@Override
+	public List<StatisticsBean> getFeeStationCheckedScore(StatisticsBean obj) {
+		// 获取收费站信息收费站人数
+		List<StatisticsBean> lists = departmentDao.selectFeeStationGroup(obj);
+		Map<Long,StatisticsBean> mapStationInfos = new HashMap<>();
+		for(StatisticsBean sta:lists){
+			mapStationInfos.put(sta.getDept_id(), sta);
+		}
+		
+		// 检索受检次数
+		List<StatisticsBean> listCheckNum = statisticsDao.selectFeeStationCheckNum(obj);
+		for(StatisticsBean sta:listCheckNum){
+			if(mapStationInfos.containsKey(sta.getDept_id())){
+				mapStationInfos.get(sta.getDept_id()).setChecked_num(sta.getChecked_num());
+			}
+		}
+		
+		List<StatisticsBean> listCheckedScore = statisticsDao.selectFeeStationCheckedScore(obj);
+		for(StatisticsBean sta:listCheckedScore){
+			if(mapStationInfos.containsKey(sta.getDept_id())){
+				StatisticsBean statis = mapStationInfos.get(sta.getDept_id());
+				statis.setAll_check_score( statis.getAll_check_score()+sta.getScore());
+				if(sta.getScore() <= 15){
+					statis.setScore_fifteen(statis.getScore_fifteen()+1);
+				}else if(sta.getScore()<=50){
+					statis.setScore_fifty(statis.getScore_fifty()+1);
+				}else{
+					statis.setScore_over_fifty(statis.getScore_over_fifty()+1);
+				}
+			}
+		}
+		
+		return new ArrayList<>(mapStationInfos.values());
+	}
+
+	@Override
+	public List<StatisticsBean> getFeeStationCheckItemScore(StatisticsBean obj) {
+		// TODO Auto-generated method stub
+		return null;
+	}
     
 }

VisualInspection_server/src/main/resources/application.properties

@@ -2,8 +2,8 @@ server.port=8089
 spring.thymeleaf.cache=false
 context.listener.classes=com.xintong.SystemInit
 
-master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
-#master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
+#master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://192.168.8.236:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
@@ -11,8 +11,8 @@ master.datasource.driver-class-name = com.mysql.jdbc.Driver
 master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.xml
 
 ## \u7528\u6237\u6570\u636e\u6e90\u914d\u7f6e
-cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/yanhai?useUnicode=true&characterEncoding=utf8
-#cluster.datasource.url=jdbc:mysql://git.topm.win:6381/yanhai?useUnicode=true&characterEncoding=utf8
+#cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/yanhai?useUnicode=true&characterEncoding=utf8
+cluster.datasource.url=jdbc:mysql://git.topm.win:6381/yanhai?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root
 cluster.datasource.driver-class-name = com.mysql.jdbc.Driver
@@ -53,10 +53,10 @@ spring.datasource.useGlobalDataSourceStat=true
 # Redis\u6570\u636e\u5e93\u7d22\u5f15\uff08\u9ed8\u8ba4\u4e3a0\uff09
 spring.redis.database=0  
 # Redis\u670d\u52a1\u5668\u5730\u5740
-spring.redis.host=10.112.0.199
-#spring.redis.host=git.topm.win:6380
+#spring.redis.host=10.112.0.199
+spring.redis.host=git.topm.win
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u7aef\u53e3
-spring.redis.port=6379
+spring.redis.port=6380
 #spring.redis.port=6380  
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u5bc6\u7801\uff08\u9ed8\u8ba4\u4e3a\u7a7a\uff09
 spring.redis.password=xintong