统计

VisualInspection/css/statistics/atendance_style.css

@@ -11,12 +11,20 @@
 .table-head th{
     border: 1px solid #d9d9d9;
     text-align: center;
+    height: 30px;
+    background:#ebf3fd;
 }
 
 .table-tbody td{
     border: 1px solid #d9d9d9;
+    height: 38px;
 }
 
 td.b-grey{
     background:grey;
-}
+}
+
+.table-tbody tr:nth-child(2n){
+    background: #efefef;
+}
+

VisualInspection/js/statistics/check_workload_statistics.js

@@ -1,8 +1,8 @@
 // 默认初始化日期一个月
 $(".div-start input").val(new Date().getFullYear()+"-"+new Date().getMonth()+"-"+new Date().getDate());
 $(".div-end input").val(new Date().getFullYear()+"-"+(new Date().getMonth()+1)+"-"+new Date().getDate());
-var start_date = $(".div-start input").val()+" 00:00:00";
-var end_date = $(".div-end input").val()+" 23:59:59";
+var start_date = $(".div-start input").val()+" 23:00:00";
+var end_date = $(".div-end input").val()+" 23:00:00";
 var user_id = $("#select-personal").val();      
 var cur_status;
 var hide = false;
@@ -84,11 +84,22 @@ $(function(){
 								);
 	}
 
+	// 导出excel
+	$("#export-check-info").click(function(){
+		var param = '';
+		var start_date = $(".div-start input").val()+" 23:00:00";
+		var end_date = $(".div-end input").val()+" 23:00:00";
+		if( $("#select-personal").val()!=''){
+			param += "&user_id=" + $("#select-personal").val() ;
+		}
+		
+		window.open( getserveraddr() +"/file/check/info?queryType=1&start_date="+ start_date +'&end_date='+end_date+param  );
+	})
 
 
     $(".query button").click(function(){
-		var start_date = $(".div-start input").val()+" 00:00:00";
-		var end_date = $(".div-end input").val()+" 23:59:59";
+		var start_date = $(".div-start input").val()+" 23:00:00";
+		var end_date = $(".div-end input").val()+" 23:00:00";
 		var startStr = start_date.replace(/-/g, '/');
 		var endStr = end_date.replace(/-/g, '/');
 		var start = new Date(startStr);
@@ -107,10 +118,10 @@ $(function(){
      * 稽查人员下拉框
      */
     function select_personal(){
-        var tempStr = '';
         var sec = document.getElementById('select-personal');
         post_common_service( "user/getAllCheckman",{},function(data){
             if(data.length!=0){
+        		var tempStr = '<option value="">全部</option>';
                 for(var i=0;i<data.length;i++){
                     tempStr += "<option value="+data[i].id+">"+data[i].truename+"</option>";
                 }

VisualInspection/view/statistics/check_workload_statistics.html

@@ -12,6 +12,8 @@
             <div class="div-to"><label>-</label></div>
             <div class="div-end"><input placeholder="请选择考核结束时间"></input></div>
             <div class="query div-button"><button>查询</button></div>
+
+            <div style="margin-right:30px;float:right;" class="div-button"><button id="export-check-info">导出</button></div>
         </div>
     </div> 
 
@@ -28,12 +30,4 @@
             <div class="datatable" data-checkable="true" data-sortable="true"></div>
     </div>
   
-</div>
-<script>
-    $(document).ready(function() {
-
-       
-    });
-</script>
-
-       
+</div>

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

@@ -112,4 +112,23 @@ public class FileExcelController extends BaseController {
     	return super.returnSuccessResult(null);
     }
     
+    /**
+     * 稽查人员工作量统计
+     */
+    @RequestMapping(value = "/check/info",method=RequestMethod.GET)
+    public String getCheckWorkExcel(HttpServletRequest req,HttpServletResponse resp,
+    		@RequestParam String start_date,@RequestParam String end_date,
+    		@RequestParam Integer queryType,@RequestParam(required=false) Integer user_id){
+    	StatisticsBean obj = new StatisticsBean();
+		Date start = DateUtil.strParseDate(start_date);
+		Date end = DateUtil.strParseDate(end_date);
+		obj.setStart_date(start);
+		obj.setEnd_date(end);
+		obj.setQueryType(queryType);
+		if(user_id != null){
+			obj.setUser_id(user_id+0L);			
+		}
+    	statisticsService.getCheckInfo(obj, req, resp);
+    	return super.returnSuccessResult(null);
+    }
 }

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

@@ -275,13 +275,16 @@
      		<if test="queryType!=null and queryType==0">
      			AND   t.checked_person = #{user_id}
      		</if>
-     		<if test="queryType!=null and queryType==1">
+     		<if test="queryType!=null and queryType==1 and user_id!=null and user_id!=''">
      			AND  t.checkman = #{user_id}
      		</if>
-     		<if test="start_date !=null">
+     		<if test="start_date !=null and end_date !=null and queryType ==1">
+     			AND t.create_time >= #{start_date} AND t.create_time &lt;= #{end_date}
+     		</if>
+     		<if test="start_date !=null and queryType == 0">
 				AND  t.start_time >= #{start_date}
 			</if>
-			<if test="end_date !=null">
+			<if test="end_date !=null and queryType == 0">
 				AND t.end_time &lt;= #{end_date}
 			</if>
      </select>
@@ -299,8 +302,10 @@
 					check_task t
 				LEFT JOIN check_score cs ON t.id = cs.task_id
 				WHERE
-				t.check_status != 22 AND
-				t.checkman = #{checkman_id}
+				t.check_status != 22 
+				<if test="checkman_id!=null and checkman_id!=''">
+					AND t.checkman = #{checkman_id}				
+				</if>
 				<if test="start_date !=null">
 					AND  t.start_time >= #{start_date}
 				</if>

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

@@ -89,4 +89,7 @@ public interface StatisticsService {
 	
 	// 收费站Excel申诉
 	public void getExcelAppealInfo(CheckAppealStatistic obj,String monthName,HttpServletRequest req,HttpServletResponse resp);
+	
+	// 稽查人员工作量统计
+	public void getCheckInfo(StatisticsBean obj,HttpServletRequest req,HttpServletResponse resp);
 }

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

@@ -1225,5 +1225,22 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		
 		return ObjList;
 	}
-	
+
+	@Override
+	public void getCheckInfo(StatisticsBean obj, HttpServletRequest req, HttpServletResponse resp) {
+		List<StatisticsBean> list = statisticsDao.selectOneCheckedDetailInfo(obj);
+		if(obj.getQueryType() == 1){
+			int seq = 1 ;
+			for(StatisticsBean sta : list){
+				sta.setId(seq++);
+				sta.setCheckman_name( CacheUtil.getUserFromMap(sta.getCheckman_id()+0L).getTruename()  ); 
+				sta.setChecked_name( CacheUtil.getUserFromMap(sta.getUser_id()+0L).getTruename());
+				sta.setFeeStationName( CacheUtil.getOrganFromMap(sta.getDept_id()).getOrganname() );
+				SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+				SimpleDateFormat formatter2 = new SimpleDateFormat("- HH:mm");
+				sta.setCheck_task_time_name( formatter.format(sta.getStart_date())+formatter2.format(sta.getEnd_date()));
+			}
+		}
+		exportExcel("稽查人员工作量统计", "check_info", list, resp);
+	}
 }