修改bug

VisualInspection/js/statistics/assess_ranking.js

@@ -64,8 +64,8 @@ function initQueryEmp() {
     var end_score = $("#end-score").val();
     setJobSelect("#jobSelect");
     //默认初始化时间页面回显
-    $("#start-time").val(start_time);
-    $("#end-time").val(end_time);
+    $("#start-time").val("2017-6-09");//start_time);
+    $("#end-time").val("2017-6-25");//end_time);
     var start_date = start_time + " 23:00:00";
     var end_date = end_time + " 23:00:00";
 
@@ -95,7 +95,7 @@ function getEmployeeInfosClick(url, param, start_score, end_score) {
             var flag = judgeParamFilter(data, i, score, start_score, end_score)
             if (flag) {
 
-                html = "<button id=\"user_" + data[i].user.id + "\" onClick='addTask(" + data[i].user.id + ",\"" + 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>"
+                html = "<button id=\"user_" + data[i].user.id + "\" onClick='addTask(" + data[i].user.id + ",\"" + data[i].user.truename + "\",\"" + 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>"
 
                 strTbody += "<tr><td width='4%;'>" + (count + 1) + "</td><td width='6%;'>" + data[i].user.fee_station_name + "</td>"
                     + "<td width='6%;'>" + data[i].user.truename + "</td><td width='6%;'>" + data[i].user.position_name + "</td>"
@@ -119,7 +119,7 @@ function getEmployeeInfosClick(url, param, start_score, end_score) {
 
 
 
-function addTask(userid, start_date, end_date) {
+function addTask(userid, username, start_date, end_date) {
 
     //获取该人员排班
     var url = "teamClass/getUserClasss"
@@ -137,7 +137,7 @@ function addTask(userid, start_date, end_date) {
 
         var allheight = 600;
         var height = allheight - 150 - 45;
-        var allwidth = 920;
+        var allwidth = 1100;
 
 
         //计算日期
@@ -224,12 +224,12 @@ function addTask(userid, start_date, end_date) {
                         hasmin = true;
                     }
 
-                    var classname = "btn-primary";
+                    var classname = "btn-success";
                     if(hasmin){
-                        classname = "btn-danger disabled";
+                        classname = "disabled";
                     }
                     if(hasin){
-                        classname = "btn-success disabled";
+                        classname = "btn-danger disabled";
                     }
                     if(taskfail){
                         classname = "btn-info disabled";
@@ -281,16 +281,17 @@ function addTask(userid, start_date, end_date) {
                      if(usercounttemp.check_status == 22){
                             taskfail = true;
                         }
-                    var classname = "btn-warning disabled";
+                    var classname = "btn-danger disabled";
+                    var name = (new Date(usercounttemp.start_time)).Format("HH:mm") + "--"+(new Date(usercounttemp.end_time)).Format("HH:mm")+"<span class=\"label label-badge\">删</span>";
                     if(hasin){
                        continue;
                     }
                     if(taskfail){
-                        classname = "gimportant disabled";
+                        classname = "btn-info disabled";
+                        // name+="<span class=\"label label-badge\">无效</span>";
                     }
 
                     
-                    var name = (new Date(usercounttemp.start_time)).Format("HH:mm") + "--"+(new Date(usercounttemp.end_time)).Format("HH:mm")
                     if(usercounttemp.class_type==1){
                          html1+="<div class='row'><button class=\"btn "+classname+" classbtn\"  type=\"button\">"+name+"</button></div>"
                          continue;
@@ -375,12 +376,13 @@ function addTask(userid, start_date, end_date) {
             '</table></div>';
 
 
-        var tips = '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#38B03F"/><div class="col-xs-10">排班已被稽查</div></div>'+
-                   '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#3280FC"/><div class="col-xs-10">排班未被稽查</div></div>'+
-                   '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#F1A325"/><div class="col-xs-10">已稽查但排班被删除</div></div>'+
-                   '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#EA644A"/><div class="col-xs-10">排班未满15分钟</div></div>'+
+        var tips = '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#3280FC"/><div class="col-xs-10">排班已被稽查</div></div>'+
+                //    '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#F1A325"/><div class="col-xs-10">已稽查但排班被删除</div></div>'+
                    '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#03B8CF"/><div class="col-xs-10">排班已稽查但任务无效</div></div>'+
-                   '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#BD7B46"/><div class="col-xs-10">已稽查但任务无效且排班已删除</div></div>';
+                //    '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#BD7B46"/><div class="col-xs-10">已稽查但任务无效且排班已删除</div></div>'+
+                   '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#38B03F"/><div class="col-xs-10">排班可被稽查</div></div>'+
+                   '<div class="row" style="text-align: left;"><div class="spanclass col-xs-2 " style="background:#f2f2f2"/><div class="col-xs-10">排班未满15分钟</div></div>'+
+                   '<div class="row" style="text-align: left;"><span class=\"label label-badge\">删</span> 排班已删除</div>';
 
         
         var selectdiv = '<div class="row" style="text-align: left;"><div class="col-xs-10">已选择的排班：</div></div>'+
@@ -403,7 +405,7 @@ function addTask(userid, start_date, end_date) {
 
         layer.open({
             type: 1,
-            title: "生成稽查任务",
+            title: "生成稽查任务："+username,
             skin: 'layui-layer-rim', //加上边框
             area: [allwidth + 'px', allheight + 'px'], //宽高
             scrollbar: false,
@@ -433,8 +435,6 @@ function creatTask(){
         var classid = ids[0];
         var unregular_id = ids[1];
         var url = task_server_url + "/task/add"
-        console.log("地址1"+task_server_url);
-        console.log("地址2"+url);
         if(unregular_id==null||unregular_id==""){
            url+='?classid='+classid+'&userid='+userid;
         }else{

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

@@ -207,6 +207,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		}
 
 		// 检查人数 和 检查次数
+		obj.setPosition_ids(positionList);
 		List<StatisticsBean> listCheckNum = statisticsDao.selectFeeStationCheckNum(obj);
 		for (StatisticsBean sta : listCheckNum) {
 			if (mapStationInfos.containsKey(sta.getDept_id())) {