数据仓库查询功能修复BUG

src/main/java/com/minpay/common/service/impl/DianwangServiceImpl.java

@@ -104,6 +104,12 @@ public class DianwangServiceImpl implements IDianwangService {
 			fileDetail10Example.setOrderByClause("dfd10_sequ");
 			List<DwFileDetail10> resList = db.selectByExample(DwFileDetail10Mapper.class, fileDetail10Example, rows);
 			return resList;
+		} else if (Constant.FILE_DETAIL_TYPE_11.equals(fileType)) {//线路过重载
+			DwFileDetail11Example fileDetail11Example = new DwFileDetail11Example();
+			fileDetail11Example.createCriteria().andFileIdEqualTo(fileId);
+			fileDetail11Example.setOrderByClause("dfd11_sequ");
+			List<DwFileDetail11> resList = db.selectByExample(DwFileDetail11Mapper.class, fileDetail11Example, rows);
+			return resList;
 		}
     	return null;
 	}

src/main/java/com/minpay/common/service/impl/ReportServiceImpl.java

@@ -291,9 +291,7 @@ public class ReportServiceImpl implements IReportService {
 				+startTime.substring(0,2) + ":" + startTime.substring(2,4)+":"+startTime.substring(4,6);
 		String end =endDay.substring(0,4) + "-" + endDay.substring(4,6)+"-"+endDay.substring(6,8)+" "
 				+endTime.substring(0,2) + ":" + endTime.substring(2,4)+":"+endTime.substring(4,6);
-		List<Map<String,Object>> resList = new ArrayList<Map<String,Object>>();
 		Map<String,Object> rstMap = new HashMap();
-
 		if("".equals(range) ||  "".equals(timeRange)){
 			return new HashMap();
 		} else{

src/main/java/com/minpay/reportManage/action/DataWareManageAction.java

@@ -1094,6 +1094,64 @@ public class DataWareManageAction implements IMINAction {
 					"所属文件ID",
 					""};
 			util.exportExcel("线路过重载数据", selectByExample, os, "2007", header);
+		}else if (Constant.FILE_DETAIL_TYPE_11.equals(type)) {//线路过重载
+			response.setContentType("application/application/vnd.ms-excel");
+			response.setHeader("Content-disposition","attachment;filename=" + URLEncoder.encode("故障工单数据.xls", "UTF-8"));
+			DwFileDetail11Example example = new DwFileDetail11Example();
+			example.createCriteria().andFileIdEqualTo(fileId);
+			example.setOrderByClause("dfd11_sequ");
+			List<DwFileDetail11> selectByExample = db.getMybatisMapper(DwFileDetail11Mapper.class).selectByExample(example);
+			ExportExcelUtil<DwFileDetail11> util = new ExportExcelUtil<DwFileDetail11>();
+			String[] header = {"系统编号",
+					"原EXCEL编号",
+					"工单编号",
+					"国网工单号",
+					"用户编号",
+					"供电单位",
+					"到达现场时间",
+					"故障排除时间",
+					"一级分类",
+					"二级分类",
+					"三级分类",
+					"业务类型名称",
+					"受理时间",
+					"派工人",
+					"派出人员",
+					"锁定人",
+					"用户名称",
+					"联系人",
+					"联系地址",
+					"现场分类",
+					"紧急程度",
+					"危害程度",
+					"产权属性",
+					"故障归属",
+					"受理内容",
+					"工单状态",
+					"故障原因",
+					"故障现象",
+					"电压等级",
+					"终端处理",
+					"故障地址",
+					"联系电话",
+					"处理结果",
+					"合并主单",
+					"抢修总时长(分)",
+					"到岗时长(分)",
+					"故障排除时长(分)",
+					"故障研判结果",
+					"现场抢修记录",
+					"首次派发抢修队时间",
+					"再次派发抢修队时间",
+					"终端接单时间",
+					"恢复送电时间",
+					"提交审核时间",
+					"工单审核时间",
+					"归档时间",
+					"终端编码",
+					"所属文件ID",
+					""};
+			util.exportExcel("线路过重载数据", selectByExample, os, "2007", header);
 		}
         return response;
     }
@@ -1153,6 +1211,10 @@ public class DataWareManageAction implements IMINAction {
 			DwFileDetail10Example DwFileDetail10Example = new DwFileDetail10Example();
 			DwFileDetail10Example.createCriteria().andFileIdEqualTo(fileId);
 			db.deleteByExample(DwFileDetail10Mapper.class,DwFileDetail10Example);
+		}else if(Constant.FILE_DETAIL_TYPE_11.equals(fileType)){
+			DwFileDetail11Example DwFileDetail11Example = new DwFileDetail11Example();
+			DwFileDetail11Example.createCriteria().andFileIdEqualTo(fileId);
+			db.deleteByExample(DwFileDetail11Mapper.class,DwFileDetail11Example);
 		}
     	return res;
     }

src/main/webapp/admin/reprotManage/dataWareDetail.html

@@ -256,6 +256,54 @@
             {field:'sfzdh',title:'是否自动化',width:'100'},
             {field:'pmsid',title:'PMSID',width:'200'}
         ]];
+    }else if("1000011" == fileType){
+        cols = [[
+            {field:'gdbh',title:'工单编号',width:120},
+            {field:'gwgdbh',title:'国网工单号',width:120},
+            {field:'yhbh',title:'用户编号',width:120},
+            {field:'gddw',title:'供电单位',width:120},
+            {field:'dwxcsj',title:'到达现场时间',width:140},
+            {field:'gzpcsj',title:'故障排除时间',width:140},
+            {field:'yjfl',title:'一级分类',width:120},
+            {field:'ejfl',title:'二级分类',width:120},
+            {field:'sjfl',title:'三级分类',width:120},
+            {field:'ywlxmc',title:'业务类型名称',width:120},
+            {field:'slsh',title:'受理时间',width:140},
+            {field:'pgr',title:'派工人',width:120},
+            {field:'pcry',title:'派出人员',width:200},
+            {field:'sdr',title:'锁定人',width:120},
+            {field:'yhmc',title:'用户名称',width:120},
+            {field:'lxr',title:'联系人',width:120},
+            {field:'lxdz',title:'联系地址',width:200},
+            {field:'xcfl',title:'现场分类',width:120},
+            {field:'jjcd',title:'紧急程度',width:120},
+            {field:'whcd',title:'危害程度',width:120},
+            {field:'cqsx',title:'产权属性',width:120},
+            {field:'gzgs',title:'故障归属',width:120},
+            {field:'slnr',title:'受理内容',width:200},
+            {field:'gdzt',title:'工单状态',width:120},
+            {field:'gzyy',title:'故障原因',width:120},
+            {field:'gzxx',title:'故障现象',width:120},
+            {field:'dydj',title:'电压等级',width:120},
+            {field:'zdcl',title:'终端处理',width:120},
+            {field:'gzdz',title:'故障地址',width:200},
+            {field:'lxdh',title:'联系电话',width:120},
+            {field:'cljg',title:'处理结果',width:120},
+            {field:'hbzd',title:'合并主单',width:120},
+            {field:'qxzsc',title:'抢修总时长(分)',width:120},
+            {field:'dgsc',title:'到岗时长(分)',width:120},
+            {field:'gzpcsc',title:'故障排除时长(分)',width:120},
+            {field:'gzypjg',title:'故障研判结果',width:120},
+            {field:'xcqxjl',title:'现场抢修记录',width:200},
+            {field:'scpfqxdsj',title:'首次派发抢修队时间',width:140},
+            {field:'zcpfqxdsj',title:'再次派发抢修队时间',width:140},
+            {field:'zdjdsj',title:'终端接单时间',width:140},
+            {field:'hfsdsj',title:'恢复送电时间',width:140},
+            {field:'tjshsj',title:'提交审核时间',width:140},
+            {field:'gdshsj',title:'工单审核时间',width:140},
+            {field:'gdsj',title:'归档时间',width:140},
+            {field:'zdbm',title:'终端编码',width:150}
+        ]]
     }
 	
      var table;