转站人员稽查次数显示

VisualInspection/js/statistics/assess_ranking.js

@@ -195,7 +195,15 @@ function initQueryEmp(parent_dept_id, dept_id) {
 function getEmployeeInfosClick(url, param, start_score, end_score, start_num, end_num) {
     post_common_service(url, param, function(data) {
 
-        // console.log(data)
+
+        var userChangeStations = data["userChangeStations"];
+        var userChangeStationMap = new HashMap();
+        for (var i in userChangeStations) {
+            var s = userChangeStations[i];
+            userChangeStationMap.set(s.userid, s);
+        }
+
+        data = data["lists"];
 
         var strTbody = '';
         var count = 0;
@@ -226,10 +234,26 @@ function getEmployeeInfosClick(url, param, start_score, end_score, start_num, en
                         html += "<button id=\"user_" + data[i].user.id + "\" onClick='addTask(" + data[i].user.id + ",\"" + data[i].user.truename + "\",\"" + data[i].user.fee_station_name + "\",\"" + data[i].checked_num + "\",\"" + param.start_date + "\",\"" + param.end_date + "\")'  class=\"btn\" style='margin-left: 10px;padding: 0px;border: 0;background: none;' type=\"button\"><i class=\"icon icon-plus-sign\"></i></button>"
                     }
                 }
+
+                var userChangeStation = userChangeStationMap.get(data[i].user.id);
+                var ischage = false;
+                var tiptext = "";
+                if (userChangeStation != null) {
+                    ischage = true;
+                    tiptext = userChangeStation.old_dept_name + ":" + userChangeStation.old_dept_check_num + "次," +
+                        userChangeStation.new_dept_name + ":" + userChangeStation.new_dept_check_num + "次";
+                }
+
+
+
+
                 var showNumberHtml = (isshownumber ? (filter(data[i].checked_num, '0') + (data[i].checked_num < 6 ? html : "")) : "-");
-                if (hasRole(ROLE_ADMIN)){
-                    showNumberHtml = filter(data[i].checked_num, '0')+html;
+                if (hasRole(ROLE_ADMIN)) {
+                    showNumberHtml = (ischage ? ("<span style='color:red;' data-toggle='tooltip' data-placement='right' title=" + tiptext + ">" + userChangeStation.old_dept_check_num + "+" + userChangeStation.new_dept_check_num + "</span>") : filter(data[i].checked_num, '0')) + html;
                 }
+
+
+
                 strTbody += "<tr><td width='4%;'>" + (count + 1) + "</td><td width='6%;'>" + data[i].user.fee_station_name + "</td>" +
                     "<td width='6%;'><a href='JavaScript:void(0)' onclick='jumpuser(\"" + data[i].user.id + "\",\"" + data[i].user.organid + "\")'>" + data[i].user.truename + "</a></td><td width='6%;'>" + data[i].user.position_name + "</td>" +
                     "<td width='7%;'>" + data[i].user.workno + "</td><td width='4%;'>" + filter(data[i].company_ranking, '/') + "</td>" +
@@ -245,6 +269,7 @@ function getEmployeeInfosClick(url, param, start_score, end_score, start_num, en
             }
         }
         $(".table-tbody").append(strTbody);
+        $('[data-toggle="tooltip"]').tooltip();
         $("tr:gt(1):odd").css("background", "#EFEFEF");
     }, function(error) {
         return "";

VisualInspection/js/statistics/personal_data_statistics.js

@@ -175,10 +175,23 @@ $(function() {
                     hide = true;
                 }
 
+
+
+
                 var cols = [
                     { width: 50, text: '序号', flex: true, colClass: 'text-center', field: 'num' },
                     { width: 100, text: '时间段', flex: true, colClass: 'text-center', field: 'check_task_time_name' },
                     { width: 80, text: '扣分人', flex: true, colClass: 'text-center', field: 'checked_name' },
+                    {
+                        width: 80,
+                        text: '部门',
+                        flex: true,
+                        colClass: 'text-center',
+                        field: 'dept_id',
+                        func: function(value) {
+                            return getfeeName(value);
+                        }
+                    },
                     { width: 40, text: '扣分数', flex: true, colClass: 'text-center', field: 'score', nullvalue: '0' },
                     { width: 100, text: '考核类型', flex: true, colClass: 'text-center', sort: 'down', field: 'parent_name' },
                     { width: 100, text: '考核项', flex: true, colClass: 'text-center', sort: 'down', field: 'name' },
@@ -204,6 +217,15 @@ $(function() {
 
     }
 
+    function getfeeName(id) {
+        for (var i in feeList) {
+            var fee = feeList[i];
+            if (fee.deptid == id) {
+                return fee.name;
+            }
+        }
+    }
+
 
 
 

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

@@ -0,0 +1,19 @@
+package com.xintong.visualinspection.bean;
+
+import lombok.Data;
+
+/**
+ * 文件名：UserChangeStation
+ * 版本信息：日期：2017/12/8 Copyright 江苏省交通规划设计院 Corporation 2017 版权所有.
+ */
+@Data
+public class UserChangeStation {
+    private Long userid;
+    private Integer old_dept;
+    private Integer new_dept;
+    private String username;
+    private String old_dept_name;
+    private String new_dept_name;
+    private Integer old_dept_check_num;
+    private Integer new_dept_check_num;
+}

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

@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.xintong.visualinspection.bean.*;
 import com.xintong.visualinspection.pojo.UserRankingData;
 import com.xintong.visualinspection.util.CacheUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,13 +12,6 @@ import org.springframework.web.bind.annotation.*;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.xintong.visualinspection.bean.CheckAppealStatistic;
-import com.xintong.visualinspection.bean.CheckmanStatisticsBean;
-import com.xintong.visualinspection.bean.Constant;
-import com.xintong.visualinspection.bean.StatisticsBean;
-import com.xintong.visualinspection.bean.StatisticsBo;
-import com.xintong.visualinspection.bean.StatisticsFsWork;
-import com.xintong.visualinspection.bean.WreckerStatisticsBO;
 import com.xintong.visualinspection.service.StatisticsService;
 import com.xintong.visualinspection.util.CodeUtil;
 
@@ -42,7 +36,11 @@ public class StatisticsController extends BaseController {
     @RequestMapping(value = "/employee/order")
     public String getEmployeeOrder(@RequestBody StatisticsBean obj){
     	List<StatisticsBo> lists=  statisticsService.getEmployeeCheckedInfo(obj);
-    	return super.returnSuccessResult(lists);
+    	List<UserChangeStation> userChangeStations = statisticsService.getUserChangeStation(obj);
+    	Map<String,Object> m = new HashMap<>();
+    	m.put("lists",lists);
+        m.put("userChangeStations",userChangeStations);
+    	return super.returnSuccessResult(m);
     }
 
     @RequestMapping(value = "/employee/order/data")
@@ -191,7 +189,8 @@ public class StatisticsController extends BaseController {
     	List<StatisticsBean> lists=  statisticsService.getYearScoreChange(obj);
     	return super.returnSuccessResult(lists);
     }
-    
+
+
     /**
      * 收费站
      */

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

@@ -81,5 +81,8 @@ public interface StatisticsDao  {
 	public List<WreckerStatisticsBO> selectWreckerStatisticDetail(WreckerStatisticsBO obj);
 	
 	public List<WreckerStatisticsBO> selectWreckerStatistic(WreckerStatisticsBO obj);
-	
+
+
+    public List<UserChangeStation> selectuserchangestation(StatisticsBean obj);
+
 }

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

@@ -6,14 +6,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.xintong.visualinspection.bean.CheckAppealStatistic;
-import com.xintong.visualinspection.bean.CheckmanStatisticsBean;
-import com.xintong.visualinspection.bean.StatisticsBean;
-import com.xintong.visualinspection.bean.StatisticsBeanBO;
-import com.xintong.visualinspection.bean.StatisticsBo;
-import com.xintong.visualinspection.bean.StatisticsFsWork;
-import com.xintong.visualinspection.bean.WreckerGroup;
-import com.xintong.visualinspection.bean.WreckerStatisticsBO;
+import com.xintong.visualinspection.bean.*;
 import com.xintong.visualinspection.pojo.TaskAndScore;
 import com.xintong.visualinspection.pojo.UserRankingData;
 
@@ -31,6 +24,8 @@ import com.xintong.visualinspection.pojo.UserRankingData;
  */
 public interface StatisticsService {
 
+    public List<UserChangeStation> getUserChangeStation(StatisticsBean obj);
+
     public UserRankingData getEmployeeRankingData(StatisticsBean obj);
 
 	public List<StatisticsBo> getEmployeeCheckedInfo(StatisticsBean obj);

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

@@ -63,7 +63,12 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 	@Autowired
 	private CheckOtherDao checkOtherDao;
 
-	@Override
+    @Override
+    public List<UserChangeStation> getUserChangeStation(StatisticsBean obj) {
+        return statisticsDao.selectuserchangestation(obj);
+    }
+
+    @Override
 	public UserRankingData getEmployeeRankingData(StatisticsBean obj) {
 		UserRankingData data = new UserRankingData();
 
@@ -107,6 +112,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 
 	@Override
 	public List<StatisticsBo> getEmployeeCheckedInfo(StatisticsBean obj) {
+
 		// 查看是否有部门id
 		Long organId = obj.getDept_id();
 		// 道管中心 id