统计bug修改

VisualInspection/js/statistics/check_workload_statistics.js

@@ -11,11 +11,39 @@ $(function(){
 
     //*************************************数据表格******************************************
 	function initAppealPage(start_date,end_date,user_id) {
+		
 		initQueryParams();
+		initTableRowBtn(); 
 		queryAppeal(start_date,end_date,user_id);
     }
 
 	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(
+        {
+            language:  "zh-CN",
+            weekStart: 1,
+            todayBtn:  1,
+            autoclose: 1,
+            todayHighlight: 1,
+            startView: 2,
+            minView: 2,
+            forceParse: 0,
+            format: "yyyy-mm-dd"
+        });
 		//获取页面参数
 		var page_params = $.zui.store.get("page_params");
 		if(page_params && page_params.status) {
@@ -23,12 +51,29 @@ $(function(){
 		}
 	}
 
+		//初始化表行按钮
+	function initTableRowBtn() {
+		var cols = [
+					{width: 40,height:60, text: '序号', flex: true, colClass: 'text-center',field:'num'},
+                    {width: 40,height:60, text: '稽查人员', flex: true,colClass: 'text-center',field:'checkman_name' },
+                    {width: 100,height:60, text: '任务名称', flex: true,colClass: 'text-center',field:'check_task_name' },
+					{width: 100,height:60, text: '时间段', flex: true,colClass: 'text-center',field:'check_task_time_name' },
+                    {width: 40,height:60, text: '考核人员', flex: true,colClass: 'text-center',field:'checked_name' },
+                    {width: 60,height:60, text: '考核部门', flex: true,colClass: 'text-center',field:'feeStationName' },
+					{width: 40,height:60, text: '扣分数',  flex: true, colClass: 'text-center',field:'score'},
+					{width: 100,height:60, text: '考核项',  flex: true, colClass: 'text-center',field:'name'},
+					{width: 100,height:60, text: '扣分凭证', type: 'imagedd', flex: true, hide:hide,field:'pics'},
+		];
+	}
+
 	function queryAppeal(start_date,end_date,user_id){
+		
 		var data = {
-			"start_date":start_date,
+			    "start_date":start_date,
 				"end_date":end_date,
 				"user_id":user_id,
-				"queryType":1
+				"queryType":1,
+				"check_status": cur_status,
 		}
 		if(hasRole(ROLE_STATION_ADMIN) || hasRole(ROLE_STATION) ||  hasRole(ROLE_JICHA) || roleContains('STATION')) {
 			hide = true;
@@ -36,37 +81,25 @@ $(function(){
 		
 		var cols = [
 					{width: 40,height:60, text: '序号', flex: true, colClass: 'text-center',field:'num'},
-                    {width: 40,height:60, text: '稽查人员', flex: true,colClass: '',field:'checkman_name' },
-                    {width: 100,height:60, text: '任务名称', flex: true,colClass: '',field:'check_task_name' },
-					{width: 100,height:60, text: '时间段', flex: true,colClass: '',field:'check_task_time_name' },
-                    {width: 40,height:60, text: '考核人员', flex: true,colClass: '',field:'checked_name' },
-                    {width: 60,height:60, text: '考核部门', flex: true,colClass: '',field:'feeStationName' },
-					{width: 40,height:60, text: '扣分数',  flex: true, colClass: '',field:'score'},
-					{width: 100,height:60, text: '考核项',  flex: true, colClass: '',sort: 'down',field:'name'},
-					{width: 100,height:60, text: '扣分凭证', type: 'imagedd', flex: true, hide:hide,field:'pics'},
+                    {width: 40,height:60, text: '稽查人员', flex: true,colClass: 'text-center',field:'checkman_name' },
+                    {width: 100,height:60, text: '任务名称', flex: true,colClass: 'text-center',field:'check_task_name' },
+					{width: 100,height:60, text: '时间段', flex: true,colClass: 'text-center',field:'check_task_time_name' },
+                    {width: 40,height:60, text: '考核人员', flex: true,colClass: 'text-center',field:'checked_name' },
+                    {width: 60,height:60, text: '考核部门', flex: true,colClass: 'text-center',field:'feeStationName' },
+					{width: 40,height:60, text: '扣分数',  flex: true, colClass: 'text-center',field:'score'},
+					{width: 100,height:60, text: '考核项',  flex: true, colClass: 'text-center',field:'name'},
+					{width: 100,height:60, text: '扣分凭证', type: 'imagedd', flex: true,field:'pics'},
 		];
 		if(cur_status==12 || cur_status==13){
 			data.check_status_arr = [12,13];
 		}
+		
 		$('.datatable').mytable({'cols':cols,
 								'url':"/statistics/one/checkedItem/detail/info",
 								'param':data}
 								);
 	}
 
-	function queryUnAssignedTable(){
-		var cols = [
-					{width: 40,height:60, text: '序号', type: 'number', flex: true, colClass: 'text-center',field: 'num'},
-					{width: 40,height:60, text: '稽查人员', type: 'string', flex: true, sort: 'down',field: 'checkman_name'},
-                    {width: 100,height:60, text: '任务名称', type: 'string', flex: true, sort: 'down',field: 'check_task_name'},
-                    {width: 100,height:60, text: '时间段', type: 'string', flex: true, sort: 'down',field: 'check_task_time_name'},
-                    {width: 40,height:60, text: '考核人员', type: 'string', flex: true, sort: 'down',field: 'checked_name'},
-                    {width: 60,height:60, text: '考核部门', type: 'string', flex: true, sort: 'down',field: 'feeStationName'},
-					{width: 40,height:60, text: '扣分数', type: 'string', flex: true, field: 'score'},
-					{width: 100,height:60, text: '考核项', type: 'string', flex: true, sort: 'down',field: 'name'},
-					{width: 100,height:60, text: '扣分凭证', type: 'imagedd', flex: true, field: 'pics'},
-		] ;
-	}
 
 
     $(".query button").click(function(){

VisualInspection/js/statistics/personal_data_statistics.js

@@ -48,9 +48,9 @@ $(function(){
 		
 		var cols = [
 					{width: 50, text: '序号', flex: true, colClass: 'text-center',field:'num'},
-					{width: 100, text: '时间段', flex: true,colClass: '',field:'check_task_time_name' },
-					{width: 60, text: '扣分数',  flex: true, colClass: '',field:'score'},
-					{width: 100, text: '考核项',  flex: true, colClass: '',sort: 'down',field:'name'},
+					{width: 100, text: '时间段', flex: true,colClass: 'text-center',field:'check_task_time_name' },
+					{width: 60, text: '扣分数',  flex: true, colClass: 'text-center',field:'score'},
+					{width: 100, text: '考核项',  flex: true, colClass: 'text-center',sort: 'down',field:'name'},
 					{width: 100, text: '扣分凭证', type: 'imagedd', flex: true, hide:hide,field:'pics'},
 		];
 		if(cur_status==12 || cur_status==13){
@@ -62,15 +62,7 @@ $(function(){
 								);
 	}
 
-	function queryUnAssignedTable(){
-			var cols = [
-					{width: 50, text: '序号', type: 'number', flex: true, colClass: 'text-center',field: 'num'},
-					{width: 100, text: '时间段', type: 'string', flex: true, sort: 'down',field: 'check_task_time_name'},
-					{width: 60, text: '扣分数', type: 'string', flex: true, field: 'score'},
-					{width: 100, text: '考核项', type: 'string', flex: true, sort: 'down',field: 'name'},
-					{width: 100, text: '扣分凭证', type: 'imagedd', flex: true, field: 'pics'},
-						] ;
-	}
+
 
     
 
@@ -113,7 +105,7 @@ $(function(){
 		var param = {
 			"start_date":year+"-01-01 00:00:00",
 			"end_date":(year+1)+"-01-01 00:00:00",
-			"dept_id":user_id
+			"user_id":user_id
 		}
 		initRqueset(url,param,1);
 	}
@@ -128,7 +120,7 @@ $(function(){
 		var param = {
 			"start_date":start_date,
 			"end_date":end_date,
-			"dept_id":user_id,
+			"user_id":user_id,
 		}
 		initRqueset(url,param,2);
 	}

VisualInspection/view/statistics/check_workload_statistics.html

@@ -32,32 +32,7 @@
 <script>
     $(document).ready(function() {
 
-        // 仅选择日期
-        $(".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(
-        {
-            language:  "zh-CN",
-            weekStart: 1,
-            todayBtn:  1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            minView: 2,
-            forceParse: 0,
-            format: "yyyy-mm-dd"
-        });
+       
     });
 </script>
 

VisualInspection/view/statistics/personal_data_statistics.html

@@ -14,7 +14,6 @@
             <div class="div-start"><input placeholder="请选择考核开始时间"></input></div>
             <div class="div-to"><label>-</label></div>
             <div class="div-end"><input placeholder="请选择考核结束时间"></input></div>
-            <div class="div-check"><select><option>请选择温馨服务检查类别</option></select></div>
             <div class="query div-button"><button>查询</button></div>
             <div class="export div-button"><button>导出</button></div>
         </div>

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

@@ -166,7 +166,8 @@ public class StatisticsController extends BaseController {
      */
     @RequestMapping(value = "/one/checkedItem/detail/info/{page}/{size}")
     public String getFsOnePersonCheckedItemDetailInfo(@RequestBody StatisticsBean obj,@PathVariable Integer page,@PathVariable Integer size){
-    	PageHelper.offsetPage(page, size);
+    	//PageHelper.offsetPage(page, size);
+    	PageHelper.startPage(page, size);
     	List<StatisticsBean> returnList=  statisticsService.getOneCheckedDetailInfo(obj);
     	return super.returnSuccessResult(new PageInfo(returnList));
     }