添加低电压分析表头说明

src/main/java/com/minpay/db/table/model/DwFileDetail05.java

@@ -276,6 +276,22 @@ public class DwFileDetail05 extends AbstractMINBean {
     private String fileId;
 
     /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_05.DFD5_GDS
+     *
+     * @mbggenerated
+     */
+    private String gds;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dw_file_detail_05.DFD5_BZ
+     *
+     * @mbggenerated
+     */
+    private String bz;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column dw_file_detail_05.DFD5_ID
      *
@@ -1090,4 +1106,52 @@ public class DwFileDetail05 extends AbstractMINBean {
     public void setFileId(String fileId) {
         this.fileId = fileId == null ? null : fileId.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_05.DFD5_GDS
+     *
+     * @return the value of dw_file_detail_05.DFD5_GDS
+     *
+     * @mbggenerated
+     */
+    public String getGds() {
+        return gds;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_05.DFD5_GDS
+     *
+     * @param gds the value for dw_file_detail_05.DFD5_GDS
+     *
+     * @mbggenerated
+     */
+    public void setGds(String gds) {
+        this.gds = gds == null ? null : gds.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dw_file_detail_05.DFD5_BZ
+     *
+     * @return the value of dw_file_detail_05.DFD5_BZ
+     *
+     * @mbggenerated
+     */
+    public String getBz() {
+        return bz;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dw_file_detail_05.DFD5_BZ
+     *
+     * @param bz the value for dw_file_detail_05.DFD5_BZ
+     *
+     * @mbggenerated
+     */
+    public void setBz(String bz) {
+        this.bz = bz == null ? null : bz.trim();
+    }
 }

src/main/java/com/minpay/db/table/model/DwFileDetail05Example.java

@@ -2841,6 +2841,162 @@ public class DwFileDetail05Example {
             addCriterion("DFD5_FILE_ID not between", value1, value2, "fileId");
             return (Criteria) this;
         }
+
+        public Criteria andGdsIsNull() {
+            addCriterion("DFD5_GDS is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGdsIsNotNull() {
+            addCriterion("DFD5_GDS is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGdsEqualTo(String value) {
+            if(value == null ){
+                andGdsIsNull();
+            } else {
+                addCriterion("DFD5_GDS =", value, "gds");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andGdsNotEqualTo(String value) {
+            if(value == null ){
+                andGdsIsNotNull();
+            } else {
+                addCriterion("DFD5_GDS <>", value, "gds");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andGdsGreaterThan(String value) {
+            addCriterion("DFD5_GDS >", value, "gds");
+            return (Criteria) this;
+        }
+
+        public Criteria andGdsGreaterThanOrEqualTo(String value) {
+            addCriterion("DFD5_GDS >=", value, "gds");
+            return (Criteria) this;
+        }
+
+        public Criteria andGdsLessThan(String value) {
+            addCriterion("DFD5_GDS <", value, "gds");
+            return (Criteria) this;
+        }
+
+        public Criteria andGdsLessThanOrEqualTo(String value) {
+            addCriterion("DFD5_GDS <=", value, "gds");
+            return (Criteria) this;
+        }
+
+        public Criteria andGdsLike(String value) {
+            addCriterion("DFD5_GDS like", value, "gds");
+            return (Criteria) this;
+        }
+
+        public Criteria andGdsNotLike(String value) {
+            addCriterion("DFD5_GDS not like", value, "gds");
+            return (Criteria) this;
+        }
+
+        public Criteria andGdsIn(List<String> values) {
+            addCriterion("DFD5_GDS in", values, "gds");
+            return (Criteria) this;
+        }
+
+        public Criteria andGdsNotIn(List<String> values) {
+            addCriterion("DFD5_GDS not in", values, "gds");
+            return (Criteria) this;
+        }
+
+        public Criteria andGdsBetween(String value1, String value2) {
+            addCriterion("DFD5_GDS between", value1, value2, "gds");
+            return (Criteria) this;
+        }
+
+        public Criteria andGdsNotBetween(String value1, String value2) {
+            addCriterion("DFD5_GDS not between", value1, value2, "gds");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzIsNull() {
+            addCriterion("DFD5_BZ is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzIsNotNull() {
+            addCriterion("DFD5_BZ is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzEqualTo(String value) {
+            if(value == null ){
+                andBzIsNull();
+            } else {
+                addCriterion("DFD5_BZ =", value, "bz");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andBzNotEqualTo(String value) {
+            if(value == null ){
+                andBzIsNotNull();
+            } else {
+                addCriterion("DFD5_BZ <>", value, "bz");
+            }
+            return (Criteria) this;
+        }
+
+        public Criteria andBzGreaterThan(String value) {
+            addCriterion("DFD5_BZ >", value, "bz");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzGreaterThanOrEqualTo(String value) {
+            addCriterion("DFD5_BZ >=", value, "bz");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzLessThan(String value) {
+            addCriterion("DFD5_BZ <", value, "bz");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzLessThanOrEqualTo(String value) {
+            addCriterion("DFD5_BZ <=", value, "bz");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzLike(String value) {
+            addCriterion("DFD5_BZ like", value, "bz");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzNotLike(String value) {
+            addCriterion("DFD5_BZ not like", value, "bz");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzIn(List<String> values) {
+            addCriterion("DFD5_BZ in", values, "bz");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzNotIn(List<String> values) {
+            addCriterion("DFD5_BZ not in", values, "bz");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzBetween(String value1, String value2) {
+            addCriterion("DFD5_BZ between", value1, value2, "bz");
+            return (Criteria) this;
+        }
+
+        public Criteria andBzNotBetween(String value1, String value2) {
+            addCriterion("DFD5_BZ not between", value1, value2, "bz");
+            return (Criteria) this;
+        }
     }
 
     /**

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

@@ -54,37 +54,37 @@ public class DataWareManageAction implements IMINAction {
     private IMINDataBaseService db;
     /** 原始数据查询 */
     public final static String FILE_INF_QUERY = "fileInfQuery";
-    
+
     /** 原始文件上传 */
     public final static String FILE_INF_UPLOAD = "fileInfUpload";
-    
+
     /** 原始文件下载 */
     public final static String FILE_INF_DOWNLOAD = "fileInfDownload";
-    
+
     /** 原始文件删除 */
     public final static String FILE_INF_DELETE = "fileInfDelete";
-    
+
     /** 原始文件详情 */
     public final static String FILE_INF_DETAIL = "fileInfDetail";
-    
+
     /** 原始数据下载 */
     public final static String FILE_DATA_DOWNLOAD = "fileDataDownload";
 
 
     /**
-     * 原始数据查询 
+     * 原始数据查询
      * @param page
      * @param limit
      * @param date
      * @param fileName
      * @return
      * @throws MINBusinessException
-     * @throws InvocationTargetException 
-     * @throws IllegalArgumentException 
-     * @throws IllegalAccessException 
-     * @throws SecurityException 
-     * @throws NoSuchMethodException 
-     * @throws InstantiationException 
+     * @throws InvocationTargetException
+     * @throws IllegalArgumentException
+     * @throws IllegalAccessException
+     * @throws SecurityException
+     * @throws NoSuchMethodException
+     * @throws InstantiationException
      */
     @MINAction(value = FILE_INF_QUERY)
     public MINActionResult fileInfQuery(
@@ -103,11 +103,11 @@ public class DataWareManageAction implements IMINAction {
 		MINRowBounds rows = new MINRowBounds(page, limit);
 		rows.setSeparateSql(true);
 		Map<String, Object> param = new HashMap<String, Object>();
-		
+
 		param.put("date", StringUtil.ObjectToString(date).replaceAll("-",""));
 		param.put("fileName", fileName);
 		param.put("type", type);
-		
+
 		if (!CommonUtil.isEmpty(notInData)) {
 			JSONArray notInArray = JSONArray.fromObject(notInData);
 			if (notInArray.size() != 0) {
@@ -123,40 +123,40 @@ public class DataWareManageAction implements IMINAction {
 				param.put("fileTypeArray", selectByExample);
 			}
 		}
-		
+
 		User user = session.getUser();
 		String roleId = user.getRoleId();
-		
+
 		// 非系统管理员
 		if (!Constant.ROLE_ID.equals(roleId)) {
 			param.put("branchId", user.getBranchid());
 		}
-		
+
 		List<Map<String, String>> list = db.getMybatisMapper(DataWareManageMapper.class)
 												.selectFileInf(param, rows);
-		
+
 		if (list.size() == 0) {
 			return res;
 		}
-		
+
 		List<String> creatUserIdList = CommonUtil.getIdFromList(list, "creatUser");
 		ImUserExample userExam = new ImUserExample();
 		userExam.createCriteria().andIdIn(creatUserIdList);
 		List<ImUser> userList = db.selectByExample(ImUserMapper.class, userExam);
-		
+
 		String[] str1 = {"creatUser"};
 		String[] str2 = {"id"};
 		String[] str3 = {"name"};
 		String[] str4 = {"userName"};
 		list = ListUtil.mergeList(list, userList, str1, str2, str3, str4);
-		
+
 		list = Service.lookup(IFormatService.class).formatDate(list, "uploadDate");
 		// 设置返回值
 		res.set(IMINBusinessConstant.F_PAGING_LAY, list);
 		res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getCount());
 		return res;
     }
-    
+
     /**
      * 上传原始文件
      * @param request
@@ -177,14 +177,14 @@ public class DataWareManageAction implements IMINAction {
     		) throws MINBusinessException, InvalidFormatException, IOException, ParseException {
     	MINActionResult res = new MINActionResult();
     	db = Service.lookup(IMINDataBaseService.class);
-		
+
 		// 获取文件
 		FileItem fileItem = request.getFile("file");
 		String fileName = fileItem.getName();
 		if (!fileName.endsWith(".xlsx") && !fileName.endsWith(".xls")) {
 			throw new MINBusinessException("文件格式错误!");
 		}
-		
+
 		String fileId = db.getMybatisMapper(SequenceMapper.class).getSequence("FILE_INF_NO");
 		List<Map<String,String>> list = null;
 		// 台区停电
@@ -192,18 +192,18 @@ public class DataWareManageAction implements IMINAction {
 			// 获取表格信息
 			String[] titleKey = new String[]{"number","addressNum","addressName","date", "area","comonpanyName","terminalName","terminalNum","terminalAddress","startTime","endTime"};
 			list = FilesUtil.readExecleasy(fileItem, titleKey, 1);
-			
+
 			if (list.size() == 0) {
 				throw new MINBusinessException("无数据，请添加数据");//无数据，请添加数据
 			}
-			
+
 			// 详情数据存入数据库
 			for (Map<String,String> excelMap : list) {
 				// 日期
 				String date = excelMap.get("date").replaceAll("-", "").replaceAll(":", "").replaceAll(" ", "").substring(0,8);
 				String startTime = excelMap.get("startTime").replaceAll("-", "").replaceAll(":", "").replaceAll(" ", "");
 				String endTime = excelMap.get("endTime").replaceAll("-", "").replaceAll(":", "").replaceAll(" ", "");
-				
+
 				// 页面确认有重复数据,且点击确认上传,不再判断数据库是否有数据
 				if (!chongfuFlag) {
 					// 验证是否有重复数据
@@ -223,7 +223,7 @@ public class DataWareManageAction implements IMINAction {
 						throw new MINBusinessException("chongfu|" + selectByExample.get(0).getAddressNum() + "|" + selectByExample.get(0).getAddressName() + "|" + selectByExample.get(0).getDate());
 					}
 				}
-				
+
 				String fileDetailId = db.getMybatisMapper(SequenceMapper.class).getSequence("FILE_DETAIL_00_NO");
 				DwFileDetail00 fileDetail00 = new DwFileDetail00();
 				fileDetail00.setId(fileDetailId);
@@ -245,11 +245,11 @@ public class DataWareManageAction implements IMINAction {
 		} else if (Constant.FILE_DETAIL_TYPE_01.equals(fileType)) {
 			String[] titleKey = new String[]{"id","tname","cmode","value", "facname","type","fdid","yxstatus","tytime"};
 			list = FilesUtil.readExecleasy(fileItem, titleKey, 1);
-			
+
 			if (list.size() == 0) {
 				throw new MINBusinessException("无数据，请添加数据");//无数据，请添加数据
 			}
-			
+
 			// 详情数据存入数据库
 			for (Map<String,String> excelMap : list) {
 				DwFileDetail01Example dwFileDetail01 = new DwFileDetail01Example();
@@ -285,11 +285,11 @@ public class DataWareManageAction implements IMINAction {
 		} else if (Constant.FILE_DETAIL_TYPE_02.equals(fileType)) {
 			String[] titleKey = new String[]{"no","beginTime","endTime","gdlx", "cxbdz","xlmc","xllx","qdfa","gzqjpd","gzqhdhf","gzgl"};
 			list = FilesUtil.readExecleasy(fileItem, titleKey, 1);
-			
+
 			if (list.size() == 0) {
 				throw new MINBusinessException("无数据，请添加数据");//无数据，请添加数据
 			}
-			
+
 			// 详情数据存入数据库
 			for (Map<String,String> excelMap : list) {
 				String fileDetailId = db.getMybatisMapper(SequenceMapper.class).getSequence("FILE_DETAIL_02_NO");
@@ -311,9 +311,9 @@ public class DataWareManageAction implements IMINAction {
 			}
 		//低电压
 		} else if(Constant.FILE_DETAIL_TYPE_03.equals(fileType)) {
-			String[] titleKey = new String[]{"no","sgsmc","xgsmc","bdzmc","xlmc","tqid","byqmc","yhgldw1","yhid","yhmc","yhgldw2","dymax","dymin","dyhgl","csxl","cxxl","dysc","gdlx","ljts","sjrq","gddw"};         
+			String[] titleKey = new String[]{"no","sgsmc","xgsmc","bdzmc","xlmc","tqid","byqmc","yhgldw1","yhid","yhmc","yhgldw2","dymax","dymin","dyhgl","csxl","cxxl","dysc","gdlx","ljts","sjrq","gddw"};
 			list = FilesUtil.readExecleasy(fileItem, titleKey, 3);
-			
+
 			if (list.size() == 0) {
 				throw new MINBusinessException("无数据，请添加数据");//无数据，请添加数据
 			}
@@ -360,9 +360,9 @@ public class DataWareManageAction implements IMINAction {
 			}
 		//过电压
 		} else if(Constant.FILE_DETAIL_TYPE_04.equals(fileType)) {
-			String[] titleKey = new String[]{"no","sgsmc","xgsmc","bdzmc","xlmc","tqid","byqmc","yhgldw1","yhid","yhmc","yhgldw2","dymax","dymin","dyhgl","csxl","cxxl","gdysc","gdlx","ljts","gddw","sjrq"};         
+			String[] titleKey = new String[]{"no","sgsmc","xgsmc","bdzmc","xlmc","tqid","byqmc","yhgldw1","yhid","yhmc","yhgldw2","dymax","dymin","dyhgl","csxl","cxxl","gdysc","gdlx","ljts","gddw","sjrq"};
 			list = FilesUtil.readExecleasy(fileItem, titleKey, 1);
-			
+
 			if (list.size() == 0) {
 				throw new MINBusinessException("无数据，请添加数据");//无数据，请添加数据
 			}
@@ -412,7 +412,7 @@ public class DataWareManageAction implements IMINAction {
 		// 95598工单原始数据上传
 		} else if(Constant.FILE_DETAIL_TYPE_05.equals(fileType)) {
 			String[] titleKey = new String[]{"NO","GDBH","GWGDBH","ZT","YWLX","DQBZ","SLRY","SLSJ","SLLR","YHBH","YHMC","LXDZ","LXDH","HFNR","YJFL","EJFL",
-					"YWZL","SJDW","GDDW","CBD","CLJG","CLDW","CLBM","GLGD","WTYYFL","GDFJ","ZRBM","GDSJ","GQSJ","GQYY","FWQD","SJHTZRYY"};         
+					"YWZL","SJDW","GDDW","CBD","CLJG","CLDW","CLBM","HDS","BZ","GLGD","WTYYFL","GDFJ","ZRBM","GDSJ","GQSJ","GQYY","FWQD","SJHTZRYY"};
 			list = FilesUtil.readExecleasy(fileItem, titleKey, 1);
 			if (list.size() == 0) {
 				throw new MINBusinessException("无数据，请添加数据");//无数据，请添加数据
@@ -445,6 +445,8 @@ public class DataWareManageAction implements IMINAction {
 				fileDetail05.setCljg(excelMap.get("CLJG"));
 				fileDetail05.setCldw(excelMap.get("CLDW"));
 				fileDetail05.setClbm(excelMap.get("CLBM"));
+				fileDetail05.setGds(excelMap.get("GDS"));
+				fileDetail05.setBz(excelMap.get("BZ"));
 				fileDetail05.setGlgd(excelMap.get("GLGD"));
 				fileDetail05.setWtyyfl(excelMap.get("WTYYFL"));
 				fileDetail05.setGdfj(excelMap.get("GDFJ"));
@@ -677,13 +679,13 @@ public class DataWareManageAction implements IMINAction {
 				this.batchXlgzzReportData(ll,2);
 			}
 		}
-		
+
 		// 文件名
 		String filePath = Service.lookup(IPropertiesService.class).getSystemProperties().get("FILE_SERVER_BASE_PATH").getKey();
 		String saveName = UUID.randomUUID().toString().replaceAll("-", "");
 		String[] fileNameArray = fileName.split("\\.");
 		saveName = saveName + "." + fileNameArray[fileNameArray.length - 1];
-		
+
 		// 保存文件数据
 		String currentDate = DateUtil.getCurrentDateString();
 		User user = (User)session.getUser();
@@ -697,10 +699,10 @@ public class DataWareManageAction implements IMINAction {
 		fileInf.setType(fileType);
 		fileInf.setSavePath(filePath + saveName);
 		db.insertSelective(DwFileInfMapper.class, fileInf);
-		
+
 		// 保存文件到本地
 		FilesUtil.uploadFile(fileItem, filePath, "", saveName, 0);
-		
+
 		return res;
     }
 
@@ -778,7 +780,7 @@ public class DataWareManageAction implements IMINAction {
      * @param response
      * @return
      * @throws MINBusinessException
-     * @throws IOException 
+     * @throws IOException
      */
     @MINAction(value = FILE_INF_DOWNLOAD)
     public HttpServletResponse fileInfDownload(
@@ -789,7 +791,7 @@ public class DataWareManageAction implements IMINAction {
         DwFileInf fileInf = db.selectByPrimaryKey(DwFileInfMapper.class, fileId);
         String type = fileInf.getType();
 //        FilesUtil.writeFile2Response(response, fileInf.getSavePath(), fileInf.getFileName());
-        
+
         OutputStream os = null;
         ServletOutputStream ros = null;
         ros = response.getOutputStream();
@@ -948,7 +950,7 @@ public class DataWareManageAction implements IMINAction {
     	fileInf.setState(Constant.FILE_INF_STATE_1);
     	fileInf.setId(fileId);
     	db.updateByPrimaryKeySelective(DwFileInfMapper.class, fileInf);
-    	
+
     	/** 删除明细 */
     	if (Constant.FILE_DETAIL_TYPE_00.equals(fileType)) {// 台区停电
     		DwFileDetail00Example fileDetail00Example = new DwFileDetail00Example();
@@ -988,7 +990,7 @@ public class DataWareManageAction implements IMINAction {
 		}
     	return res;
     }
-    
+
     /**
      * 原始文件明细查询
      * @param fileId
@@ -1009,7 +1011,7 @@ public class DataWareManageAction implements IMINAction {
     	db = Service.lookup(IMINDataBaseService.class);
     	MINRowBounds rows = new MINRowBounds(page, limit);
 		rows.setSeparateSql(true);
-    	
+
     	Map<String, String> param = new HashMap<String, String>();
     	param.put("fileId", fileId);
     	param.put("fileIdListStr", fileIdListStr);
@@ -1020,14 +1022,14 @@ public class DataWareManageAction implements IMINAction {
     	res.set(IMINBusinessConstant.F_PAGING_COUNT, rows.getCount());
     	return res;
     }
-    
+
     /**
      * 原始数据文件下载
      * @param type
      * @param response
      * @return
      * @throws MINBusinessException
-     * @throws IOException 
+     * @throws IOException
      */
     @MINAction(value = FILE_DATA_DOWNLOAD)
     public HttpServletResponse fileDataDownload(
@@ -1038,9 +1040,9 @@ public class DataWareManageAction implements IMINAction {
         db = Service.lookup(IMINDataBaseService.class);
         date = date.replaceAll(" ", "");
         date = date.replaceAll("-", "");
-        
-        
-        
+
+
+
         OutputStream os = null;
         ServletOutputStream ros = null;
         ros = response.getOutputStream();

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

@@ -40,6 +40,8 @@
     <result column="DFD5_FWQD" jdbcType="VARCHAR" property="fwqd" />
     <result column="DFD5_SJHTZRYY" jdbcType="VARCHAR" property="sjhtzryy" />
     <result column="DFD5_FILE_ID" jdbcType="VARCHAR" property="fileId" />
+    <result column="DFD5_GDS" jdbcType="VARCHAR" property="gds" />
+    <result column="DFD5_BZ" jdbcType="VARCHAR" property="bz" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -116,7 +118,7 @@
     DFD5_SLSJ, DFD5_SLLR, DFD5_YHBH, DFD5_YHMC, DFD5_LXDZ, DFD5_LXDH, DFD5_HFNR, DFD5_YJFL, 
     DFD5_EJFL, DFD5_YWZL, DFD5_SJDW, DFD5_GDDW, DFD5_CBD, DFD5_CLJG, DFD5_CLDW, DFD5_CLBM, 
     DFD5_GLGD, DFD5_WTYYFL, DFD5_GDFJ, DFD5_ZRBM, DFD5_GDSJ, DFD5_GQSJ, DFD5_GQYY, DFD5_FWQD, 
-    DFD5_SJHTZRYY, DFD5_FILE_ID
+    DFD5_SJHTZRYY, DFD5_FILE_ID, DFD5_GDS, DFD5_BZ
   </sql>
   <select id="selectByExample" parameterType="com.minpay.db.table.model.DwFileDetail05Example" resultMap="BaseResultMap">
     <!--
@@ -178,7 +180,7 @@
       DFD5_CLBM, DFD5_GLGD, DFD5_WTYYFL, 
       DFD5_GDFJ, DFD5_ZRBM, DFD5_GDSJ, DFD5_GQSJ, 
       DFD5_GQYY, DFD5_FWQD, DFD5_SJHTZRYY, 
-      DFD5_FILE_ID)
+      DFD5_FILE_ID, DFD5_GDS, DFD5_BZ)
     values (#{id,jdbcType=VARCHAR}, #{no,jdbcType=VARCHAR}, #{gdbh,jdbcType=VARCHAR}, 
       #{gwgdbh,jdbcType=VARCHAR}, #{zt,jdbcType=VARCHAR}, #{ywlx,jdbcType=VARCHAR}, #{dqbz,jdbcType=VARCHAR}, 
       #{slry,jdbcType=VARCHAR}, #{slsj,jdbcType=VARCHAR}, #{sllr,jdbcType=VARCHAR}, #{yhbh,jdbcType=VARCHAR}, 
@@ -188,7 +190,7 @@
       #{clbm,jdbcType=VARCHAR}, #{glgd,jdbcType=VARCHAR}, #{wtyyfl,jdbcType=VARCHAR}, 
       #{gdfj,jdbcType=VARCHAR}, #{zrbm,jdbcType=VARCHAR}, #{gdsj,jdbcType=VARCHAR}, #{gqsj,jdbcType=VARCHAR}, 
       #{gqyy,jdbcType=VARCHAR}, #{fwqd,jdbcType=VARCHAR}, #{sjhtzryy,jdbcType=VARCHAR}, 
-      #{fileId,jdbcType=VARCHAR})
+      #{fileId,jdbcType=VARCHAR}, #{gds,jdbcType=VARCHAR}, #{bz,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.minpay.db.table.model.DwFileDetail05">
     <!--
@@ -299,6 +301,12 @@
       <if test="fileId != null">
         DFD5_FILE_ID,
       </if>
+      <if test="gds != null">
+        DFD5_GDS,
+      </if>
+      <if test="bz != null">
+        DFD5_BZ,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -403,6 +411,12 @@
       <if test="fileId != null">
         #{fileId,jdbcType=VARCHAR},
       </if>
+      <if test="gds != null">
+        #{gds,jdbcType=VARCHAR},
+      </if>
+      <if test="bz != null">
+        #{bz,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.minpay.db.table.model.DwFileDetail05Example" resultType="java.lang.Integer">
@@ -524,6 +538,12 @@
       <if test="record.fileId != null">
         DFD5_FILE_ID = #{record.fileId,jdbcType=VARCHAR},
       </if>
+      <if test="record.gds != null">
+        DFD5_GDS = #{record.gds,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bz != null">
+        DFD5_BZ = #{record.bz,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -568,7 +588,9 @@
       DFD5_GQYY = #{record.gqyy,jdbcType=VARCHAR},
       DFD5_FWQD = #{record.fwqd,jdbcType=VARCHAR},
       DFD5_SJHTZRYY = #{record.sjhtzryy,jdbcType=VARCHAR},
-      DFD5_FILE_ID = #{record.fileId,jdbcType=VARCHAR}
+      DFD5_FILE_ID = #{record.fileId,jdbcType=VARCHAR},
+      DFD5_GDS = #{record.gds,jdbcType=VARCHAR},
+      DFD5_BZ = #{record.bz,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -679,6 +701,12 @@
       <if test="fileId != null">
         DFD5_FILE_ID = #{fileId,jdbcType=VARCHAR},
       </if>
+      <if test="gds != null">
+        DFD5_GDS = #{gds,jdbcType=VARCHAR},
+      </if>
+      <if test="bz != null">
+        DFD5_BZ = #{bz,jdbcType=VARCHAR},
+      </if>
     </set>
     where DFD5_ID = #{id,jdbcType=VARCHAR}
   </update>
@@ -720,7 +748,9 @@
       DFD5_GQYY = #{gqyy,jdbcType=VARCHAR},
       DFD5_FWQD = #{fwqd,jdbcType=VARCHAR},
       DFD5_SJHTZRYY = #{sjhtzryy,jdbcType=VARCHAR},
-      DFD5_FILE_ID = #{fileId,jdbcType=VARCHAR}
+      DFD5_FILE_ID = #{fileId,jdbcType=VARCHAR},
+      DFD5_GDS = #{gds,jdbcType=VARCHAR},
+      DFD5_BZ = #{bz,jdbcType=VARCHAR}
     where DFD5_ID = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

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

@@ -25,17 +25,17 @@
     ddyzymcSelect.push('线路虚接、氧化');
     ddyzymcSelect.push('低压线路老化');
     ddyzymcSelect.push('其它原因');
-    
+
     var isOrNoSelect = new Array();
     isOrNoSelect.push('');
     isOrNoSelect.push('是');
     isOrNoSelect.push('否');
-    
+
 	var pageId = getQueryString("pageId");
 	var reportId = getQueryString("reportId");		//报告id
 	var fileName = chineseUrlDecodeURI(getQueryString("fileName"));	//报告名称
 	var dayInterval = getQueryString("dayInterval");	//日区间
-	
+
 	var table;
 	var form;
 	layui.use(['table','form', 'laydate'], function(){
@@ -47,9 +47,9 @@
                 reportId : reportId
             },
             success : function(data) {
-                // var resJSON = eval('(' + data.data.data + ')');
-                // var reportDesc = resJSON.descStr;
-                // $("#reportDiv").html(reportDesc);
+                var resJSON = eval('(' + data.data.data + ')');
+                var reportDesc = resJSON.descStr;
+                $("#reportDiv").html(reportDesc);
             },
             error : function(data2) {
                 $.ErrorAlert(data2.MINErrorMessage);
@@ -73,7 +73,7 @@
 								html += '<option value = "' + ddyzymcSelect[i] + '" selected>' + ddyzymcSelect[i] + '</option>';
 							} else {
 								html += '<option value = "' + ddyzymcSelect[i] + '" >' + ddyzymcSelect[i] + '</option>';
-							}	
+							}
 						}
 						html += '</select>';
 						return html;
@@ -87,7 +87,7 @@
 								html += '<option value = "' + isOrNoSelect[i] + '" selected>' + isOrNoSelect[i] + '</option>';
 							} else {
 								html += '<option value = "' + isOrNoSelect[i] + '" >' + isOrNoSelect[i] + '</option>';
-							}	
+							}
 						}
 						html += '</select>';
 						return html;
@@ -100,7 +100,7 @@
 								html += '<option value = "' + isOrNoSelect[i] + '" selected>' + isOrNoSelect[i] + '</option>';
 							} else {
 								html += '<option value = "' + isOrNoSelect[i] + '" >' + isOrNoSelect[i] + '</option>';
-							}	
+							}
 						}
 						html += '</select>';
 						return html;
@@ -108,10 +108,10 @@
 					,{field:'qnljts', title: '全年累计天数',width:'8%'}
 					,{field:'zrxz', title: '是否昨日新增',width:'8%'}
 		            ];
-		
+
 		var beginDate = strToDate(dayInterval.split("-")[0]);
 		var endDate = strToDate(dayInterval.split("-")[1]);
-		
+
 		while (endDate >= beginDate) {
 			var dateMap = {field : dateToString(endDate), title: dateToString(endDate), width:'8%', templet: function (d){
 				if (isEmpty(d[this.field])) {
@@ -123,7 +123,7 @@
 			cols.push(dateMap);
 			endDate = new Date(endDate.setDate(endDate.getDate() - 1));
 		}
-		
+
 		// 加载数据
 		table.render({
 			id: 'tableTest'
@@ -193,7 +193,7 @@
 			editFxb(param);
 		});
 	});
-	
+
 	function ddyzymcChange(t, id, field) {
 		var value = $(t).find("option:selected").val();
 		var param = {
@@ -202,7 +202,7 @@
 		param[field] = value;
 		editFxb(param);
 	}
-	
+
 	function editFxb(param) {
 		$.request({
 			action : 'ReportManageAction/ddyReportInfUpdate',
@@ -215,7 +215,7 @@
 			}
 	  	});
 	}
-	
+
 	function reportTable(excelList, typeId,isType,isEdit) {
 		var html = '';
 		if(isType){
@@ -242,7 +242,7 @@
 					}else{
 						html += '<td style = "' + editHtml + '">' + (isEmpty(excelChildList[j])?'':excelChildList[j]) + '</td>';
 					}
-					
+
 					// 2个月停电3次及以上台区
 				} else {
 					html += '<td style = "' + editHtml + '">'  + (isEmpty(excelChildList[j])?'':excelChildList[j]) + '</td>';
@@ -255,4 +255,4 @@
     </script>
 </body>
 
-</html>
+</html>

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

@@ -224,6 +224,8 @@
 				<td>处理结果</td>
 				<td>处理单位</td>
 				<td>处理部门</td>
+				<td>供电所</td>
+				<td>班组</td>
 				<td>关联工单</td>
 				<td>问题原因分类</td>
 				<td>工单分级</td>
@@ -258,6 +260,8 @@
 				<td>24</td>
 				<td>东部新区供电所</td>
 				<td>营业班</td>
+				<td></td>
+				<td></td>
 				<td>否</td>
 				<td></td>
 				<td></td>
@@ -300,6 +304,8 @@
 				<td>24</td>
 				<td>东部新区供电所</td>
 				<td>营业班</td>
+				<td></td>
+				<td></td>
 				<td>否</td>
 				<td></td>
 				<td></td>
@@ -367,10 +373,10 @@
 			</tr>
 		</table>
 	</div>
-	
+
     <script>
 		var pageId = getQueryString("pageId");
-		
+
 		var $step;
 		layui.config({
 	        base: '../../plugins/layui/lay/modules/steps/'
@@ -378,7 +384,7 @@
 	    	var $ = layui.$;
     	    $step = $("#step_demo").step();
 		})
-		
+
 		layui.use('form', function(){
 			var form = layui.form;
 			$.request({
@@ -401,7 +407,7 @@
 				}
     	  	});
 		})
-		
+
 		function goStep (step) {
 			if (step == 2) {
 				var fileType = $("#fileTypeDiv").find("select option:selected").val();
@@ -417,7 +423,7 @@
 			if (step == 3) {
 				$("#tableDemo").hide();
 			}
-			
+
 			$step.goStep(step);
 			var stepDiv = $("div[name = 'step']");
 			for (var i = 0; i < stepDiv.length; i ++) {
@@ -432,14 +438,14 @@
 		layui.use('upload', function(){
 			var $ = layui.jquery
 			,upload = layui.upload;
-			
+
 			  //拖拽上传
 			upload.render({
 			    elem: '#uploadDiv'
 			    ,url: '../../DataWareManageAction/fileInfUpload'
 			    ,auto: false
 			    ,bindAction: '#uploadBtn'
-		    	,accept: 'file' 
+		    	,accept: 'file'
 		    	,field: 'file'
 	    	    ,exts: 'xls|xlsx'
 				,before: function(obj){
@@ -487,11 +493,11 @@
 			    }
 			});
 		})
-		
+
 		function finish() {
-			deleteTabPageParent(pageId); 
+			deleteTabPageParent(pageId);
 		}
     </script>
 </body>
 
-</html>
+</html>