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

VisualInspection/js/statistics/assess_situation.js

@@ -134,7 +134,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>"
@@ -144,7 +144,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/js/statistics/personal_data_statistics.js

@@ -102,8 +102,8 @@ $(function(){
 	 */
 	function init_personal_score_statistics(url,user_id){
 		var param = {
-			"start_date":year+"-01-01 00:00:00",
-			"end_date":(year+1)+"-01-01 00:00:00",
+			"start_date":(year-1)+"-12-25 23:00:00",
+			"end_date":year+"-12-25 23:00:00",
 			"user_id":user_id
 		}
 		initRqueset(url,param,1);

VisualInspection/js/statistics/road_manage_statistics.js

@@ -63,8 +63,8 @@ $(function(){
 	 */
 	function init_company_year_assess(url,select_road){
 		var param = {
-			"start_date":year+"-01-01 00:00:00",
-			"end_date":(year+1)+"-01-01 00:00:00",
+			"start_date":(year-1)+"-12-25 23:00:00",
+			"end_date":year+"-12-25 23:00:00",
 			"dept_id":select_road,
 			"queryType":1
 		}

VisualInspection/js/statistics/toll_station_statistics.js

@@ -63,8 +63,8 @@ $(function(){
 	 */
 	function init_tollStation_year_assess(url,select_station){
 		var param = {
-			"start_date":year+"-01-01 00:00:00",
-			"end_date":(year+1)+"-01-01 00:00:00",
+			"start_date":(year-1)+"-12-25 23:00:00",
+			"end_date":year+"-12-25 23:00:00",
 			"dept_id":select_station,
 			"queryType":2
 		}

VisualInspection/js/statistics/total_company_statistics.js

@@ -52,8 +52,8 @@ $(function(){
 	 */
 	function init_company_year_assess(){
 		var param = {
-			"start_date":year+"-01-01 00:00:00",
-			"end_date":(year+1)+"-01-01 00:00:00"
+			"start_date":(year-1)+"-12-25 23:00:00",
+			"end_date":year+"-12-25 23:00:00"
 		}
 		initRqueset("statistics/score/year/info",param,1);
 

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

@@ -142,4 +142,23 @@ public class StatisticsBean {
 		}
     }
     
+    // 比较大小 1 小 ， -1 大 
+    // 方法2
+    public int compare2To(StatisticsBean o2){
+    	double a = 1000.0 ,b=1000.0 ;
+		if(this.getChecked_num()!=0 ){
+			a = this.getAll_check_score() / (this.getChecked_num()+0.00);
+		}
+		if(o2.getChecked_num()!=0){
+			b = o2.getAll_check_score()/(o2.getChecked_num()+0.00);
+		}
+		if (a > b ) {
+			return 1;
+		} else if (a < b) {
+			return -1;
+		} else {
+			return 0;
+		}	
+    }
+    
 }

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

@@ -4,7 +4,7 @@
     
     <select id="selectStatistics" 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, ci.score  FROM check_score t 
+			SELECT t.checked_person , t.checked_dept,ci.parent_id, t.check_item_score AS score FROM check_score t 
 			LEFT JOIN check_item ci ON t.check_item_id = ci.id 
 			LEFT JOIN check_task ct ON ct.id = t.task_id
 			WHERE 1=1 and ct.check_status!=22
@@ -48,7 +48,7 @@
     </select>
     
     <select id="selectFeeStationCheckedScore" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
-    	SELECT sum(c.score) AS score ,t.checked_dept AS dept_id 
+    	SELECT sum(t.check_item_score) AS score ,t.checked_dept AS dept_id 
     		FROM check_score t 
     		LEFT JOIN check_item c ON t.check_item_id = c.id
     		LEFT JOIN check_task ct ON ct.id = t.task_id
@@ -61,11 +61,11 @@
     
     <select id="selectFeeStationCheckedPersonScoreDetail" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
     	    SELECT  u.checked_dept AS dept_id ,u.parent_id AS item_id ,sum(u.score) AS score ,s.name,s.id  FROM (
-			SELECT  t.checked_dept,ci.parent_id, ci.score  FROM check_score t 
+			SELECT  t.checked_dept,ci.parent_id, t.check_item_score AS score  FROM check_score t 
 			LEFT JOIN check_item ci ON t.check_item_id = ci.id
 			LEFT JOIN check_task ct ON ct.id = t.task_id
 			LEFT JOIN t_sys_users uu on t.checked_person = uu.id
-			WHERE 1=1  and ct.check_status!=22 and ci.score is not null
+			WHERE 1=1  AND ct.check_status!=22 AND t.check_item_score is not null
 			<if test="start_date!=null and end_date != null">
 		        AND	 ct.start_time &gt;= #{start_date} AND ct.end_time &lt; #{end_date}
 			</if>

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()));
@@ -877,25 +877,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		lists.sort(new Comparator<StatisticsBean>() {
 			@Override
 			public int compare(StatisticsBean o1, StatisticsBean o2) {
-				if(o1.getChecked_num()!=0 && o2.getChecked_num()!=0){
-					double a = o1.getAll_check_score() / (o1.getChecked_num()+0.00);
-					double b = o2.getAll_check_score() /(o2.getChecked_num()+0.00);
-					if (a > b ) {
-						return 1;
-					} else if (a < b) {
-						return -1;
-					} else {
-						return 0;
-					}	
-				}else{
-					if(o1.getChecked_num() == 0){
-						return -1 ;
-					}else if(o2.getChecked_num() ==0){
-						return 1;
-					}else{
-						return 0;
-					}
-				}
+				return o2.compare2To(o1);
 			}
 		});