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

VisualInspection/js/statistics/assess_situation.js

@@ -127,7 +127,7 @@ function gethtml(data,i){
                 strTbody +="<tr><td rowspan="+rowspan+">"+name+"</td>";
                 strTbody +="<td>"+ranking+"</td><td>"+data.name+"</td><td>"+filter(data.people_num,0)
                         +"</td><td>"+filter(data.checked_people_num,0)+"</td><td>"+filter(data.checked_num,0)
-                        +"</td><td>"+(data.people_num-(data.score_fifteen+data.score_fifty+data.score_over_fifty))
+                        +"</td><td>"+(data.checked_people_num-(data.score_fifteen+data.score_fifty+data.score_over_fifty))
                         +"</td><td>"+data.score_fifteen+"</td><td>"+data.score_fifty+"</td><td>"
                         +data.score_over_fifty+"</td><td>"+data.all_check_score+"</td><td>"
                         +filterByZeroHandle(filterJudge(data.all_check_score,data.checked_num),'0')+"</td><td>"
@@ -137,7 +137,7 @@ function gethtml(data,i){
                 strTbody +="<tr>"
                 strTbody +="<td>"+rank[i]+"</td><td>"+data.name+"</td><td>"+filter(data.people_num,'0')
                         +"</td><td>"+filter(data.checked_people_num,0)+"</td><td>"+filter(data.checked_num,'0')
-                        +"</td><td>"+(data.people_num-(data.score_fifteen+data.score_fifty+data.score_over_fifty))
+                        +"</td><td>"+(data.checked_people_num-(data.score_fifteen+data.score_fifty+data.score_over_fifty))
                         +"</td><td>"+data.score_fifteen+"</td><td>"+data.score_fifty+"</td><td>"
                         +data.score_over_fifty+"</td><td>"+data.all_check_score+"</td><td>"
                         +filterByZeroHandle(filterJudge(data.all_check_score,data.checked_num),'0')+"</td><td>"

VisualInspection/js/statistics/check_workload_statistics.js

@@ -18,20 +18,7 @@ $(function(){
 
 	function initQueryParams() {
 		 // 仅选择日期
-        $(".div-start input").datetimepicker(
-        {
-            language:  "zh-CN",
-            weekStart: 1,
-            todayBtn:  1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            minView: 2,
-            forceParse: 0,
-            format: "yyyy-mm-dd"
-        });
-        // 仅选择日期
-        $(".div-end input").datetimepicker(
+        $(".div-start input,.div-end input").datetimepicker(
         {
             language:  "zh-CN",
             weekStart: 1,

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

@@ -409,7 +409,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		List<StatisticsBean> list = getFeeStationCheckedScore(obj);
 		for (StatisticsBean st : list) {
 			st.setCheck_no_score(
-					st.getPeople_num() - st.getScore_fifteen() - st.getScore_fifty() - st.getScore_over_fifty());
+					st.getChecked_people_num() - st.getScore_fifteen() - st.getScore_fifty() - st.getScore_over_fifty());
 			st.setCheck_score_avg(
 					(st.getChecked_num() != 0) ? st.getAll_check_score() / (st.getChecked_num() + 0.0f) : 0.00f);
 			st.setScore_avg(String.format("%.2f", 1000.0 - st.getCheck_score_avg()));