bug:统计图修改

VisualInspection/js/statistics/appeal.js

@@ -162,15 +162,18 @@ function getappleTaskList(deptid, name, status) {
 
 
     var title = name + " " + $("#sel_month").val() + "月份" + (status == 0 ? "所有" : status == 1 ? "成功" : "失败") + "申诉任务列表"
+    var isshownumber = false;
 
-
+    if (hasRole(ROLE_JICHA_ADMIN) || hasRole(ROLE_ADMIN)) {
+        isshownumber = true;
+    }
 
     var cols = [
         { width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center', field: 'num' },
         { width: 160, text: '任务名称', type: 'href_link', flex: true, sort: 'down', field: '<a href=\"javascript:void(0);\" onclick=\"jumptodetail(\'$field=id$\')\">$field=name$</a>' },
         { width: 80, text: '考核人员', type: 'string', flex: true, colClass: '', field: 'checked_person_name' },
         { width: 160, text: '考核部门', type: 'string', flex: true, sort: 'down', field: 'checked_dept_name' },
-        { width: 80, text: '稽查人员', type: 'string', flex: true, hide: false, colClass: '', field: 'checkman_name' },
+        { width: 80, text: '稽查人员', type: 'href_link', flex: true, hide: false, colClass: '', field: isshownumber ? '$field=checkman_name$' : '-' },
         { width: 160, text: '稽查时间段', type: 'string', flex: true, sort: 'down', field: 'check_period' }
     ];
 

VisualInspection/js/statistics/road_manage_statistics.js

@@ -1,5 +1,6 @@
 var year = new Date().getFullYear();
 var month = new Date().getMonth();
+var x_m_array = new Array();
 var date = new Date().getDate();
 var year_assess;
 var score_rank;
@@ -85,13 +86,12 @@ $(function() {
         echart(flag);
         var select_month = $("#month_date").val();
         var select_road = $(".div-roadManage select").val();
-        console.log(select_road);
-        if (flag == true) {
-            init_company_year_assess("statistics/score/year/info", select_road);
-        }
+
+        init_company_year_assess("statistics/score/year/info", select_road, select_month.split('/')[0], select_month.split('/')[1]);
+
         // 查询图二
         // init_company_points_assess("statistics/lost/score/rate",select_month+'',select_road);
-        init_company_points_assess("statistics/score/info", select_month.split('/')[1] + '');
+        init_company_points_assess("statistics/score/info", select_month.split('/')[0], select_month.split('/')[1]);
         // 查询图三
         init_stationAll_rank("statistics/score/manage/tollgate/info", select_month + '', select_road);
         // 查询图四
@@ -107,10 +107,21 @@ $(function() {
     /**
      * 初始化图一
      */
-    function init_company_year_assess(url, select_road) {
+    function init_company_year_assess(url, select_road, y, m) {
+        x_m_array = new Array();
+        for (var i = 1; i <= 12; i++) {
+            var month = parseInt(m) + i;
+            var starty = parseInt(y) - 1
+            if (month > 12) {
+                month = month - 12;
+                starty = y;
+            }
+            x_m_array.push(starty + "/" + (month >= 10 ? month : ("0" + month)));
+        }
+
         var param = {
-            "start_date": (year - 1) + "-" + new Date().getMonth() + "-25" + " 23:00:00",
-            "end_date": year + "-" + (new Date().getMonth() + 1) + "-25" + " 23:00:00",
+            "start_date": (parseInt(y) - 1) + "-" + m + "-25" + " 23:00:00",
+            "end_date": y + "-" + m + "-25" + " 23:00:00",
             "dept_id": select_road,
             "queryType": 1
         }
@@ -120,15 +131,16 @@ $(function() {
     /**
      * 初始化图二
      */
-    function init_company_points_assess(url, mon, select_road) {
-        // var param = {
-        // 	"mth":mon,
-        // 	"dept_id":select_road,
-        // 	"queryType":1
-        // }
-        // initRqueset(url,param,2);
+    function init_company_points_assess(url, y, mon, select_road) {
+        var starty = y;
+        var startm = parseInt(mon) - 1;
+
+        if (startm <= 0) {
+            startm = 12;
+            starty = parseInt(y) - 1;
+        }
         var param = {
-            "start_date": year + '-' + (mon - 1) + '-25 23:00:00',
+            "start_date": starty + '-' + (startm >= 10 ? startm : ("0" + startm)) + '-25 23:00:00',
             "end_date": year + '-' + mon + '-25 23:00:00'
         }
         initRqueset(url, param, 2);
@@ -284,22 +296,27 @@ $(function() {
         if (type == 1) {
             array_year_score.length = 0;
             if (data != null && data.length != 0) {
-                if (data.length < 14) {
-                    for (var i = 0; i < 14 - data.length; i++) {
-                        // 不足月份补0
-                        array_year_score.push(0);
+
+
+                for (var i = 0; i < x_m_array.length; i++) {
+
+                    var index = -1;
+                    for (var j = 0; j < data.length; j++) {
+                        if (x_m_array[i] == data[j].mth) {
+                            index = j;
+                            break;
+                        }
                     }
-                }
-                for (var i = 0; i < data.length; i++) {
-                    if (months.indexOf(data[i].mth.substr(2))) {
-                        // 指定位置插入值
-                        array_year_score.splice(months.indexOf(data[i].mth.substr(2)), 0,
-                            (1000 - (filter_handler(data[i].all_check_score, data[i].checked_num, 1.0, 0))));
+                    if (index < 0) array_year_score.push(0);
+                    else {
+                        array_year_score.push(
+                            (1000 - (filter_handler(data[index].all_check_score, data[index].checked_num, 1.0, 0))));
                     }
                 }
+
             } else {
                 array_year_score.length = 0;
-                months.length = 0;
+                x_m_array.length = 0;
             }
             if (eval("Math.min(" + array_year_score.toString() + ")") == 0)
                 min_year = 0;
@@ -688,7 +705,7 @@ $(function() {
             xAxis: [{
                 type: 'category',
                 boundaryGap: false,
-                data: months
+                data: x_m_array
             }],
             yAxis: [{
                 type: 'value',

VisualInspection/js/statistics/toll_station_statistics.js

@@ -1,5 +1,6 @@
      	var year = new Date().getFullYear();
      	var month = new Date().getMonth();
+     	var x_m_array = new Array();
      	var date = new Date().getDate();
      	var select_road = $(".div-roadManage select").val();
      	var select_station = $("#second").val();
@@ -70,9 +71,9 @@
      	        echart(flag);
      	        echart_change();
      	        echart_change2();
-     	        if (flag == true) {
-     	            init_tollStation_year_assess("statistics/score/year/info", select_station);
-     	        }
+
+     	        init_tollStation_year_assess("statistics/score/year/info", select_station, select_month.split('/')[0], select_month.split('/')[1]);
+
      	        // flag = false;
 
      	        top5_change(select_month, select_station);
@@ -89,10 +90,21 @@
      	    /**
      	     * 初始化图一
      	     */
-     	    function init_tollStation_year_assess(url, select_station) {
+     	    function init_tollStation_year_assess(url, select_station, y, m) {
+     	        x_m_array = new Array();
+     	        for (var i = 1; i <= 12; i++) {
+     	            var month = parseInt(m) + i;
+     	            var starty = parseInt(y) - 1
+     	            if (month > 12) {
+     	                month = month - 12;
+     	                starty = y;
+     	            }
+     	            x_m_array.push(starty + "/" + (month >= 10 ? month : ("0" + month)));
+     	        }
+
      	        var param = {
-     	                "start_date": (year - 1) + "-" + new Date().getMonth() + "-25" + " 23:00:00",
-     	                "end_date": year + "-" + (new Date().getMonth() + 1) + "-25" + " 23:00:00",
+     	                "start_date": (parseInt(y) - 1) + "-" + m + "-25" + " 23:00:00",
+     	                "end_date": y + "-" + m + "-25" + " 23:00:00",
      	                "dept_id": select_station,
      	                "queryType": 2
      	            }
@@ -258,22 +270,25 @@
      	        if (type == 1) {
      	            array_year_score.length = 0;
      	            if (data != '' && 　data.length != 0) {
-     	                if (data.length < 14) {
-     	                    for (var i = 0; i < 14 - data.length; i++) {
-     	                        // 不足月份补0
-     	                        array_year_score.push(0);
+
+     	                for (var i = 0; i < x_m_array.length; i++) {
+
+     	                    var index = -1;
+     	                    for (var j = 0; j < data.length; j++) {
+     	                        if (x_m_array[i] == data[j].mth) {
+     	                            index = j;
+     	                            break;
+     	                        }
      	                    }
-     	                }
-     	                for (var i = 0; i < data.length; i++) {
-     	                    if (months.indexOf(data[i].mth.substr(2))) {
-     	                        // 指定位置插入值
-     	                        array_year_score.splice(months.indexOf(data[i].mth.substr(2)), 0,
-     	                            (1000 - (filter_handler(data[i].all_check_score, data[i].checked_num * 1.00, 1.00, 0))));
+     	                    if (index < 0) array_year_score.push(0);
+     	                    else {
+     	                        array_year_score.push(
+     	                            (1000 - (filter_handler(data[index].all_check_score, data[index].checked_num * 1.00, 1.0, 0))));
      	                    }
      	                }
      	            } else {
      	                array_year_score.length = 0;
-     	                months.length = 0;
+     	                x_m_array.length = 0;
      	            }
      	            if (eval("Math.min(" + array_year_score.toString() + ")") == 0)
      	                min_year = 0;
@@ -667,7 +682,7 @@
      	            xAxis: [{
      	                type: 'category',
      	                boundaryGap: false,
-     	                data: months
+     	                data: x_m_array
      	            }],
      	            yAxis: [{
      	                type: 'value',

VisualInspection/js/statistics/total_company_statistics.js

@@ -1,4 +1,5 @@
 var year = new Date().getFullYear();
+var x_m_array = new Array();
 var date = new Date().getDate();
 var array_year_score = new Array();
 var array_points = new Array();
@@ -59,10 +60,10 @@ $(function() {
         echart(flag);
         var select_month = $("#month_date").val();
         // console.log(select_month);
-        if (flag) init_company_year_assess();
+        init_company_year_assess(select_month.split('/')[0], select_month.split('/')[1]);
         // 查询图二
         //	init_company_points_assess("statistics/lost/score/rate",select_month+'');
-        init_company_points_assess("statistics/score/info", select_month.split('/')[1] + '');
+        init_company_points_assess("statistics/score/info", select_month.split('/')[0], select_month.split('/')[1]);
         // 查询图三
         init_road_manager_score_rank_three("statistics/score/center/manage/info", select_month + '');
         // 查询图四
@@ -75,11 +76,25 @@ $(function() {
     /**
      * 初始化图一
      */
-    function init_company_year_assess() {
+    function init_company_year_assess(y, m) {
+
+        x_m_array = new Array();
+        for (var i = 1; i <= 12; i++) {
+            var month = parseInt(m) + i;
+            var starty = parseInt(y) - 1
+            if (month > 12) {
+                month = month - 12;
+                starty = y;
+            }
+            x_m_array.push(starty + "/" + (month >= 10 ? month : ("0" + month)));
+        }
+
         var param = {
-            "start_date": (year - 1) + "-" + new Date().getMonth() + "-25" + " 23:00:00",
-            "end_date": year + "-" + (new Date().getMonth() + 1) + "-25" + " 23:00:00"
+            "start_date": (parseInt(y) - 1) + "-" + m + "-25" + " 23:00:00",
+            "end_date": y + "-" + (m) + "-25" + " 23:00:00"
         }
+
+
         initRqueset("statistics/score/year/info", param, 1);
 
     }
@@ -87,10 +102,17 @@ $(function() {
     /**
      * 初始化图二
      */
-    function init_company_points_assess(url, mon) {
+    function init_company_points_assess(url, y, mon) {
+        var starty = y;
+        var startm = parseInt(mon) - 1;
+
+        if (startm <= 0) {
+            startm = 12;
+            starty = parseInt(y) - 1;
+        }
         var param = {
-            "start_date": year + '-' + (mon - 1) + '-25 23:00:00',
-            "end_date": year + '-' + mon + '-25 23:00:00'
+            "start_date": starty + '-' + (startm >= 10 ? startm : ("0" + startm)) + '-25 23:00:00',
+            "end_date": y + '-' + mon + '-25 23:00:00'
         }
         initRqueset(url, param, 2);
     }
@@ -244,25 +266,31 @@ $(function() {
      */
     function data_array(data, type) {
         if (type == 1) {
+
             array_year_score.length = 0;
             if (data != '' && data.length != 0) {
-                if (data.length < 14) {
-                    for (var i = 0; i < 14 - data.length; i++) {
-                        // 不足月份补0
-                        array_year_score.push(0);
+
+                for (var i = 0; i < x_m_array.length; i++) {
+
+                    var index = -1;
+                    for (var j = 0; j < data.length; j++) {
+                        if (x_m_array[i] == data[j].mth) {
+                            index = j;
+                            break;
+                        }
                     }
-                }
-                for (var i = 0; i < data.length; i++) {
-                    if (months.indexOf(data[i].mth.substr(2))) {
-                        // 指定位置插入值
-                        array_year_score.splice(months.indexOf(data[i].mth.substr(2)), 0,
-                            (1000 - (filter_handler(data[i].all_check_score, data[i].checked_num, 1.0, 0))));
+                    if (index < 0) array_year_score.push(0);
+                    else {
+                        array_year_score.push(
+                            (1000 - (filter_handler(data[index].all_check_score, data[index].checked_num, 1.0, 0))));
                     }
                 }
             } else {
                 array_year_score.length = 0;
-                months.length = 0;
+                x_m_array.length = 0;
             }
+
+
             if (eval("Math.min(" + array_year_score.toString() + ")") == 0)
                 min_year = 0;
             else
@@ -614,7 +642,7 @@ $(function() {
             xAxis: [{
                 type: 'category',
                 boundaryGap: false,
-                data: months
+                data: x_m_array
             }],
             yAxis: [{
                 type: 'value',

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

@@ -301,7 +301,8 @@ public class TaskController extends BaseController {
     @RequestMapping(value = "/gettasklistbydept/{page}/{size}")
     public String getTaskListByDept(HttpServletRequest request, @PathVariable Integer page,@PathVariable Integer size,@RequestBody TaskListByDeptAppeal task){
         PageHelper.startPage(page, size);
-        List<Task> taskList = taskService.getTaskListByDept(task);
+        User user = getCurrentUser(request);
+        List<Task> taskList = taskService.getTaskListByDept(task,user);
 
         if(taskList==null) return super.returnSuccessResult(new PageInfo(new ArrayList()));
         return super.returnSuccessResult(new PageInfo(taskList));

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

@@ -5,6 +5,7 @@ import java.util.Map;
 
 import com.xintong.visualinspection.bean.Task;
 import com.xintong.visualinspection.bean.TaskStatus;
+import com.xintong.visualinspection.bean.User;
 import com.xintong.visualinspection.bean.UserClassCount;
 import com.xintong.visualinspection.pojo.TaskListByDeptAppeal;
 
@@ -35,6 +36,6 @@ public interface TaskService {
     public void deleteInvalidTaskCount(Long task_id);
     public void updateInvalidTaskCount(Task task);
     public List<UserClassCount> getUserCount(Task task);
-    public List<Task> getTaskListByDept(TaskListByDeptAppeal taskListByDeptAppeal);
+    public List<Task> getTaskListByDept(TaskListByDeptAppeal taskListByDeptAppeal,User user);
 
 }

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

@@ -5,17 +5,15 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import com.xintong.visualinspection.bean.*;
 import com.xintong.visualinspection.pojo.TaskListByDeptAppeal;
+import com.xintong.visualinspection.util.AuthorUtil;
+import com.xintong.visualinspection.util.Constants;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.mysql.jdbc.StringUtils;
-import com.xintong.visualinspection.bean.Constant;
-import com.xintong.visualinspection.bean.Log;
-import com.xintong.visualinspection.bean.Task;
-import com.xintong.visualinspection.bean.TaskStatus;
-import com.xintong.visualinspection.bean.UserClassCount;
 import com.xintong.visualinspection.dao.master.LogDao;
 import com.xintong.visualinspection.dao.master.TaskDao;
 import com.xintong.visualinspection.service.BaseService;
@@ -202,13 +200,20 @@ public class TaskServiceImpl extends BaseService implements TaskService {
 	}
 
     @Override
-    public List<Task> getTaskListByDept(TaskListByDeptAppeal taskListByDeptAppeal){
+    public List<Task> getTaskListByDept(TaskListByDeptAppeal taskListByDeptAppeal,User user){
 	    List<Task> list = taskDao.getTaskListByDept(taskListByDeptAppeal);
 	    if(list!=null && list.size()>0){
             for (Task t:list
                  ) {
                 t.setChecked_person_name(CacheUtil.getUserTurenameFromMap(t.getChecked_person()));
-                t.setCheckman_name(CacheUtil.getUserTurenameFromMap(t.getCheckman()));
+                if(AuthorUtil.hasRole(user, Constants.ROLE_JICHA_ADMIN)
+                        ||AuthorUtil.hasRole(user, Constants.ROLE_JICHA)||AuthorUtil.hasRole(user, Constants.ROLE_MANAGER)
+                        ){
+                    t.setCheckman_name(CacheUtil.getUserTurenameFromMap(t.getCheckman()));
+                }else{
+                    t.setCheckman_name("-");
+                }
+
                 t.setChecked_dept_name(CacheUtil.getOrgannameFromMap(t.getChecked_dept()));
                 SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd hh:mm");
                 SimpleDateFormat df1 = new SimpleDateFormat("hh:mm");