收费站申诉统计加链接

VisualInspection/js/statistics/appeal.js

@@ -1,51 +1,74 @@
+var layer1 = null;
+var datatable = null;
 
-$(function(){
+var p_deptid = null;
+var p_name = null;
+var p_status = null
+var pageindex = 1
+$(function() {
 
     setVisit();
     var road_manager;
-	if(roleContains("STATION")){
-        road_manager = getCurrentUser().road_manager_id;     
+    if (roleContains("STATION")) {
+        road_manager = getCurrentUser().road_manager_id;
     }
-    if(roleContains("ROAD_MANAGER")){
-        road_manager = getCurrentUser().organid;     
+    if (roleContains("ROAD_MANAGER")) {
+        road_manager = getCurrentUser().organid;
     }
-	setRoadManagerSelect("#center_manage",road_manager,true);
+    setRoadManagerSelect("#center_manage", road_manager, true);
     // 当前月份初始化
     // $("#sel_month").val(getM()-1);
-    $.jeDate("#sel_month",{
-		isinitVal:true,
-		format: 'YYYY/MM' // 分隔符可以任意定义，该例子表示只显示年月
-	});
+    $.jeDate("#sel_month", {
+        isinitVal: true,
+        format: 'YYYY/MM' // 分隔符可以任意定义，该例子表示只显示年月
+    });
+
+    $("#month_name").html($("#sel_month").val());
+
+    var pdata = $.zui.store.get('store_param_' + current_url);
+    if (pdata != null) {
+        $.zui.store.set('store_param_' + current_url, null);
+
+        $("#sel_month").val(pdata.sel_month);
+        $("#fs_station").val(pdata.fs_station);
+        $("#center_manage").val(pdata.center_manage);
 
-    $("#month_name").html( $("#sel_month").find("option:selected").text());
+        p_deptid = pdata.deptid;
+        p_name = pdata.name;
+        p_status = pdata.status;
+        pageindex = pdata.p_cur;
+
+        getappleTaskList(p_deptid, p_name, p_status)
+
+    }
 
 
-    if(road_manager){
-        getFsStationList(road_manager,function(obj){
+    if (road_manager) {
+        getFsStationList(road_manager, function(obj) {
             $("#fs_station").html(obj);
             var dept;
-            if(roleContains("STATION")){
-                dept = getCurrentUser().organid;     
+            if (roleContains("STATION")) {
+                dept = getCurrentUser().organid;
             }
             $("#fs_station").val(dept);
             // 初始化查询
             getFsWorkInfo();
         });
-    }else{
+    } else {
         // 初始化查询
         getFsWorkInfo();
     }
     // 导管中心选择
-    $("#center_manage").change(function(){
+    $("#center_manage").change(function() {
         var center_manage_id = GV(this);
-        if(center_manage_id == ''){
+        if (center_manage_id == '') {
             $("#fs_station,#fs_employee").html('');
-        }else{
-            getFsStationList(center_manage_id,function(obj){
+        } else {
+            getFsStationList(center_manage_id, function(obj) {
                 $("#fs_station").html(obj);
                 var dept;
-                if(roleContains("STATION")){
-                    dept = getCurrentUser().organid;     
+                if (roleContains("STATION")) {
+                    dept = getCurrentUser().organid;
                 }
                 $("#fs_station").val(dept);
             });
@@ -53,19 +76,19 @@ $(function(){
     })
 
     // 查询
-    $("#searchBtn").click(function(){        
-        $("#month_name").html( $("#sel_month").find("option:selected").text()  )
-        getFsWorkInfo();
-    })
-    // 导出excel
-    $("#exportExcel").click(function(){
+    $("#searchBtn").click(function() {
+            $("#month_name").html($("#sel_month").val())
+            getFsWorkInfo();
+        })
+        // 导出excel
+    $("#exportExcel").click(function() {
         var param = '';
-        if( GV("#fs_station") != '' &&  GV("#fs_station")!=null ){
-            param = "&deptId="+ GV("#fs_station");
-        }else if(GV("#center_manage")!='' ){
+        if (GV("#fs_station") != '' && GV("#fs_station") != null) {
+            param = "&deptId=" + GV("#fs_station");
+        } else if (GV("#center_manage") != '') {
             param = "&centerId=" + GV("#center_manage");
         }
-        window.location.href = getserveraddr() +"/file/appeal/info?month="+GV("#sel_month")+param;
+        window.location.href = getserveraddr() + "/file/appeal/info?month=" + GV("#sel_month") + param;
     })
 
 
@@ -75,51 +98,147 @@ $(function(){
 
 /**
  * 检索出勤明细数据
- * @param {*} param 
+ * @param {*} param
  */
-function getFsWorkInfo(){
- 
+function getFsWorkInfo() {
+
     var param = {
-           "start_time": timeTranslate( GV("#sel_month") ) ,
-            "end_time": (GV("#sel_month")+"/25 23:00:00").replace("/","-").replace("/","-")
+        "start_time": timeTranslate(GV("#sel_month")),
+        "end_time": (GV("#sel_month") + "/25 23:00:00").replace("/", "-").replace("/", "-")
     }
-    
-    if(GV("#fs_station")!=''){
-        param[ 'dept_id' ] = GV("#fs_station");
-    }else if(GV("#center_manage") != ''){
-        param[ 'parent_dept_id' ] = GV("#center_manage");
+
+    if (GV("#fs_station") != '') {
+        param['dept_id'] = GV("#fs_station");
+    } else if (GV("#center_manage") != '') {
+        param['parent_dept_id'] = GV("#center_manage");
     }
 
-    post_common_service("statistics/check/appeal",param,function(data){
-   
+    post_common_service("statistics/check/appeal", param, function(data) {
+
         $(".table-tbody").empty();
-        if(data.length >0){
-            for(var i=0;i< data.length;i++){
-                $(".table-tbody").append( getTableContent(data[i],i+1));
+        if (data.length > 0) {
+            for (var i = 0; i < data.length; i++) {
+                $(".table-tbody").append(getTableContent(data[i], i + 1));
             }
         }
-    },function(error){
-    });
+    }, function(error) {});
 }
 
 /**
  * 拼接表格内容
- * @param {*} obj 
- * @param {*} seq 
+ * @param {*} obj
+ * @param {*} seq
  */
-function getTableContent(obj,seq){
- 
-    var content = "<tr><td>"+seq+"</td> <td >"+obj.fee_station_name+"</td> <td >"+GDV(obj.appeal_num,0)+
-            "</td> <td >"+GDV(obj.appeal_success_num,0)+"</td><td>"+ GDV(obj.appeal_fail_num,0) +"</td> </tr>";
+function getTableContent(obj, seq) {
+
+
+
+    var content = "<tr><td>" + seq + "</td> <td >" + obj.fee_station_name + "</td> <td >" + (GDV(obj.appeal_num, 0) > 0 ? ("<a href='javascript:void(0)' onclick='getappleTaskList(" + obj.dept_id + ",\"" + obj.fee_station_name + "\",0)'>" + GDV(obj.appeal_num, 0) + "</a>") : GDV(obj.appeal_num, 0)) +
+        "</td> <td >" + (GDV(obj.appeal_success_num, 0) > 0 ? ("<a href='javascript:void(0)' onclick='getappleTaskList(" + obj.dept_id + ",\"" + obj.fee_station_name + "\",1)'>" + GDV(obj.appeal_success_num, 0) + "</a>") : GDV(obj.appeal_success_num, 0)) + "</td><td>" + (GDV(obj.appeal_fail_num, 0) > 0 ? ("<a href='javascript:void(0)' onclick='getappleTaskList(" + obj.dept_id + ",\"" + obj.fee_station_name + "\",2)'>" + GDV(obj.appeal_fail_num, 0) + "</a>") : GDV(obj.appeal_fail_num, 0)) + "</td> </tr>";
 
     return content;
 }
-function setVisit(){
-	if(roleContains("STATION")){
-		$("#center_manage").attr("disabled","disabled");
-		$("#fs_station").attr("disabled","disabled");
-	}
-	if(roleContains("ROAD_MANAGER")){
-		$("#center_manage").attr("disabled","disabled");
-	}
+
+function setVisit() {
+    if (roleContains("STATION")) {
+        $("#center_manage").attr("disabled", "disabled");
+        $("#fs_station").attr("disabled", "disabled");
+    }
+    if (roleContains("ROAD_MANAGER")) {
+        $("#center_manage").attr("disabled", "disabled");
+    }
+}
+
+
+//获取任务列表  status 为检索条件 0 为全部 1 为成功 2 为失败
+function getappleTaskList(deptid, name, status) {
+
+    p_deptid = deptid;
+    p_name = name;
+    p_status = status
+
+
+    var title = name + " " + $("#sel_month").val() + "月份" + (status == 0 ? "所有" : status == 1 ? "成功" : "失败") + "申诉任务列表"
+
+
+
+    var cols = [
+        { width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center', field: 'num' },
+        { width: 160, text: '任务名称', type: 'string', flex: true, sort: 'down', field: 'name' },
+        { 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: 160, text: '稽查时间段', type: 'string', flex: true, sort: 'down', field: 'check_period' },
+        { width: 50, height: 60, text: '操作', flex: true, type: 'href_link', colClass: 'text-center', field: '<a href=\"javascript:void(0);\" onclick=\"jumptodetail(\'$field=id$\')\">详情</a>' },
+    ];
+
+    var data = {
+        "deptId": deptid,
+        "start_time": timeTranslate(GV("#sel_month")),
+        "end_time": (GV("#sel_month") + "/25 23:00:00").replace("/", "-").replace("/", "-"),
+        "status": status == 0 ? null : status
+    }
+
+    layer1 = layer.open({
+        area: ['50%', '50%'],
+        type: 1,
+        title: title,
+        closeBtn: 1,
+        shadeClose: true,
+        content: "<div id='tasktable' style='padding:10px'></div>",
+        success: function() {
+            datatable = $('#tasktable').mytable({
+                'cols': cols,
+                'url': "/task/gettasklistbydept",
+                'param': data,
+                'pager': {
+                    'page_size': 10,
+                    'p_cur': pageindex
+                }
+            });
+            pageindex = 1;
+
+            console.log(datatable)
+        }
+
+    });
+
+}
+
+
+
+function jumptodetail(id) {
+    if (layer1 != null) {
+        layer.close(layer1)
+    }
+
+
+    post_common_service("task/getById", { "id": id }, function(data) {
+
+        $.checkTask = data;
+        if (typeof($.checkTask) != "undefined" && typeof($.checkTask.appeal) != "undefined") {
+            $.checkTask.appeal = null;
+        }
+
+        var sel_month = $("#sel_month").val();
+        var fs_station = $("#fs_station").val();
+        var center_manage = $("#center_manage").val();
+
+        var pdata = {
+            "sel_month": sel_month,
+            "fs_station": fs_station,
+            "center_manage": center_manage,
+            "deptid": p_deptid,
+            "name": p_name,
+            "status": p_status,
+            "p_cur": datatable.options.pager.p_cur
+        }
+
+        $.zui.store.set('store_param_' + current_url, pdata);
+
+        url = "/view/mytask/taskDetail.html"
+        changePage(url);
+    }, function(error) {
+
+    });
 }

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

@@ -1,17 +1,13 @@
 package com.xintong.visualinspection.controller;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
+import com.xintong.visualinspection.pojo.TaskListByDeptAppeal;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -301,6 +297,15 @@ public class TaskController extends BaseController {
     	taskService.updateInvalidTaskCount(task);;
     	return super.returnSuccessResult("修改成功！");
     }
+
+    @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);
+
+        if(taskList==null) return super.returnSuccessResult(new PageInfo(new ArrayList()));
+        return super.returnSuccessResult(new PageInfo(taskList));
+    }
     
     /**
      * 查询一个周期用户被考核次数

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

@@ -1,7 +1,9 @@
 package com.xintong.visualinspection.dao.master;
 
 import java.util.List;
+import java.util.Map;
 
+import com.xintong.visualinspection.pojo.TaskListByDeptAppeal;
 import org.apache.ibatis.annotations.Mapper;
 
 import com.xintong.visualinspection.bean.Task;
@@ -32,4 +34,6 @@ public interface TaskDao  {
     public void updateInvalidTaskCount(Task task);
     public List<UserClassCount> getUserCount(Task task);
     public List<Task> getUserCountTask(Task task);
+    public List<Task> getTaskListByDept(TaskListByDeptAppeal taskListByDeptAppeal);
+
 }

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

@@ -59,6 +59,18 @@
         WHERE task_id = #{id}
         order by update_time 
     </select>
+
+    <select id="getTaskListByDept" parameterType="com.xintong.visualinspection.pojo.TaskListByDeptAppeal" resultMap="BaseResultMap" >
+        select * from check_task where id in
+        (select task_id from check_appeal where appeal_dept = #{deptId}
+        <if test="start_time != null">AND appeal_time &gt;= #{start_time}</if>
+        <if test="end_time != null">AND appeal_time &lt;=  #{end_time}</if>
+        <if test="status != null">AND appeal_result = #{status}</if>
+        )
+    </select>
+
+
+
     
     <select id="getList" parameterType="com.xintong.visualinspection.bean.Task" resultMap="BaseResultMap" >
         SELECT t.*,

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

@@ -1,10 +1,12 @@
 package com.xintong.visualinspection.service;
 
 import java.util.List;
+import java.util.Map;
 
 import com.xintong.visualinspection.bean.Task;
 import com.xintong.visualinspection.bean.TaskStatus;
 import com.xintong.visualinspection.bean.UserClassCount;
+import com.xintong.visualinspection.pojo.TaskListByDeptAppeal;
 
 /**
  * 
@@ -33,4 +35,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);
+
 }

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

@@ -1489,6 +1489,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			} else {
 				CheckAppealStatistic reobj = new CheckAppealStatistic();
 				reobj.setFee_station_name(organObj.getOrganname());
+                reobj.setDept_id(organObj.getId());
 				reobj.setAppeal_num(0);
 				reobj.setAppeal_fail_num(0);
 				reobj.setAppeal_other_num(0);

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

@@ -1,8 +1,11 @@
 package com.xintong.visualinspection.service.impl;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
+import com.xintong.visualinspection.pojo.TaskListByDeptAppeal;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -194,4 +197,25 @@ public class TaskServiceImpl extends BaseService implements TaskService {
 		// TODO Auto-generated method stub
 		return taskDao.getUserCount(task);
 	}
+
+    @Override
+    public List<Task> getTaskListByDept(TaskListByDeptAppeal taskListByDeptAppeal){
+	    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()));
+                t.setChecked_dept_name(CacheUtil.getOrgannameFromMap(t.getChecked_dept()));
+                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd hh:mm");
+                SimpleDateFormat df1 = new SimpleDateFormat("hh:mm");
+                String name = df.format(t.getStart_time())+"~"+df1.format(t.getEnd_time());
+
+                t.setCheck_period(name);
+            }
+        }
+
+
+        return list;
+    }
 }