功能优化

src/main/java/com/minpay/common/constant/Constant.java

@@ -338,6 +338,10 @@ public class Constant implements IMINBusinessConstant{
 	 * 故障工单信息
 	 */
 	public static final String FILE_DETAIL_TYPE_11 = "1000011";
+	/**
+	 * 95598工单-新
+	 */
+	public static final String FILE_DETAIL_TYPE_12 = "1000012";
 
 	/**
 	 * 报表类型 TQTDRB:台区停电日报

src/main/java/com/minpay/common/constant/ReportConstant.java

@@ -0,0 +1,27 @@
+package com.minpay.common.constant;
+
+import com.startup.minpay.frame.constant.IMINBusinessConstant;
+
+/**
+ * 报表通用常量类
+ */
+public class ReportConstant implements IMINBusinessConstant {
+    /**
+     * 95598工单新模板-KEY
+     */
+    public static final String[] REPORT_955982_TITLEKEY = new String[]{
+             "SEQU", "GDBH", "GWGDBH", "ZT", "DBBS", "YWLX", "DQBZ", "SLRY", "SLSJ", "SLNR", "YHBH",
+            "YHMC", "LXDZ", "LXDH", "HFNR", "YJFL", "EJFL", "YWZL", "SJDW", "GDDW", "CBD", "CLJG", "CLDW",
+            "CLBM", "GDS", "SSBZ", "GLGD", "WTYYFL", "GDFJ", "ZRBM", "GDSJ", "GQSJ", "GQYY", "FWQD", "SJTHZRYY",
+            "SJHTZRYY2", "GDDWG", "CLDWG", "ZBY", "SSDWGS", "XLSGS", "SSDW", "XLX1", "XLS2", "BZ", "FILE_ID", "STATE"
+    };
+    /**
+     * 95598工单新模板-标题
+     */
+    public static final String[] REPORT_955982_TITLEVALUE = new String[]{
+            "序号", "工单编号", "国网工单编号", "状态", "督办标识", "业务类型", "当前步骤", "受理人员", "受理时间", "受理内容",
+            "用户编号", "用户名称", "联系地址", "联系电话", "回访内容", "一级分类", "二级分类", "业务子类", "上级单位",
+            "供电单位", "抄表段", "处理结果", "处理单位", "处理部门", "供电所", "班组", "关联工单", "问题原因分类",
+            "工单分级", "责任部门", "归档时间", "挂起时间", "挂起原因", "服务渠道", "省级回退责任原因", "省级回退责任原因",
+            "供电单位-改", "处理单位-改", "指标月", "所属单位-公式", "新类型-公式", "所属单位", "新类型1", "新类型2(子类)", "备注"};
+}

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

@@ -110,6 +110,12 @@ public class DianwangServiceImpl implements IDianwangService {
 			fileDetail11Example.setOrderByClause("dfd11_sequ");
 			List<DwFileDetail11> resList = db.selectByExample(DwFileDetail11Mapper.class, fileDetail11Example, rows);
 			return resList;
+		} else if (Constant.FILE_DETAIL_TYPE_12.equals(fileType)) {//线路过重载
+			DwFileDetail12Example fileDetail12Example = new DwFileDetail12Example();
+			fileDetail12Example.createCriteria().andFileIdEqualTo(fileId);
+			fileDetail12Example.setOrderByClause("dfd12_sequ");
+			List<DwFileDetail12> resList = db.selectByExample(DwFileDetail12Mapper.class, fileDetail12Example, rows);
+			return resList;
 		}
     	return null;
 	}

src/main/java/com/minpay/db/table/mapper/DwFileDetail12Mapper.java

@@ -0,0 +1,67 @@
+package com.minpay.db.table.mapper;
+
+import com.minpay.db.table.model.DwFileDetail12;
+import com.minpay.db.table.model.DwFileDetail12Example;
+import java.util.List;
+
+import com.startup.minpay.frame.jdbc.IMINMybatisEntityMapper;
+import org.apache.ibatis.annotations.Param;
+
+public interface DwFileDetail12Mapper  extends IMINMybatisEntityMapper<DwFileDetail12, String, DwFileDetail12Example> {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dw_file_detail_12
+     *
+     * @mbg.generated
+     * @return
+     */
+    int countByExample(DwFileDetail12Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dw_file_detail_12
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(DwFileDetail12Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dw_file_detail_12
+     *
+     * @mbg.generated
+     */
+    int insert(DwFileDetail12 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dw_file_detail_12
+     *
+     * @mbg.generated
+     */
+    int insertSelective(DwFileDetail12 record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dw_file_detail_12
+     *
+     * @mbg.generated
+     */
+    List<DwFileDetail12> selectByExample(DwFileDetail12Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dw_file_detail_12
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") DwFileDetail12 record, @Param("example") DwFileDetail12Example example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dw_file_detail_12
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") DwFileDetail12 record, @Param("example") DwFileDetail12Example example);
+}

src/main/java/com/minpay/db/table/own/mapper/IReportBatchMapper.java

@@ -3,6 +3,7 @@ package com.minpay.db.table.own.mapper;
 import com.minpay.db.table.model.DwFileDetail09;
 import com.minpay.db.table.model.DwFileDetail10;
 import com.minpay.db.table.model.DwFileDetail11;
+import com.minpay.db.table.model.DwFileDetail12;
 import com.startup.minpay.frame.jdbc.IMINMybatisMapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -55,4 +56,10 @@ public interface IReportBatchMapper  extends IMINMybatisMapper {
      * @param tempList
      */
     void insertGzgdReport(List<DwFileDetail11> tempList);
+
+    /**
+     * 95598工单信息
+     * @param tempList
+     */
+    void insert95598gdReport(List<DwFileDetail12> tempList);
 }

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

@@ -15,6 +15,7 @@ import java.util.*;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 
+import com.minpay.common.constant.ReportConstant;
 import com.minpay.common.util.*;
 import com.minpay.db.table.mapper.*;
 import com.minpay.db.table.model.*;
@@ -730,8 +731,6 @@ public class DataWareManageAction implements IMINAction {
 					if(gzpcsj != null && !"".equals(gzpcsj)){
 						fileDetail11.setGzpcsj(StringUtil.ObjToDate(gzpcsj,"2"));
 					}
-//					fileDetail11.setDwxcsj(excelMap.get("DWXCSJ"));
-//					fileDetail11.setGzpcsj(excelMap.get("GZPCSJ"));
 					fileDetail11.setYjfl(excelMap.get("YJFL"));
 					fileDetail11.setEjfl(excelMap.get("EJFL"));
 					fileDetail11.setSjfl(excelMap.get("SJFL"));
@@ -740,7 +739,6 @@ public class DataWareManageAction implements IMINAction {
 					if(slsh != null && !"".equals(slsh)){
 						fileDetail11.setSlsh(StringUtil.ObjToDate(slsh,"2"));
 					}
-//					fileDetail11.setSlsh(excelMap.get("SLSH"));
 					fileDetail11.setPgr(excelMap.get("PGR"));
 					fileDetail11.setPcry(excelMap.get("PCRY"));
 					fileDetail11.setSdr(excelMap.get("SDR"));
@@ -771,37 +769,30 @@ public class DataWareManageAction implements IMINAction {
 					if(scpfqxdsj != null && !"".equals(scpfqxdsj)){
 						fileDetail11.setScpfqxdsj(StringUtil.ObjToDate(scpfqxdsj,"2"));
 					}
-//					fileDetail11.setScpfqxdsj(excelMap.get("SCPFQXDSJ"));
 					String zcpfqxdsj = excelMap.get("ZCPFQXDSJ");
 					if(zcpfqxdsj != null && !"".equals(zcpfqxdsj)){
 						fileDetail11.setZcpfqxdsj(StringUtil.ObjToDate(zcpfqxdsj,"2"));
 					}
-//					fileDetail11.setZcpfqxdsj(excelMap.get("ZCPFQXDSJ"));
 					String zdjdsj = excelMap.get("ZDJDSJ");
 					if(zdjdsj != null && !"".equals(zdjdsj)){
 						fileDetail11.setZdjdsj(StringUtil.ObjToDate(zdjdsj,"2"));
 					}
-//					fileDetail11.setZdjdsj(excelMap.get("ZDJDSJ"));
 					String hfsdsj = excelMap.get("HFSDSJ");
 					if(hfsdsj != null && !"".equals(hfsdsj)){
 						fileDetail11.setHfsdsj(StringUtil.ObjToDate(hfsdsj,"2"));
 					}
-//					fileDetail11.setHfsdsj(excelMap.get("HFSDSJ"));
 					String tjshsj = excelMap.get("TJSHSJ");
 					if(tjshsj != null && !"".equals(tjshsj)){
 						fileDetail11.setTjshsj(StringUtil.ObjToDate(tjshsj,"2"));
 					}
-//					fileDetail11.setTjshsj(excelMap.get("TJSHSJ"));
 					String gdshsj = excelMap.get("GDSHSJ");
 					if(gdshsj != null && !"".equals(gdshsj)){
 						fileDetail11.setGdshsj(StringUtil.ObjToDate(gdshsj,"2"));
 					}
-//					fileDetail11.setGdshsj(excelMap.get("GDSHSJ"));
 					String gdsj = excelMap.get("GDSJ");
 					if(gdsj != null && !"".equals(gdsj)){
 						fileDetail11.setGdsj(StringUtil.ObjToDate(gdsj,"2"));
 					}
-//					fileDetail11.setGdsj(excelMap.get("GDSJ"));
 					fileDetail11.setZdbm(excelMap.get("ZDBM"));
 
 					fileDetail11.setFileId(fileId);
@@ -809,6 +800,95 @@ public class DataWareManageAction implements IMINAction {
 				}
 				this.batchGzgdReportData(ll,2);
 			}
+		}else if(Constant.FILE_DETAIL_TYPE_12.equals(fileType)){
+			//标题对应key
+			String[] titleKey = ReportConstant.REPORT_955982_TITLEKEY;
+			String[] titleValue = ReportConstant.REPORT_955982_TITLEVALUE;
+			//验证模板是否正确
+			Map<String,Object> header = new HashMap<String, Object>();
+			List<String[]> headerTitle = new ArrayList<String[]>();
+			headerTitle.add(titleValue);
+			if(headerTitle == null || headerTitle.isEmpty()){
+				System.out.println("标题列为空");
+			} else {
+				header.put("headerRows",headerTitle.size() - 1);
+				header.put("header",headerTitle);
+				header.put("cols",headerTitle.get(headerTitle.size() -1).length);
+				boolean b = ExcelTemplateUtil.verificationExcelHeadLine(fileItem,header);
+				if (!b) {
+					throw new MINBusinessException("导入模板不一致,请使用正确模板");//无数据，请添加数据
+				}
+				//读取excel数据
+				list = FilesUtil.readExecleasy(fileItem, titleKey, 1);
+				if(list == null || list.isEmpty()){
+					throw new MINBusinessException("无数据，请添加数据");//无数据，请添加数据
+				}
+				List<DwFileDetail12> ll = new ArrayList<DwFileDetail12>();
+				// 详情数据存入数据库
+				for (Map<String,String> excelMap : list) {
+					DwFileDetail12 fileDetail12 = new DwFileDetail12();
+					fileDetail12.setId(UUID.randomUUID().toString().replace("-", ""));
+					fileDetail12.setSequ(StringUtil.ObjToInt(excelMap.get("SEQU")));
+					fileDetail12.setGdbh(excelMap.get("GDBH"));
+					fileDetail12.setGwgdbh(excelMap.get("GWGDBH"));
+					fileDetail12.setZt(excelMap.get("ZT"));
+					fileDetail12.setDbbs(excelMap.get("DBBS"));
+					fileDetail12.setYwlx(excelMap.get("YWLX"));
+					fileDetail12.setDqbz(excelMap.get("DQBZ"));
+					fileDetail12.setSlry(excelMap.get("SLRY"));
+					String slsj = excelMap.get("SLSJ");
+					if(slsj != null && !"".equals(slsj)){
+						fileDetail12.setSlsj(StringUtil.ObjToDate(slsj,"1"));
+					}
+//					fileDetail12.setSlsj(excelMap.get("SLSJ"));
+					fileDetail12.setSlnr(excelMap.get("SLNR"));
+					fileDetail12.setYhbh(excelMap.get("YHBH"));
+					fileDetail12.setYhmc(excelMap.get("YHMC"));
+					fileDetail12.setLxdz(excelMap.get("LXDZ"));
+					fileDetail12.setLxdh(excelMap.get("LXDH"));
+					fileDetail12.setHfnr(excelMap.get("HFNR"));
+					fileDetail12.setYjfl(excelMap.get("YJFL"));
+					fileDetail12.setEjfl(excelMap.get("EJFL"));
+					fileDetail12.setYwzl(excelMap.get("YWZL"));
+					fileDetail12.setSjdw(excelMap.get("SJDW"));
+					fileDetail12.setGddw(excelMap.get("GDDW"));
+					fileDetail12.setCbd(excelMap.get("CBD"));
+					fileDetail12.setCljg(excelMap.get("CLJG"));
+					fileDetail12.setCldw(excelMap.get("CLDW"));
+					fileDetail12.setClbm(excelMap.get("CLBM"));
+					fileDetail12.setGds(excelMap.get("GDS"));
+					fileDetail12.setSsbz(excelMap.get("SSBZ"));
+					fileDetail12.setGlgd(excelMap.get("GLGD"));
+					fileDetail12.setWtyyfl(excelMap.get("WTYYFL"));
+					fileDetail12.setGdfj(excelMap.get("GDFJ"));
+					fileDetail12.setZrbm(excelMap.get("ZRBM"));
+					String gdsj = excelMap.get("GDSJ");
+					if(gdsj != null && !"".equals(gdsj)){
+						fileDetail12.setGdsj(StringUtil.ObjToDate(gdsj,"1"));
+					}
+					String gqsj = excelMap.get("GQSJ");
+					if(gqsj != null && !"".equals(gqsj)){
+						fileDetail12.setGqsj(StringUtil.ObjToDate(gqsj,"1"));
+					}
+					fileDetail12.setGqyy(excelMap.get("GQYY"));
+					fileDetail12.setFwqd(excelMap.get("FWQD"));
+					fileDetail12.setSjthzryy(excelMap.get("SJTHZRYY"));
+					fileDetail12.setSjhtzryy2(excelMap.get("SJHTZRYY2"));
+					fileDetail12.setGddwg(excelMap.get("GDDWG"));
+					fileDetail12.setCldwg(excelMap.get("CLDWG"));
+					fileDetail12.setZby(excelMap.get("ZBY"));
+					fileDetail12.setSsdwgs(excelMap.get("SSDWGS"));
+					fileDetail12.setXlsgs(excelMap.get("XLSGS"));
+					fileDetail12.setSsdw(excelMap.get("SSDW"));
+					fileDetail12.setXlx1(excelMap.get("XLX1"));
+					fileDetail12.setXls2(excelMap.get("XLS2"));
+					fileDetail12.setBz(excelMap.get("BZ"));
+					fileDetail12.setFileId(fileId);
+
+					ll.add(fileDetail12);
+				}
+				this.batch95598gdReportData(ll,2);
+			}
 		}
 
 		// 文件名
@@ -837,6 +917,39 @@ public class DataWareManageAction implements IMINAction {
 		return res;
     }
 
+	private void batch95598gdReportData(List<DwFileDetail12> list, int type) {
+		{
+
+			if(list != null && list.size() > 0){
+				List<DwFileDetail12> tempList = new ArrayList<DwFileDetail12>();
+				int cou = 0;
+				for (int i = 0; i < list.size() ; i++) {
+					if((list.size() - i) >= 1000){
+						tempList.add((DwFileDetail12) list.get(i));
+						cou += 1;
+						if(cou == 1000){
+							try {
+								db.getMybatisMapper(IReportBatchMapper.class).insert95598gdReport(tempList);
+							} catch (MINBusinessException e) {
+								e.printStackTrace();
+							}
+							cou = 0;
+							tempList = new ArrayList<DwFileDetail12>();
+						}
+					}
+					if((list.size() - i) < 1000){
+						tempList.add((DwFileDetail12) list.get(i));
+					}
+				}
+				try {
+					db.getMybatisMapper(IReportBatchMapper.class).insert95598gdReport(tempList);
+				} catch (MINBusinessException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+
 	/**
 	 * @param list
 	 * @param type
@@ -1036,31 +1149,12 @@ public class DataWareManageAction implements IMINAction {
 			example.setOrderByClause("dfd9_sequ");
 			List<DwFileDetail09> selectByExample = db.getMybatisMapper(DwFileDetail09Mapper.class).selectByExample(example);
 			ExportExcelUtil<DwFileDetail09> util = new ExportExcelUtil<DwFileDetail09>();
-			String[] header = {"系统编号","原EXCEL编号","月份",
-					"单位",
-					"班组名称",
-					"公变名称",
-					"线路名称",
-					"负载率(%) ",
-					"最大负载率(%)",
-					"最大负载率发生时刻时间",
-					"额定容量(kVA) ",
-					"过(重)载原因分类 ",
-					"具体原因（详细说明原因情况）",
-					"解决措施分类 ",
-					"具体解决措施（详细说明解决措施）",
-					"完成时间",
-					"三相不平衡率(%)(最大负荷) ",
-					"A相电流(A)",
-					"B相电流(A)",
-					"C相电流(A)",
-					"过载时长(小时)",
-					"用户数量",
-					"重载时长",
-					"营销ID",
-					"PMSID",
-					"所属文件ID",""};
-			util.exportExcel("配变过重载数据", selectByExample, os, "2007", header);
+			String[] header = {"系统编号","原EXCEL编号","月份", "单位", "班组名称", "公变名称", "线路名称", "负载率(%) ",
+					"最大负载率(%)", "最大负载率发生时刻时间", "额定容量(kVA) ", "过(重)载原因分类 ", "具体原因（详细说明原因情况）", "解决措施分类 ",
+					"具体解决措施（详细说明解决措施）", "完成时间",
+					"三相不平衡率(%)(最大负荷) ", "A相电流(A)", "B相电流(A)", "C相电流(A)", "过载时长(小时)", "用户数量", "重载时长",
+					"营销ID", "PMSID", "所属文件ID",""};
+			util.exportExcel("配变过重载数据清单", selectByExample, os, "2007", header);
 		}else if (Constant.FILE_DETAIL_TYPE_09.equals(type)) {//线路过重载
 			response.setContentType("application/application/vnd.ms-excel");
 			response.setHeader("Content-disposition","attachment;filename=" + URLEncoder.encode("线路过重载数据.xls", "UTF-8"));
@@ -1069,31 +1163,11 @@ public class DataWareManageAction implements IMINAction {
 			example.setOrderByClause("dfd10_sequ");
 			List<DwFileDetail10> selectByExample = db.getMybatisMapper(DwFileDetail10Mapper.class).selectByExample(example);
 			ExportExcelUtil<DwFileDetail10> util = new ExportExcelUtil<DwFileDetail10>();
-			String[] header = {"系统编号",
-					"原EXCEL编号","月份",
-					"所属县公司",
-					"班组名称 ",
-					"变电站名称",
-					"线路名称 ",
-					"额定电流(A)",
-					"负载率(%) ",
-					"过(重)载原因分类",
-					"具体原因（详细说明原因情况） ",
-					"解决措施分类 ",
-					"具体解决措施（详细说明解决措施） ",
-					"完成时间 ",
-					"过载时长(小时) ",
-					"运行电流(A)",
-					"发生时刻 ",
-					"最大电流(A)",
-					"最大值发生时刻",
-					"配变数量(台)",
-					"配变容量(kVA)",
-					"是否自动化",
-					"PMSID",
-					"所属文件ID",
-					""};
-			util.exportExcel("线路过重载数据", selectByExample, os, "2007", header);
+			String[] header = {"系统编号", "原EXCEL编号","月份", "所属县公司", "班组名称 ", "变电站名称", "线路名称 ", "额定电流(A)",
+					"负载率(%) ", "过(重)载原因分类", "具体原因（详细说明原因情况） ", "解决措施分类 ", "具体解决措施（详细说明解决措施） ",
+					"完成时间 ", "过载时长(小时) ", "运行电流(A)", "发生时刻 ", "最大电流(A)", "最大值发生时刻", "配变数量(台)",
+					"配变容量(kVA)", "是否自动化", "PMSID", "所属文件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"));
@@ -1102,56 +1176,28 @@ public class DataWareManageAction implements IMINAction {
 			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);
+			String[] header = {"系统编号", "原EXCEL编号", "工单编号", "国网工单号", "用户编号", "供电单位", "到达现场时间", "故障排除时间", "一级分类",
+					"二级分类", "三级分类", "业务类型名称", "受理时间", "派工人", "派出人员", "锁定人", "用户名称", "联系人", "联系地址",
+					"现场分类", "紧急程度", "危害程度", "产权属性", "故障归属", "受理内容", "工单状态", "故障原因", "故障现象", "电压等级",
+					"终端处理", "故障地址", "联系电话", "处理结果", "合并主单", "抢修总时长(分)", "到岗时长(分)", "故障排除时长(分)",
+					"故障研判结果", "现场抢修记录", "首次派发抢修队时间", "再次派发抢修队时间", "终端接单时间", "恢复送电时间",
+					"提交审核时间", "工单审核时间", "归档时间", "终端编码", "所属文件ID", ""};
+			util.exportExcel("故障工单信息数据清单", selectByExample, os, "2007", header);
+		}else if (Constant.FILE_DETAIL_TYPE_12.equals(type)) {//95598工单-新
+			response.setContentType("application/application/vnd.ms-excel");
+			response.setHeader("Content-disposition","attachment;filename=" + URLEncoder.encode("故障工单数据.xls", "UTF-8"));
+			DwFileDetail12Example example = new DwFileDetail12Example();
+			example.createCriteria().andFileIdEqualTo(fileId);
+			example.setOrderByClause("dfd12_sequ");
+			List<DwFileDetail12> selectByExample = db.getMybatisMapper(DwFileDetail12Mapper.class).selectByExample(example);
+			ExportExcelUtil<DwFileDetail12> util = new ExportExcelUtil<DwFileDetail12>();
+			String[] header = {"系统编号", "原EXCEL编号","工单编号", "国网工单编号", "状态", "督办标识", "业务类型", "当前步骤", "受理人员", "受理时间", "受理内容",
+					"用户编号", "用户名称", "联系地址", "联系电话", "回访内容", "一级分类", "二级分类", "业务子类", "上级单位",
+					"供电单位", "抄表段", "处理结果", "处理单位", "处理部门", "供电所", "班组", "关联工单", "问题原因分类",
+					"工单分级", "责任部门", "归档时间", "挂起时间", "挂起原因", "服务渠道", "省级回退责任原因", "省级回退责任原因",
+					"供电单位-改", "处理单位-改", "指标月", "所属单位-公式", "新类型-公式", "所属单位", "新类型1", "新类型2(子类)", "备注","所属文件",""};
+
+			util.exportExcel("95598工单数据清单", selectByExample, os, "2007", header);
 		}
         return response;
     }

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

@@ -56,6 +56,7 @@ import com.startup.minpay.frame.target.MINParam;
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
+import org.apache.poi.xssf.usermodel.XSSFColor;
 
 @MINComponent
 public class ReportManageAction implements IMINAction {
@@ -951,18 +952,29 @@ public class ReportManageAction implements IMINAction {
 			sheet.autoSizeColumn(i + 1);// 0号位被序号占用，所以需+1
 			sheet.setColumnWidth(i+1,titleArray[i].getBytes().length*256+500);
 		}
-		// 数据样式 因为标题和数据样式不同 需要分开设置 不然会覆盖
-		HSSFCellStyle dataStyle = wb.createCellStyle();
+
 		// 设置数据字体
 		Font dataFont = wb.createFont();
 		dataFont.setFontHeightInPoints((short) 10); // 字体高度
 		dataFont.setFontName("宋体"); // 字体
+
+		Font dataFont2 = wb.createFont();
+		dataFont2.setFontHeightInPoints((short) 10); // 字体高度
+		dataFont2.setFontName("宋体"); // 字体
+		dataFont2.setColor(Font.COLOR_RED);
+
+		// 数据样式 因为标题和数据样式不同 需要分开设置 不然会覆盖
+		HSSFCellStyle dataStyle = wb.createCellStyle();
 		dataStyle.setFont(dataFont);
 		dataStyle.setAlignment(CellStyle.ALIGN_CENTER);
 
+
+
 		// 自定义颜色
 		HSSFPalette palette = wb.getCustomPalette();
+		//#F0A5AC-粉红色
 		palette.setColorAtIndex((short)9, (byte) (0xff & 240), (byte) (0xff & 165), (byte) (0xff & 172));
+		//#FFC000-黄色
 		palette.setColorAtIndex((short)10, (byte) (0xff & 255), (byte) (0xff & 192), (byte) (0xff & 0));
 
 		HSSFCellStyle dataStyle2 = wb.createCellStyle();
@@ -977,6 +989,19 @@ public class ReportManageAction implements IMINAction {
 		dataStyle3.setFillForegroundColor((short)10);
 		dataStyle3.setAlignment(CellStyle.ALIGN_CENTER);
 
+
+		HSSFCellStyle dataStyle4 = wb.createCellStyle();
+		dataStyle4.setFont(dataFont);
+		dataStyle4.setFillPattern(CellStyle.SOLID_FOREGROUND);
+		dataStyle4.setFillForegroundColor((short)10);
+		dataStyle4.setAlignment(CellStyle.ALIGN_CENTER);
+
+		HSSFCellStyle dataStyle5 = wb.createCellStyle();
+		dataStyle4.setFont(dataFont2);
+		dataStyle4.setFillPattern(CellStyle.SOLID_FOREGROUND);
+		dataStyle4.setFillForegroundColor((short)10);
+		dataStyle4.setAlignment(CellStyle.ALIGN_CENTER);
+
 		// 遍历集合数据，产生数据行
 		Iterator<T> it = dataList.iterator();
 		int index = 0;
@@ -1011,7 +1036,13 @@ public class ReportManageAction implements IMINAction {
 					if (CommonUtil.compare(sj, "48") != -1) {
 						dataCell.setCellValue(value);// 为当前列赋值
 						dataCell.setCellStyle(dataStyle3);
-					} else {
+					} else if((CommonUtil.compare(sj, "48") == 0 ||  CommonUtil.compare(sj, "48") < 0 )&& CommonUtil.compare(sj, "15") > 0){// 15 < sj <= 48
+						dataCell.setCellValue(value);// 为当前列赋值
+						dataCell.setCellStyle(dataStyle2);
+					} else if(CommonUtil.compare(sj, "15") < 0){
+						dataCell.setCellValue(value);// 为当前列赋值
+						dataCell.setCellStyle(dataStyle5);
+					}else {
 						dataCell.setCellValue(value);// 为当前列赋值
 						dataCell.setCellStyle(dataStyle);
 					}

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

@@ -275,6 +275,9 @@ public class TQTDReportAction implements IMINAction {
 		List<Map<String, String>> mountCountList = db.getMybatisMapper(ReportServiceMapper.class).selectMountCount00(param);
 
 		List<String> addressNumList = CommonUtil.getIdFromList(mountCountList, "addressNum");
+		if(addressNumList == null || addressNumList.isEmpty()){
+			addressNumList.add("XXXXXXXX");
+		}
 		DwFileDetail00Example fileDetail00Example = new DwFileDetail00Example();
 		fileDetail00Example.createCriteria().andAddressNumIn(addressNumList)
 										.andStartTimeGreaterThanOrEqualTo(beginDay).andStartTimeLessThanOrEqualTo(rangeArray[1]);

src/main/resources/com/minpay/db/table/mapper/DwFileDetail12Mapper.xml

@@ -0,0 +1,724 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.minpay.db.table.mapper.DwFileDetail12Mapper">
+  <resultMap id="BaseResultMap" type="com.minpay.db.table.model.DwFileDetail12">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <result column="DFD12_ID" jdbcType="VARCHAR" property="id" />
+    <result column="DFD12_SEQU" jdbcType="INTEGER" property="sequ" />
+    <result column="DFD12_GDBH" jdbcType="VARCHAR" property="gdbh" />
+    <result column="DFD12_GWGDBH" jdbcType="VARCHAR" property="gwgdbh" />
+    <result column="DFD12_ZT" jdbcType="VARCHAR" property="zt" />
+    <result column="DFD12_DBBS" jdbcType="VARCHAR" property="dbbs" />
+    <result column="DFD12_YWLX" jdbcType="VARCHAR" property="ywlx" />
+    <result column="DFD12_DQBZ" jdbcType="VARCHAR" property="dqbz" />
+    <result column="DFD12_SLRY" jdbcType="VARCHAR" property="slry" />
+    <result column="DFD12_SLSJ" jdbcType="TIMESTAMP" property="slsj" />
+    <result column="DFD12_SLNR" jdbcType="VARCHAR" property="slnr" />
+    <result column="DFD12_YHBH" jdbcType="VARCHAR" property="yhbh" />
+    <result column="DFD12_YHMC" jdbcType="VARCHAR" property="yhmc" />
+    <result column="DFD12_LXDZ" jdbcType="VARCHAR" property="lxdz" />
+    <result column="DFD12_LXDH" jdbcType="VARCHAR" property="lxdh" />
+    <result column="DFD12_HFNR" jdbcType="VARCHAR" property="hfnr" />
+    <result column="DFD12_YJFL" jdbcType="VARCHAR" property="yjfl" />
+    <result column="DFD12_EJFL" jdbcType="VARCHAR" property="ejfl" />
+    <result column="DFD12_YWZL" jdbcType="VARCHAR" property="ywzl" />
+    <result column="DFD12_SJDW" jdbcType="VARCHAR" property="sjdw" />
+    <result column="DFD12_GDDW" jdbcType="VARCHAR" property="gddw" />
+    <result column="DFD12_CBD" jdbcType="VARCHAR" property="cbd" />
+    <result column="DFD12_CLJG" jdbcType="VARCHAR" property="cljg" />
+    <result column="DFD12_CLDW" jdbcType="VARCHAR" property="cldw" />
+    <result column="DFD12_CLBM" jdbcType="VARCHAR" property="clbm" />
+    <result column="DFD12_GDS" jdbcType="VARCHAR" property="gds" />
+    <result column="DFD12_SSBZ" jdbcType="VARCHAR" property="ssbz" />
+    <result column="DFD12_GLGD" jdbcType="VARCHAR" property="glgd" />
+    <result column="DFD12_WTYYFL" jdbcType="VARCHAR" property="wtyyfl" />
+    <result column="DFD12_GDFJ" jdbcType="VARCHAR" property="gdfj" />
+    <result column="DFD12_ZRBM" jdbcType="VARCHAR" property="zrbm" />
+    <result column="DFD12_GDSJ" jdbcType="TIMESTAMP" property="gdsj" />
+    <result column="DFD12_GQSJ" jdbcType="TIMESTAMP" property="gqsj" />
+    <result column="DFD12_GQYY" jdbcType="VARCHAR" property="gqyy" />
+    <result column="DFD12_FWQD" jdbcType="VARCHAR" property="fwqd" />
+    <result column="DFD12_SJTHZRYY" jdbcType="VARCHAR" property="sjthzryy" />
+    <result column="DFD12_SJHTZRYY2" jdbcType="VARCHAR" property="sjhtzryy2" />
+    <result column="DFD12_GDDWG" jdbcType="VARCHAR" property="gddwg" />
+    <result column="DFD12_CLDWG" jdbcType="VARCHAR" property="cldwg" />
+    <result column="DFD12_ZBY" jdbcType="VARCHAR" property="zby" />
+    <result column="DFD12_SSDWGS" jdbcType="VARCHAR" property="ssdwgs" />
+    <result column="DFD12_XLSGS" jdbcType="VARCHAR" property="xlsgs" />
+    <result column="DFD12_SSDW" jdbcType="VARCHAR" property="ssdw" />
+    <result column="DFD12_XLX1" jdbcType="VARCHAR" property="xlx1" />
+    <result column="DFD12_XLS2" jdbcType="VARCHAR" property="xls2" />
+    <result column="DFD12_BZ" jdbcType="VARCHAR" property="bz" />
+    <result column="DFD12_FILE_ID" jdbcType="VARCHAR" property="fileId" />
+    <result column="DFD12_STATE" jdbcType="VARCHAR" property="state" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    DFD12_ID, DFD12_SEQU, DFD12_GDBH, DFD12_GWGDBH, DFD12_ZT, DFD12_DBBS, DFD12_YWLX, 
+    DFD12_DQBZ, DFD12_SLRY, DFD12_SLSJ, DFD12_SLNR, DFD12_YHBH, DFD12_YHMC, DFD12_LXDZ, 
+    DFD12_LXDH, DFD12_HFNR, DFD12_YJFL, DFD12_EJFL, DFD12_YWZL, DFD12_SJDW, DFD12_GDDW, 
+    DFD12_CBD, DFD12_CLJG, DFD12_CLDW, DFD12_CLBM, DFD12_GDS, DFD12_SSBZ, DFD12_GLGD, 
+    DFD12_WTYYFL, DFD12_GDFJ, DFD12_ZRBM, DFD12_GDSJ, DFD12_GQSJ, DFD12_GQYY, DFD12_FWQD, 
+    DFD12_SJTHZRYY, DFD12_SJHTZRYY2, DFD12_GDDWG, DFD12_CLDWG, DFD12_ZBY, DFD12_SSDWGS, 
+    DFD12_XLSGS, DFD12_SSDW, DFD12_XLX1, DFD12_XLS2, DFD12_BZ, DFD12_FILE_ID, DFD12_STATE
+  </sql>
+  <select id="selectByExample" parameterType="com.minpay.db.table.model.DwFileDetail12Example" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from dw_file_detail_12
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <delete id="deleteByExample" parameterType="com.minpay.db.table.model.DwFileDetail12Example">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from dw_file_detail_12
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.minpay.db.table.model.DwFileDetail12">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into dw_file_detail_12 (DFD12_ID, DFD12_SEQU, DFD12_GDBH, 
+      DFD12_GWGDBH, DFD12_ZT, DFD12_DBBS, DFD12_YWLX, 
+      DFD12_DQBZ, DFD12_SLRY, DFD12_SLSJ, 
+      DFD12_SLNR, DFD12_YHBH, DFD12_YHMC, DFD12_LXDZ, 
+      DFD12_LXDH, DFD12_HFNR, DFD12_YJFL, DFD12_EJFL, 
+      DFD12_YWZL, DFD12_SJDW, DFD12_GDDW, DFD12_CBD, 
+      DFD12_CLJG, DFD12_CLDW, DFD12_CLBM, DFD12_GDS, 
+      DFD12_SSBZ, DFD12_GLGD, DFD12_WTYYFL, 
+      DFD12_GDFJ, DFD12_ZRBM, DFD12_GDSJ, 
+      DFD12_GQSJ, DFD12_GQYY, DFD12_FWQD, 
+      DFD12_SJTHZRYY, DFD12_SJHTZRYY2, DFD12_GDDWG, 
+      DFD12_CLDWG, DFD12_ZBY, DFD12_SSDWGS, 
+      DFD12_XLSGS, DFD12_SSDW, DFD12_XLX1, 
+      DFD12_XLS2, DFD12_BZ, DFD12_FILE_ID, DFD12_STATE
+      )
+    values (#{id,jdbcType=VARCHAR}, #{sequ,jdbcType=INTEGER}, #{gdbh,jdbcType=VARCHAR}, 
+      #{gwgdbh,jdbcType=VARCHAR}, #{zt,jdbcType=VARCHAR}, #{dbbs,jdbcType=VARCHAR}, #{ywlx,jdbcType=VARCHAR}, 
+      #{dqbz,jdbcType=VARCHAR}, #{slry,jdbcType=VARCHAR}, #{slsj,jdbcType=TIMESTAMP}, 
+      #{slnr,jdbcType=VARCHAR}, #{yhbh,jdbcType=VARCHAR}, #{yhmc,jdbcType=VARCHAR}, #{lxdz,jdbcType=VARCHAR}, 
+      #{lxdh,jdbcType=VARCHAR}, #{hfnr,jdbcType=VARCHAR}, #{yjfl,jdbcType=VARCHAR}, #{ejfl,jdbcType=VARCHAR}, 
+      #{ywzl,jdbcType=VARCHAR}, #{sjdw,jdbcType=VARCHAR}, #{gddw,jdbcType=VARCHAR}, #{cbd,jdbcType=VARCHAR}, 
+      #{cljg,jdbcType=VARCHAR}, #{cldw,jdbcType=VARCHAR}, #{clbm,jdbcType=VARCHAR}, #{gds,jdbcType=VARCHAR}, 
+      #{ssbz,jdbcType=VARCHAR}, #{glgd,jdbcType=VARCHAR}, #{wtyyfl,jdbcType=VARCHAR}, 
+      #{gdfj,jdbcType=VARCHAR}, #{zrbm,jdbcType=VARCHAR}, #{gdsj,jdbcType=TIMESTAMP}, 
+      #{gqsj,jdbcType=TIMESTAMP}, #{gqyy,jdbcType=VARCHAR}, #{fwqd,jdbcType=VARCHAR}, 
+      #{sjthzryy,jdbcType=VARCHAR}, #{sjhtzryy2,jdbcType=VARCHAR}, #{gddwg,jdbcType=VARCHAR}, 
+      #{cldwg,jdbcType=VARCHAR}, #{zby,jdbcType=VARCHAR}, #{ssdwgs,jdbcType=VARCHAR}, 
+      #{xlsgs,jdbcType=VARCHAR}, #{ssdw,jdbcType=VARCHAR}, #{xlx1,jdbcType=VARCHAR}, 
+      #{xls2,jdbcType=VARCHAR}, #{bz,jdbcType=VARCHAR}, #{fileId,jdbcType=VARCHAR}, #{state,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.minpay.db.table.model.DwFileDetail12">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into dw_file_detail_12
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        DFD12_ID,
+      </if>
+      <if test="sequ != null">
+        DFD12_SEQU,
+      </if>
+      <if test="gdbh != null">
+        DFD12_GDBH,
+      </if>
+      <if test="gwgdbh != null">
+        DFD12_GWGDBH,
+      </if>
+      <if test="zt != null">
+        DFD12_ZT,
+      </if>
+      <if test="dbbs != null">
+        DFD12_DBBS,
+      </if>
+      <if test="ywlx != null">
+        DFD12_YWLX,
+      </if>
+      <if test="dqbz != null">
+        DFD12_DQBZ,
+      </if>
+      <if test="slry != null">
+        DFD12_SLRY,
+      </if>
+      <if test="slsj != null">
+        DFD12_SLSJ,
+      </if>
+      <if test="slnr != null">
+        DFD12_SLNR,
+      </if>
+      <if test="yhbh != null">
+        DFD12_YHBH,
+      </if>
+      <if test="yhmc != null">
+        DFD12_YHMC,
+      </if>
+      <if test="lxdz != null">
+        DFD12_LXDZ,
+      </if>
+      <if test="lxdh != null">
+        DFD12_LXDH,
+      </if>
+      <if test="hfnr != null">
+        DFD12_HFNR,
+      </if>
+      <if test="yjfl != null">
+        DFD12_YJFL,
+      </if>
+      <if test="ejfl != null">
+        DFD12_EJFL,
+      </if>
+      <if test="ywzl != null">
+        DFD12_YWZL,
+      </if>
+      <if test="sjdw != null">
+        DFD12_SJDW,
+      </if>
+      <if test="gddw != null">
+        DFD12_GDDW,
+      </if>
+      <if test="cbd != null">
+        DFD12_CBD,
+      </if>
+      <if test="cljg != null">
+        DFD12_CLJG,
+      </if>
+      <if test="cldw != null">
+        DFD12_CLDW,
+      </if>
+      <if test="clbm != null">
+        DFD12_CLBM,
+      </if>
+      <if test="gds != null">
+        DFD12_GDS,
+      </if>
+      <if test="ssbz != null">
+        DFD12_SSBZ,
+      </if>
+      <if test="glgd != null">
+        DFD12_GLGD,
+      </if>
+      <if test="wtyyfl != null">
+        DFD12_WTYYFL,
+      </if>
+      <if test="gdfj != null">
+        DFD12_GDFJ,
+      </if>
+      <if test="zrbm != null">
+        DFD12_ZRBM,
+      </if>
+      <if test="gdsj != null">
+        DFD12_GDSJ,
+      </if>
+      <if test="gqsj != null">
+        DFD12_GQSJ,
+      </if>
+      <if test="gqyy != null">
+        DFD12_GQYY,
+      </if>
+      <if test="fwqd != null">
+        DFD12_FWQD,
+      </if>
+      <if test="sjthzryy != null">
+        DFD12_SJTHZRYY,
+      </if>
+      <if test="sjhtzryy2 != null">
+        DFD12_SJHTZRYY2,
+      </if>
+      <if test="gddwg != null">
+        DFD12_GDDWG,
+      </if>
+      <if test="cldwg != null">
+        DFD12_CLDWG,
+      </if>
+      <if test="zby != null">
+        DFD12_ZBY,
+      </if>
+      <if test="ssdwgs != null">
+        DFD12_SSDWGS,
+      </if>
+      <if test="xlsgs != null">
+        DFD12_XLSGS,
+      </if>
+      <if test="ssdw != null">
+        DFD12_SSDW,
+      </if>
+      <if test="xlx1 != null">
+        DFD12_XLX1,
+      </if>
+      <if test="xls2 != null">
+        DFD12_XLS2,
+      </if>
+      <if test="bz != null">
+        DFD12_BZ,
+      </if>
+      <if test="fileId != null">
+        DFD12_FILE_ID,
+      </if>
+      <if test="state != null">
+        DFD12_STATE,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="sequ != null">
+        #{sequ,jdbcType=INTEGER},
+      </if>
+      <if test="gdbh != null">
+        #{gdbh,jdbcType=VARCHAR},
+      </if>
+      <if test="gwgdbh != null">
+        #{gwgdbh,jdbcType=VARCHAR},
+      </if>
+      <if test="zt != null">
+        #{zt,jdbcType=VARCHAR},
+      </if>
+      <if test="dbbs != null">
+        #{dbbs,jdbcType=VARCHAR},
+      </if>
+      <if test="ywlx != null">
+        #{ywlx,jdbcType=VARCHAR},
+      </if>
+      <if test="dqbz != null">
+        #{dqbz,jdbcType=VARCHAR},
+      </if>
+      <if test="slry != null">
+        #{slry,jdbcType=VARCHAR},
+      </if>
+      <if test="slsj != null">
+        #{slsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="slnr != null">
+        #{slnr,jdbcType=VARCHAR},
+      </if>
+      <if test="yhbh != null">
+        #{yhbh,jdbcType=VARCHAR},
+      </if>
+      <if test="yhmc != null">
+        #{yhmc,jdbcType=VARCHAR},
+      </if>
+      <if test="lxdz != null">
+        #{lxdz,jdbcType=VARCHAR},
+      </if>
+      <if test="lxdh != null">
+        #{lxdh,jdbcType=VARCHAR},
+      </if>
+      <if test="hfnr != null">
+        #{hfnr,jdbcType=VARCHAR},
+      </if>
+      <if test="yjfl != null">
+        #{yjfl,jdbcType=VARCHAR},
+      </if>
+      <if test="ejfl != null">
+        #{ejfl,jdbcType=VARCHAR},
+      </if>
+      <if test="ywzl != null">
+        #{ywzl,jdbcType=VARCHAR},
+      </if>
+      <if test="sjdw != null">
+        #{sjdw,jdbcType=VARCHAR},
+      </if>
+      <if test="gddw != null">
+        #{gddw,jdbcType=VARCHAR},
+      </if>
+      <if test="cbd != null">
+        #{cbd,jdbcType=VARCHAR},
+      </if>
+      <if test="cljg != null">
+        #{cljg,jdbcType=VARCHAR},
+      </if>
+      <if test="cldw != null">
+        #{cldw,jdbcType=VARCHAR},
+      </if>
+      <if test="clbm != null">
+        #{clbm,jdbcType=VARCHAR},
+      </if>
+      <if test="gds != null">
+        #{gds,jdbcType=VARCHAR},
+      </if>
+      <if test="ssbz != null">
+        #{ssbz,jdbcType=VARCHAR},
+      </if>
+      <if test="glgd != null">
+        #{glgd,jdbcType=VARCHAR},
+      </if>
+      <if test="wtyyfl != null">
+        #{wtyyfl,jdbcType=VARCHAR},
+      </if>
+      <if test="gdfj != null">
+        #{gdfj,jdbcType=VARCHAR},
+      </if>
+      <if test="zrbm != null">
+        #{zrbm,jdbcType=VARCHAR},
+      </if>
+      <if test="gdsj != null">
+        #{gdsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="gqsj != null">
+        #{gqsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="gqyy != null">
+        #{gqyy,jdbcType=VARCHAR},
+      </if>
+      <if test="fwqd != null">
+        #{fwqd,jdbcType=VARCHAR},
+      </if>
+      <if test="sjthzryy != null">
+        #{sjthzryy,jdbcType=VARCHAR},
+      </if>
+      <if test="sjhtzryy2 != null">
+        #{sjhtzryy2,jdbcType=VARCHAR},
+      </if>
+      <if test="gddwg != null">
+        #{gddwg,jdbcType=VARCHAR},
+      </if>
+      <if test="cldwg != null">
+        #{cldwg,jdbcType=VARCHAR},
+      </if>
+      <if test="zby != null">
+        #{zby,jdbcType=VARCHAR},
+      </if>
+      <if test="ssdwgs != null">
+        #{ssdwgs,jdbcType=VARCHAR},
+      </if>
+      <if test="xlsgs != null">
+        #{xlsgs,jdbcType=VARCHAR},
+      </if>
+      <if test="ssdw != null">
+        #{ssdw,jdbcType=VARCHAR},
+      </if>
+      <if test="xlx1 != null">
+        #{xlx1,jdbcType=VARCHAR},
+      </if>
+      <if test="xls2 != null">
+        #{xls2,jdbcType=VARCHAR},
+      </if>
+      <if test="bz != null">
+        #{bz,jdbcType=VARCHAR},
+      </if>
+      <if test="fileId != null">
+        #{fileId,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.minpay.db.table.model.DwFileDetail12Example" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from dw_file_detail_12
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update dw_file_detail_12
+    <set>
+      <if test="record.id != null">
+        DFD12_ID = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sequ != null">
+        DFD12_SEQU = #{record.sequ,jdbcType=INTEGER},
+      </if>
+      <if test="record.gdbh != null">
+        DFD12_GDBH = #{record.gdbh,jdbcType=VARCHAR},
+      </if>
+      <if test="record.gwgdbh != null">
+        DFD12_GWGDBH = #{record.gwgdbh,jdbcType=VARCHAR},
+      </if>
+      <if test="record.zt != null">
+        DFD12_ZT = #{record.zt,jdbcType=VARCHAR},
+      </if>
+      <if test="record.dbbs != null">
+        DFD12_DBBS = #{record.dbbs,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ywlx != null">
+        DFD12_YWLX = #{record.ywlx,jdbcType=VARCHAR},
+      </if>
+      <if test="record.dqbz != null">
+        DFD12_DQBZ = #{record.dqbz,jdbcType=VARCHAR},
+      </if>
+      <if test="record.slry != null">
+        DFD12_SLRY = #{record.slry,jdbcType=VARCHAR},
+      </if>
+      <if test="record.slsj != null">
+        DFD12_SLSJ = #{record.slsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.slnr != null">
+        DFD12_SLNR = #{record.slnr,jdbcType=VARCHAR},
+      </if>
+      <if test="record.yhbh != null">
+        DFD12_YHBH = #{record.yhbh,jdbcType=VARCHAR},
+      </if>
+      <if test="record.yhmc != null">
+        DFD12_YHMC = #{record.yhmc,jdbcType=VARCHAR},
+      </if>
+      <if test="record.lxdz != null">
+        DFD12_LXDZ = #{record.lxdz,jdbcType=VARCHAR},
+      </if>
+      <if test="record.lxdh != null">
+        DFD12_LXDH = #{record.lxdh,jdbcType=VARCHAR},
+      </if>
+      <if test="record.hfnr != null">
+        DFD12_HFNR = #{record.hfnr,jdbcType=VARCHAR},
+      </if>
+      <if test="record.yjfl != null">
+        DFD12_YJFL = #{record.yjfl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ejfl != null">
+        DFD12_EJFL = #{record.ejfl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ywzl != null">
+        DFD12_YWZL = #{record.ywzl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sjdw != null">
+        DFD12_SJDW = #{record.sjdw,jdbcType=VARCHAR},
+      </if>
+      <if test="record.gddw != null">
+        DFD12_GDDW = #{record.gddw,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cbd != null">
+        DFD12_CBD = #{record.cbd,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cljg != null">
+        DFD12_CLJG = #{record.cljg,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cldw != null">
+        DFD12_CLDW = #{record.cldw,jdbcType=VARCHAR},
+      </if>
+      <if test="record.clbm != null">
+        DFD12_CLBM = #{record.clbm,jdbcType=VARCHAR},
+      </if>
+      <if test="record.gds != null">
+        DFD12_GDS = #{record.gds,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ssbz != null">
+        DFD12_SSBZ = #{record.ssbz,jdbcType=VARCHAR},
+      </if>
+      <if test="record.glgd != null">
+        DFD12_GLGD = #{record.glgd,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wtyyfl != null">
+        DFD12_WTYYFL = #{record.wtyyfl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.gdfj != null">
+        DFD12_GDFJ = #{record.gdfj,jdbcType=VARCHAR},
+      </if>
+      <if test="record.zrbm != null">
+        DFD12_ZRBM = #{record.zrbm,jdbcType=VARCHAR},
+      </if>
+      <if test="record.gdsj != null">
+        DFD12_GDSJ = #{record.gdsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.gqsj != null">
+        DFD12_GQSJ = #{record.gqsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.gqyy != null">
+        DFD12_GQYY = #{record.gqyy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fwqd != null">
+        DFD12_FWQD = #{record.fwqd,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sjthzryy != null">
+        DFD12_SJTHZRYY = #{record.sjthzryy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sjhtzryy2 != null">
+        DFD12_SJHTZRYY2 = #{record.sjhtzryy2,jdbcType=VARCHAR},
+      </if>
+      <if test="record.gddwg != null">
+        DFD12_GDDWG = #{record.gddwg,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cldwg != null">
+        DFD12_CLDWG = #{record.cldwg,jdbcType=VARCHAR},
+      </if>
+      <if test="record.zby != null">
+        DFD12_ZBY = #{record.zby,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ssdwgs != null">
+        DFD12_SSDWGS = #{record.ssdwgs,jdbcType=VARCHAR},
+      </if>
+      <if test="record.xlsgs != null">
+        DFD12_XLSGS = #{record.xlsgs,jdbcType=VARCHAR},
+      </if>
+      <if test="record.ssdw != null">
+        DFD12_SSDW = #{record.ssdw,jdbcType=VARCHAR},
+      </if>
+      <if test="record.xlx1 != null">
+        DFD12_XLX1 = #{record.xlx1,jdbcType=VARCHAR},
+      </if>
+      <if test="record.xls2 != null">
+        DFD12_XLS2 = #{record.xls2,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bz != null">
+        DFD12_BZ = #{record.bz,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fileId != null">
+        DFD12_FILE_ID = #{record.fileId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.state != null">
+        DFD12_STATE = #{record.state,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update dw_file_detail_12
+    set DFD12_ID = #{record.id,jdbcType=VARCHAR},
+      DFD12_SEQU = #{record.sequ,jdbcType=INTEGER},
+      DFD12_GDBH = #{record.gdbh,jdbcType=VARCHAR},
+      DFD12_GWGDBH = #{record.gwgdbh,jdbcType=VARCHAR},
+      DFD12_ZT = #{record.zt,jdbcType=VARCHAR},
+      DFD12_DBBS = #{record.dbbs,jdbcType=VARCHAR},
+      DFD12_YWLX = #{record.ywlx,jdbcType=VARCHAR},
+      DFD12_DQBZ = #{record.dqbz,jdbcType=VARCHAR},
+      DFD12_SLRY = #{record.slry,jdbcType=VARCHAR},
+      DFD12_SLSJ = #{record.slsj,jdbcType=TIMESTAMP},
+      DFD12_SLNR = #{record.slnr,jdbcType=VARCHAR},
+      DFD12_YHBH = #{record.yhbh,jdbcType=VARCHAR},
+      DFD12_YHMC = #{record.yhmc,jdbcType=VARCHAR},
+      DFD12_LXDZ = #{record.lxdz,jdbcType=VARCHAR},
+      DFD12_LXDH = #{record.lxdh,jdbcType=VARCHAR},
+      DFD12_HFNR = #{record.hfnr,jdbcType=VARCHAR},
+      DFD12_YJFL = #{record.yjfl,jdbcType=VARCHAR},
+      DFD12_EJFL = #{record.ejfl,jdbcType=VARCHAR},
+      DFD12_YWZL = #{record.ywzl,jdbcType=VARCHAR},
+      DFD12_SJDW = #{record.sjdw,jdbcType=VARCHAR},
+      DFD12_GDDW = #{record.gddw,jdbcType=VARCHAR},
+      DFD12_CBD = #{record.cbd,jdbcType=VARCHAR},
+      DFD12_CLJG = #{record.cljg,jdbcType=VARCHAR},
+      DFD12_CLDW = #{record.cldw,jdbcType=VARCHAR},
+      DFD12_CLBM = #{record.clbm,jdbcType=VARCHAR},
+      DFD12_GDS = #{record.gds,jdbcType=VARCHAR},
+      DFD12_SSBZ = #{record.ssbz,jdbcType=VARCHAR},
+      DFD12_GLGD = #{record.glgd,jdbcType=VARCHAR},
+      DFD12_WTYYFL = #{record.wtyyfl,jdbcType=VARCHAR},
+      DFD12_GDFJ = #{record.gdfj,jdbcType=VARCHAR},
+      DFD12_ZRBM = #{record.zrbm,jdbcType=VARCHAR},
+      DFD12_GDSJ = #{record.gdsj,jdbcType=TIMESTAMP},
+      DFD12_GQSJ = #{record.gqsj,jdbcType=TIMESTAMP},
+      DFD12_GQYY = #{record.gqyy,jdbcType=VARCHAR},
+      DFD12_FWQD = #{record.fwqd,jdbcType=VARCHAR},
+      DFD12_SJTHZRYY = #{record.sjthzryy,jdbcType=VARCHAR},
+      DFD12_SJHTZRYY2 = #{record.sjhtzryy2,jdbcType=VARCHAR},
+      DFD12_GDDWG = #{record.gddwg,jdbcType=VARCHAR},
+      DFD12_CLDWG = #{record.cldwg,jdbcType=VARCHAR},
+      DFD12_ZBY = #{record.zby,jdbcType=VARCHAR},
+      DFD12_SSDWGS = #{record.ssdwgs,jdbcType=VARCHAR},
+      DFD12_XLSGS = #{record.xlsgs,jdbcType=VARCHAR},
+      DFD12_SSDW = #{record.ssdw,jdbcType=VARCHAR},
+      DFD12_XLX1 = #{record.xlx1,jdbcType=VARCHAR},
+      DFD12_XLS2 = #{record.xls2,jdbcType=VARCHAR},
+      DFD12_BZ = #{record.bz,jdbcType=VARCHAR},
+      DFD12_FILE_ID = #{record.fileId,jdbcType=VARCHAR},
+      DFD12_STATE = #{record.state,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+</mapper>

src/main/resources/com/minpay/db/table/own/mapper/ReportBatchMapper.xml

@@ -145,6 +145,68 @@
         </foreach>
         ) A
     </insert>
+    <!--95598工单-->
+    <insert id="insert95598gdReport">
+        INSERT INTO DW_FILE_DETAIL_12 (DFD12_ID,DFD12_SEQU,DFD12_GDBH,DFD12_GWGDBH,DFD12_ZT,DFD12_DBBS,DFD12_YWLX,DFD12_DQBZ,
+        DFD12_SLRY,DFD12_SLSJ, DFD12_SLNR, DFD12_YHBH, DFD12_YHMC, DFD12_LXDZ, DFD12_LXDH, DFD12_HFNR, DFD12_YJFL, DFD12_EJFL,
+        DFD12_YWZL,DFD12_SJDW,DFD12_GDDW,DFD12_CBD,DFD12_CLJG,DFD12_CLDW,DFD12_CLBM,DFD12_GDS,DFD12_SSBZ,DFD12_GLGD,DFD12_WTYYFL,
+        DFD12_GDFJ,DFD12_ZRBM,DFD12_GDSJ,DFD12_GQSJ,DFD12_GQYY,DFD12_FWQD,DFD12_SJTHZRYY,DFD12_SJHTZRYY2,DFD12_GDDWG,DFD12_CLDWG,
+        DFD12_ZBY,DFD12_SSDWGS,DFD12_XLSGS,DFD12_SSDW,DFD12_XLX1,DFD12_XLS2,DFD12_BZ,DFD12_FILE_ID,DFD12_STATE)
+        SELECT A.* FROM (
+        <foreach collection="list" item="item" index="index" separator="UNION ALL">
+            SELECT
+            #{item.id}		 id,
+            #{item.sequ}     sequ,
+            #{item.gdbh}     gdbh,
+            #{item.gwgdbh}   gwgdbh,
+            #{item.zt}       zt,
+            #{item.dbbs}     dbbs,
+            #{item.ywlx}     ywlx,
+            #{item.dqbz}     dqbz,
+            #{item.slry}     slry,
+            #{item.slsj}     slsj,
+            #{item.slnr}     slnr,
+            #{item.yhbh}     yhbh,
+            #{item.yhmc}     yhmc,
+            #{item.lxdz}     lxdz,
+            #{item.lxdh}     lxdh,
+            #{item.hfnr}     hfnr,
+            #{item.yjfl}     yjfl,
+            #{item.ejfl}     ejfl,
+            #{item.ywzl}     ywzl,
+            #{item.sjdw}     sjdw,
+            #{item.gddw}     gddw,
+            #{item.cbd}      cbd,
+            #{item.cljg}     cljg,
+            #{item.cldw}     cldw,
+            #{item.clbm}     clbm,
+            #{item.gds}      gds,
+            #{item.ssbz}     ssbz,
+            #{item.glgd}     glgd,
+            #{item.wtyyfl}   wtyyfl,
+            #{item.gdfj}     gdfj,
+            #{item.zrbm}     zrbm,
+            #{item.gdsj}     gdsj,
+            #{item.gqsj}     gqsj,
+            #{item.gqyy}     gqyy,
+            #{item.fwqd}     fwqd,
+            #{item.sjthzryy} sjthzryy,
+            #{item.sjhtzryy2} sjhtzryy2,
+            #{item.gddwg}    gddwg,
+            #{item.cldwg}    cldwg,
+            #{item.zby}      zby,
+            #{item.ssdwgs}   ssdwgs,
+            #{item.xlsgs}    xlsgs,
+            #{item.ssdw}     ssdw,
+            #{item.xlx1}     xlx1,
+            #{item.xls2}     xls2,
+            #{item.bz}       bz,
+            #{item.fileId} fid,
+            0 state
+            FROM DUAL
+        </foreach>
+        ) A
+    </insert>
     <!--线路重过载查询-->
     <select id="selectXlgzzData" resultType="map" parameterType="map">
         SELECT

src/main/webapp/admin/ddy/reportManageDetailDdyRb.html

@@ -46,7 +46,7 @@
 	function reportTable(excelList, typeId,isType,isEdit) {
 		var html = '';
 		if(isType){
-			html = '<tr><td colspan = "'+excelList[1].length+'">'+excelList[0]+'</td></tr>';
+			html = '<tr><td style="text-align:left" colspan = "'+excelList[1].length+'" >'+excelList[0]+'</td></tr>';
 		}
 		for (var i = 0; i < excelList.length; i ++) {
 			if(i==0){

src/main/webapp/admin/ddy/reportManageDetailDdyZb.html

@@ -9,7 +9,7 @@
 <body class="content">
 	<div class="shadow-content" style="margin:1.5rem; text-align: center;">
 		<p id = "reportTitle" style="margin:15px; font-size : 20px"></p>
-		<p id = "reportDiv"></p>
+		<p id = "reportDiv" class="reportDesc"></p>
     	<table id="reportTable" class="layui-table"></table>
 	</div>
     <script>

src/main/webapp/admin/gdy/reportManageDetailGdy.html

@@ -9,6 +9,7 @@
 <body class="content">
 	<div class="shadow-content" style="margin:1.5rem; text-align: center;">
 		<p id = "reportTitle" style="margin:15px; font-size : 20px"></p>
+        <p id = "reportDesc" class="reportDesc"></p>
     	<table id="reportTable" class="layui-table"></table>
 	</div>
     <script>
@@ -18,9 +19,8 @@
 	var dayInterval = getQueryString("dayInterval");	//日区间
 	var type = getQueryString("type");		//报告类型00:excel 01:word
 	var typeId = getQueryString("typeId");	//报告类型id
-	
 	var cols = null;
-	
+    var table;
 	// excel
 	if ("00" == type) {
 		$("#reportTitle").html(fileName);
@@ -44,10 +44,12 @@
 	}
 	
 	function reportTable(excelList, typeId,isType,isEdit) {
-		var html = '';
+
 		if(isType){
-			html = '<tr><td colspan = "'+excelList[1].length+'">'+excelList[0]+'</td></tr>';
+		    $("#reportDesc").html(excelList[0]);
+			// html = '<tr><td style="text-align: left;padding: 0 5px;max-width: 900px;" colspan = "'+excelList[1].length+'">'+excelList[0]+'</td></tr>';
 		}
+        var html = '';
 		for (var i = 0; i < excelList.length; i ++) {
 			if(i==0){
 				continue;

src/main/webapp/admin/jtfjt/reportManageJtfjt.html

@@ -56,11 +56,16 @@
 		$("#content").slideToggle();
 	});
 	var pageId = "270000";
+
 	// 报表类型
 	var reportType = getQueryString("reportType")
 	
 	var timeType = getQueryString("timeType");// 00日报01周报02月报
-	
+	if(timeType == "01"){
+		pageId = "270001"
+	}else if(timeType == "02"){
+		pageId = "270002"
+	}
      var table;
      var form;
      layui.use(['table','laydate','form'], function(){

src/main/webapp/admin/jtfjt/reportProduceJtfjt.html

@@ -58,9 +58,9 @@
 	</div>
 	<div name = "step" style = "width: 80%; margin-left : 10%;height : 300px; display : none; text-align : center;">
 		<div style = "width: 80%; margin-left : 0px; height : 200px" class = "layui-upload-drag" >
-		  	<input type="text" style = "display : inline-block" class="layui-input" id="dayRange" placeholder="请选择报表日期">
-		  	<input type="text" style = "display : inline-block" class="layui-input" id="dateRange" placeholder="请选择报表日期范围">
-		  	<input type="text" style = "display : inline-block" class="layui-input" id="timeRange" placeholder="请选择报表时间段">
+		  	<input type="text" style = "display : inline-block" class="layui-input" id="dayRange" placeholder="请选择报表日期" readonly>
+		  	<input type="text" style = "display : inline-block" class="layui-input" id="dateRange" placeholder="请选择报表日期范围" readonly>
+		  	<input type="text" style = "display : inline-block" class="layui-input" id="timeRange" placeholder="请选择报表时间段" readonly>
 		</div>
 		<div style="margin-top : 50px;">
 	      <button type="button" class="layui-btn" style = "width : 214px" onclick = "tableYulan()">下一步</button>
@@ -116,7 +116,6 @@
 				elem : '#dayRange'
 				,format : 'yyyyMMdd'
 				,done: function(value, date, endDate){
-					console.log(value); //得到日期生成的值，如：2017-08-18
 					var fileName = $("#fileName").html();
 					if (fileName.indexOf("-") != -1) {
 						$("#fileName").html(fileName.split("-")[0]+value);
@@ -131,7 +130,6 @@
 				,format : 'yyyyMMdd'
 				,range : true
 				,done: function(value, date, endDate){
-					console.log(value); //得到日期生成的值，如：2017-08-18
 					var fileName = $("#fileName").html();
 					if (fileName.indexOf("-") != -1) {
 						$("#fileName").html(fileName.split("-")[0]+value);
@@ -352,8 +350,6 @@
 							$("#reportDiv").show();
 							resJsonStr = data.data;
 							var descStr = data.data.descStr;
-							console.log(dataMap);
-							console.log(descStr);
 							$("#reportDiv").html(descStr);
 							
 							/* var tableHtml = '<table class="layui-table">';
@@ -368,8 +364,6 @@
 							resJsonStr = data.data;
 							var dataMap = data.data.dataMap;
 							var descStr = data.data.descStr;
-							console.log(dataMap);
-							console.log(descStr);
 							/* for(var key in dataMap){
 								var replaceStr = "${" + key + "}";
 								if (key == "totalCountTwice") {
@@ -385,7 +379,7 @@
 							var tableHtml = '<table class="layui-table">';
 							// 周报
 							if (timeType == '01') {
-								var excelList = data.data.excelList;
+								var excelList = data.data.excelList | [];
 								for (var i = 0; i < excelList.length; i ++) {
 									tableHtml += '<tr>';
 									var childList = excelList[i];

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

@@ -304,6 +304,55 @@
             {field:'gdsj',title:'归档时间',width:140},
             {field:'zdbm',title:'终端编码',width:150}
         ]]
+    }else if("1000012" == fileType){
+        cols = [[
+            {field:'sequ',title:'序号',width:60},
+            {field:'gdbh',title:'工单编号',width:120},
+            {field:'gwgdbh',title:'国网工单编号',width:120},
+            {field:'zt',title:'状态',width:120},
+            {field:'dbbs',title:'督办标识',width:120},
+            {field:'ywlx',title:'业务类型',width:120},
+            {field:'dqbz',title:'当前步骤',width:120},
+            {field:'slry',title:'受理人员',width:120},
+            {field:'slsj',title:'受理时间',width:150},
+            {field:'slnr',title:'受理内容',width:120},
+            {field:'yhbh',title:'用户编号',width:120},
+            {field:'yhmc',title:'用户名称',width:120},
+            {field:'lxdz',title:'联系地址',width:120},
+            {field:'lxdh',title:'联系电话',width:120},
+            {field:'hfnr',title:'回访内容',width:120},
+            {field:'yjfl',title:'一级分类',width:120},
+            {field:'ejfl',title:'二级分类',width:120},
+            {field:'ywzl',title:'业务子类',width:120},
+            {field:'sjdw',title:'上级单位',width:120},
+            {field:'gddw',title:'供电单位',width:120},
+            {field:'cbd',title:'抄表段',width:120},
+            {field:'cljg',title:'处理结果',width:120},
+            {field:'cldw',title:'处理单位',width:120},
+            {field:'clbm',title:'处理部门',width:120},
+            {field:'gds',title:'供电所',width:120},
+            {field:'ssbz',title:'班组',width:120},
+            {field:'glgd',title:'关联工单',width:120},
+            {field:'wtyyfl',title:'问题原因分类',width:120},
+            {field:'gdfj',title:'工单分级',width:120},
+            {field:'zrbm',title:'责任部门',width:120},
+            {field:'gdsj',title:'归档时间',width:150},
+            {field:'gqsj',title:'挂起时间',width:150},
+            {field:'gqyy',title:'挂起原因',width:120},
+            {field:'fwqd',title:'服务渠道',width:120},
+            {field:'sjthzryy',title:'省级回退责任原因',width:120},
+            {field:'sjhtzryy2',title:'省级回退责任原因',width:120},
+            {field:'gddwg',title:'供电单位-改',width:120},
+            {field:'cldwg',title:'处理单位-改',width:120},
+            {field:'zby',title:'指标月',width:120},
+            {field:'ssdwgs',title:'所属单位-公式',width:120},
+            {field:'xlsgs',title:'新类型-公式',width:120},
+            {field:'ssdw',title:'所属单位',width:120},
+            {field:'xlx1',title:'新类型1',width:120},
+            {field:'xls2',title:'新类型2(子类)',width:120},
+            {field:'bz',title:'备注',width:120},
+            {field:'fileId',title:'所属文件ID',width:120}
+        ]]
     }
 	
      var table;

src/main/webapp/admin/tqtd/reportManageUpdateTqtd.html

@@ -44,7 +44,6 @@
 			var resJSON = eval('(' + data.data.data + ')');
 			var reportDataJson = resJSON.dataMap;
 			var reportDesc = resJSON.descStr;
-			
 			if (!isEmpty(reportDataJson)) {
 				for(var key in reportDataJson){
 					var replaceStr = "${" + key + "}";
@@ -281,7 +280,12 @@
 		if (!isEmpty(excelList)) {
 			reportData.excelList = excelList;
 		}
+        descStr = descStr.replaceAll("<table border=\"1\"></table>","");
+		if(descStr.indexOf("<table") > 0){
+            descStr = descStr.substr(0,descStr.indexOf("<table"));
+        }
 		reportData.descStr = descStr;
+
 		$.request({
 			action : 'ReportManageAction/reportInfUpdate',
 			data : {

src/main/webapp/css/base.css

@@ -712,4 +712,12 @@ p{
 }
 .yellow-line{
 	background: #FFD900;
+}
+/**********表格滚动条与表格留出间距*************/
+.layui-table-body{
+	padding-bottom: 10px;
+}
+.reportDesc{
+	text-align: left;
+	padding: 2px 5px;
 }