平衡利库模块bug修改

src/main/java/com/jeeplus/common/utils/excel/ImportExcel.java

@@ -3,25 +3,19 @@
  */
 package com.jeeplus.common.utils.excel;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.text.NumberFormat;
-import java.text.SimpleDateFormat;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-
+import com.google.common.collect.Lists;
+import com.jeeplus.common.utils.Reflections;
+import com.jeeplus.common.utils.excel.annotation.ExcelField;
+import com.jeeplus.modules.sys.entity.Area;
+import com.jeeplus.modules.sys.entity.Office;
+import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.utils.DictUtils;
+import com.jeeplus.modules.sys.utils.UserUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.DateUtil;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -30,14 +24,18 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.google.common.collect.Lists;
-import com.jeeplus.common.utils.Reflections;
-import com.jeeplus.common.utils.excel.annotation.ExcelField;
-import com.jeeplus.modules.sys.entity.Area;
-import com.jeeplus.modules.sys.entity.Office;
-import com.jeeplus.modules.sys.entity.User;
-import com.jeeplus.modules.sys.utils.DictUtils;
-import com.jeeplus.modules.sys.utils.UserUtils;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 导入Excel文件（支持“XLS”和“XLSX”格式）
@@ -45,44 +43,44 @@ import com.jeeplus.modules.sys.utils.UserUtils;
  * @version 2016-03-10
  */
 public class ImportExcel {
-	
+
 	private static Logger log = LoggerFactory.getLogger(ImportExcel.class);
-			
+
 	/**
 	 * 工作薄对象
 	 */
 	private Workbook wb;
-	
+
 	/**
 	 * 工作表对象
 	 */
 	private Sheet sheet;
-	
+
 	/**
 	 * 标题行号
 	 */
 	private int headerNum;
-	
+
 	/**
 	 * 构造函数
 	 * @param path 导入文件，读取第一个工作表
 	 * @param headerNum 标题行号，数据行号=标题行号+1
-	 * @throws InvalidFormatException 
-	 * @throws IOException 
+	 * @throws InvalidFormatException
+	 * @throws IOException
 	 */
-	public ImportExcel(String fileName, int headerNum) 
+	public ImportExcel(String fileName, int headerNum)
 			throws InvalidFormatException, IOException {
 		this(new File(fileName), headerNum);
 	}
-	
+
 	/**
 	 * 构造函数
 	 * @param path 导入文件对象，读取第一个工作表
 	 * @param headerNum 标题行号，数据行号=标题行号+1
-	 * @throws InvalidFormatException 
-	 * @throws IOException 
+	 * @throws InvalidFormatException
+	 * @throws IOException
 	 */
-	public ImportExcel(File file, int headerNum) 
+	public ImportExcel(File file, int headerNum)
 			throws InvalidFormatException, IOException {
 		this(file, headerNum, 0);
 	}
@@ -92,36 +90,36 @@ public class ImportExcel {
 	 * @param path 导入文件
 	 * @param headerNum 标题行号，数据行号=标题行号+1
 	 * @param sheetIndex 工作表编号
-	 * @throws InvalidFormatException 
-	 * @throws IOException 
+	 * @throws InvalidFormatException
+	 * @throws IOException
 	 */
-	public ImportExcel(String fileName, int headerNum, int sheetIndex) 
+	public ImportExcel(String fileName, int headerNum, int sheetIndex)
 			throws InvalidFormatException, IOException {
 		this(new File(fileName), headerNum, sheetIndex);
 	}
-	
+
 	/**
 	 * 构造函数
 	 * @param path 导入文件对象
 	 * @param headerNum 标题行号，数据行号=标题行号+1
 	 * @param sheetIndex 工作表编号
-	 * @throws InvalidFormatException 
-	 * @throws IOException 
+	 * @throws InvalidFormatException
+	 * @throws IOException
 	 */
-	public ImportExcel(File file, int headerNum, int sheetIndex) 
+	public ImportExcel(File file, int headerNum, int sheetIndex)
 			throws InvalidFormatException, IOException {
 		this(file.getName(), new FileInputStream(file), headerNum, sheetIndex);
 	}
-	
+
 	/**
 	 * 构造函数
 	 * @param file 导入文件对象
 	 * @param headerNum 标题行号，数据行号=标题行号+1
 	 * @param sheetIndex 工作表编号
-	 * @throws InvalidFormatException 
-	 * @throws IOException 
+	 * @throws InvalidFormatException
+	 * @throws IOException
 	 */
-	public ImportExcel(MultipartFile multipartFile, int headerNum, int sheetIndex) 
+	public ImportExcel(MultipartFile multipartFile, int headerNum, int sheetIndex)
 			throws InvalidFormatException, IOException {
 		this(multipartFile.getOriginalFilename(), multipartFile.getInputStream(), headerNum, sheetIndex);
 	}
@@ -136,20 +134,20 @@ public class ImportExcel {
 	 * @param path 导入文件对象
 	 * @param headerNum 标题行号，数据行号=标题行号+1
 	 * @param sheetIndex 工作表编号
-	 * @throws InvalidFormatException 
-	 * @throws IOException 
+	 * @throws InvalidFormatException
+	 * @throws IOException
 	 */
-	public ImportExcel(String fileName, InputStream is, int headerNum, int sheetIndex) 
+	public ImportExcel(String fileName, InputStream is, int headerNum, int sheetIndex)
 			throws InvalidFormatException, IOException {
 		if (StringUtils.isBlank(fileName)){
 			throw new RuntimeException("导入文档为空!");
-		}else if(fileName.toLowerCase().endsWith("xls")){    
-			this.wb = new HSSFWorkbook(is);    
-        }else if(fileName.toLowerCase().endsWith("xlsx")){  
+		}else if(fileName.toLowerCase().endsWith("xls")){
+			this.wb = new HSSFWorkbook(is);
+        }else if(fileName.toLowerCase().endsWith("xlsx")){
         	this.wb = new XSSFWorkbook(is);
-        }else{  
+        }else{
         	throw new RuntimeException("文档格式不正确!");
-        }  
+        }
 		if (this.wb.getNumberOfSheets()<sheetIndex){
 			throw new RuntimeException("文档中没有工作表!");
 		}
@@ -176,7 +174,7 @@ public class ImportExcel {
 		this.headerNum = headerNum;
 		log.debug("Initialize success.");
 	}
-	
+
 	/**
 	 * 获取行对象
 	 * @param rownum
@@ -193,7 +191,16 @@ public class ImportExcel {
 	public int getDataRowNum(){
 		return headerNum+1;
 	}
-	
+
+	/**
+	 * 获取数据行号
+	 * @return
+	 */
+	public int getDataRowNumTest(){
+		return headerNum;
+	}
+
+
 	/**
 	 * 获取最后一个数据行号
 	 * @return
@@ -201,7 +208,7 @@ public class ImportExcel {
 	public int getLastDataRowNum(){
 		return this.sheet.getLastRowNum()+headerNum;
 	}
-	
+
 	/**
 	 * 获取最后一个列号
 	 * @return
@@ -209,7 +216,7 @@ public class ImportExcel {
 	public int getLastCellNum(){
 		return this.getRow(headerNum).getLastCellNum();
 	}
-	
+
 	/**
 	 * 获取单元格值
 	 * @param row 获取的行
@@ -300,7 +307,156 @@ public class ImportExcel {
 		}
 		return val;
 	}
-	
+
+	/**
+	 * 获取导入数据列表
+	 * @param cls 导入对象类型
+	 * @param groups 导入分组
+	 */
+	public <E> List<E> getDataListTest(Class<E> cls, int... groups) throws InstantiationException, IllegalAccessException{
+		List<Object[]> annotationList = Lists.newArrayList();
+		// Get annotation field
+		Field[] fs = cls.getDeclaredFields();
+		for (Field f : fs){
+			ExcelField ef = f.getAnnotation(ExcelField.class);
+			if (ef != null && (ef.type()==0 || ef.type()==2)){
+				if (groups!=null && groups.length>0){
+					boolean inGroup = false;
+					for (int g : groups){
+						if (inGroup){
+							break;
+						}
+						for (int efg : ef.groups()){
+							if (g == efg){
+								inGroup = true;
+								annotationList.add(new Object[]{ef, f});
+								break;
+							}
+						}
+					}
+				}else{
+					annotationList.add(new Object[]{ef, f});
+				}
+			}
+		}
+		// Get annotation method
+		Method[] ms = cls.getDeclaredMethods();
+		for (Method m : ms){
+			ExcelField ef = m.getAnnotation(ExcelField.class);
+			if (ef != null && (ef.type()==0 || ef.type()==2)){
+				if (groups!=null && groups.length>0){
+					boolean inGroup = false;
+					for (int g : groups){
+						if (inGroup){
+							break;
+						}
+						for (int efg : ef.groups()){
+							if (g == efg){
+								inGroup = true;
+								annotationList.add(new Object[]{ef, m});
+								break;
+							}
+						}
+					}
+				}else{
+					annotationList.add(new Object[]{ef, m});
+				}
+			}
+		}
+		// Field sorting
+		Collections.sort(annotationList, new Comparator<Object[]>() {
+			public int compare(Object[] o1, Object[] o2) {
+				return new Integer(((ExcelField)o1[0]).sort()).compareTo(
+						new Integer(((ExcelField)o2[0]).sort()));
+			};
+		});
+		//log.debug("Import column count:"+annotationList.size());
+		// Get excel data
+		List<E> dataList = Lists.newArrayList();
+		for (int i = this.getDataRowNumTest(); i < this.getLastDataRowNum(); i++) {
+			E e = (E)cls.newInstance();
+			int column = 0;
+			Row row = this.getRow(i);
+			StringBuilder sb = new StringBuilder();
+			for (Object[] os : annotationList){
+				Object val = this.getCellValue(row, column++);
+				if (val != null){
+					ExcelField ef = (ExcelField)os[0];
+					// If is dict type, get dict value
+					if (StringUtils.isNotBlank(ef.dictType())){
+						val = DictUtils.getDictValue(val.toString(), ef.dictType(), "");
+						//log.debug("Dictionary type value: ["+i+","+colunm+"] " + val);
+					}
+					// Get param type and type cast
+					Class<?> valType = Class.class;
+					if (os[1] instanceof Field){
+						valType = ((Field)os[1]).getType();
+					}else if (os[1] instanceof Method){
+						Method method = ((Method)os[1]);
+						if ("get".equals(method.getName().substring(0, 3))){
+							valType = method.getReturnType();
+						}else if("set".equals(method.getName().substring(0, 3))){
+							valType = ((Method)os[1]).getParameterTypes()[0];
+						}
+					}
+					//log.debug("Import value type: ["+i+","+column+"] " + valType);
+					try {
+						//如果导入的java对象，需要在这里自己进行变换。
+						if (valType == String.class){
+							String s = String.valueOf(val.toString());
+							if(StringUtils.endsWith(s, ".0")){
+								val = StringUtils.substringBefore(s, ".0");
+							}else{
+								val = String.valueOf(val.toString());
+							}
+						}else if (valType == Integer.class){
+							val = Double.valueOf(val.toString()).intValue();
+						}else if (valType == Long.class){
+							val = Double.valueOf(val.toString()).longValue();
+						}else if (valType == Double.class){
+							val = Double.valueOf(val.toString());
+						}else if (valType == Float.class){
+							val = Float.valueOf(val.toString());
+						}else if (valType == Date.class){
+							SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+							val=sdf.parse(val.toString());
+						}else if (valType == User.class){
+							val = UserUtils.getByUserName(val.toString());
+						}else if (valType == Office.class){
+							val = UserUtils.getByOfficeName(val.toString());
+						}else if (valType == Area.class){
+							val = UserUtils.getByAreaName(val.toString());
+						}else{
+							if (ef.fieldType() != Class.class){
+								val = ef.fieldType().getMethod("getValue", String.class).invoke(null, val.toString());
+							}else{
+								val = Class.forName(this.getClass().getName().replaceAll(this.getClass().getSimpleName(),
+										"fieldtype."+valType.getSimpleName()+"Type")).getMethod("getValue", String.class).invoke(null, val.toString());
+							}
+						}
+					} catch (Exception ex) {
+						log.info("Get cell value ["+i+","+column+"] error: " + ex.toString());
+						val = null;
+					}
+					// set entity value
+					if (os[1] instanceof Field){
+						Reflections.invokeSetter(e, ((Field)os[1]).getName(), val);
+					}else if (os[1] instanceof Method){
+						String mthodName = ((Method)os[1]).getName();
+						if ("get".equals(mthodName.substring(0, 3))){
+							mthodName = "set"+StringUtils.substringAfter(mthodName, "get");
+						}
+						Reflections.invokeMethod(e, mthodName, new Class[] {valType}, new Object[] {val});
+					}
+				}
+				sb.append(val+", ");
+			}
+			dataList.add(e);
+			log.debug("Read success: ["+i+"] "+sb.toString());
+		}
+		return dataList;
+	}
+
 	/**
 	 * 获取导入数据列表
 	 * @param cls 导入对象类型
@@ -308,7 +464,7 @@ public class ImportExcel {
 	 */
 	public <E> List<E> getDataList(Class<E> cls, int... groups) throws InstantiationException, IllegalAccessException{
 		List<Object[]> annotationList = Lists.newArrayList();
-		// Get annotation field 
+		// Get annotation field
 		Field[] fs = cls.getDeclaredFields();
 		for (Field f : fs){
 			ExcelField ef = f.getAnnotation(ExcelField.class);
@@ -412,7 +568,7 @@ public class ImportExcel {
 							val = Float.valueOf(val.toString());
 						}else if (valType == Date.class){
 							SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-							val=sdf.parse(val.toString()); 
+							val=sdf.parse(val.toString());
 						}else if (valType == User.class){
 							val = UserUtils.getByUserName(val.toString());
 						}else if (valType == Office.class){
@@ -423,7 +579,7 @@ public class ImportExcel {
 							if (ef.fieldType() != Class.class){
 								val = ef.fieldType().getMethod("getValue", String.class).invoke(null, val.toString());
 							}else{
-								val = Class.forName(this.getClass().getName().replaceAll(this.getClass().getSimpleName(), 
+								val = Class.forName(this.getClass().getName().replaceAll(this.getClass().getSimpleName(),
 										"fieldtype."+valType.getSimpleName()+"Type")).getMethod("getValue", String.class).invoke(null, val.toString());
 							}
 						}
@@ -605,9 +761,9 @@ public class ImportExcel {
 //	 * 导入测试
 //	 */
 //	public static void main(String[] args) throws Throwable {
-//		
+//
 //		ImportExcel ei = new ImportExcel("target/export.xlsx", 1);
-//		
+//
 //		for (int i = ei.getDataRowNum(); i < ei.getLastDataRowNum(); i++) {
 //			Row row = ei.getRow(i);
 //			for (int j = 0; j < ei.getLastCellNum(); j++) {
@@ -616,7 +772,7 @@ public class ImportExcel {
 //			}
 //			System.out.print("\n");
 //		}
-//		
+//
 //	}
 
 }

src/main/java/com/jeeplus/modules/sg/balancedlibrary/materialReportDetails/service/MaterialReportDetailsService.java

@@ -95,6 +95,7 @@ public class MaterialReportDetailsService extends CrudService<MaterialReportDeta
     @Transactional(readOnly = false)
     public AjaxJson liKuBalance(List<MaterialReportDetails> materialReportDetailsList) {
         AjaxJson j = new AjaxJson();
+        long l1 = System.currentTimeMillis();
         /*************************************对利库资源池进行操作**********************************************/
         //段长利库池
         List<LiKuResourcePool> liKuIsSegmentPoolList = new ArrayList<>();
@@ -147,6 +148,8 @@ public class MaterialReportDetailsService extends CrudService<MaterialReportDeta
                 liKuIsNotSegmentPoolList.add(liKuResourcePool);
             }
         });
+        long l2 = System.currentTimeMillis();
+        System.out.println("***************************利库池处理" + (l2-l1) + "********");
 
         //排序    地区-》库龄降序-》数量大小降序-》批次号-》扩展编码升序
         List<LiKuResourcePool> liKuIsSegmentPoolSortList = getSortLiKuPool(liKuIsSegmentPoolList);
@@ -376,6 +379,8 @@ public class MaterialReportDetailsService extends CrudService<MaterialReportDeta
                 liKuCompareMaterial(m, l, AreaTypeFlagEnum.SPAN, AreaTypeFlagEnum.SPAN_REPLACEMENT, MaterialsUnitFlagEnum.IS_SEGMENT);
             });
         });
+        long l3 = System.currentTimeMillis();
+        System.out.println("*********************段长非段长处理" + (l3-l2) + "*****************");
 
         //利库合并 并排序 将利库段长/非段长集合转换为流的形式进行合并，在此基础上对该流进行处理数据，把处理完的流转换为集合进行排序
         List<LiKuResourcePool> sortLiKuPoolList = getSortLiKuPool(Stream.concat(liKuIsNotSegmentPoolSortList.stream(), liKuIsSegmentPoolSortList.stream()).map(m -> {
@@ -449,6 +454,9 @@ public class MaterialReportDetailsService extends CrudService<MaterialReportDeta
             return m;
         }).collect(Collectors.toList());
 
+        long l4 = System.currentTimeMillis();
+        System.out.println("*************资源合并处理" + (l4-l3) + "***********");
+
         /***************************************存储数据库************************************************/
         //更新利库池
         liKuResourcePoolMapper.updateAllList(sortLiKuPoolList);

src/main/java/com/jeeplus/modules/sg/balancedlibrary/materialReportDetails/utils/ExportUtil.java

@@ -103,13 +103,13 @@ public class ExportUtil {
             if (StringUtils.isNotEmpty(opm.getFactory())){
                 switch (opm.getFactory()){
                     case "01L1":
-                        reportPersonOfDepartment = "丹阳";
+                        reportPersonOfDepartment = "丹阳供电分公司";
                         break;
                     case "01L2":
-                        reportPersonOfDepartment = "句容";
+                        reportPersonOfDepartment = "句容供电分公司";
                         break;
                     case "01L3":
-                        reportPersonOfDepartment = "扬中";
+                        reportPersonOfDepartment = "扬中供电分公司";
                         break;
                     case "01L0":
                         //根据提报人找到提报部门
@@ -118,7 +118,6 @@ public class ExportUtil {
                 }
             }
 
-
             //如果没有部门 表示空部门 物料编码-部门
             String key = "";
             if (reportPersonOfDepartment == null) {
@@ -176,7 +175,7 @@ public class ExportUtil {
             if (flagList.contains(key)) {
                 //单位拼接   物资需求表的g列
                 l.setRemarkText("在途已有" + onPassageMaterialsMap.get(key) + companyMap.get(key) +"，请核实本次需求");
-                test.put(l.getMaterialCode(),l.getRemarkText());
+                test.put(key,l.getRemarkText());
             }
         });
         try {
@@ -271,14 +270,20 @@ public class ExportUtil {
                     if (materials != null){
                         cell18.setCellValue(preferMap.get(report.getMaterialCode()).getArea());
                     }
-                    if (preferredCodes.contains(report.getMaterialCode())){
-                        cell19.setCellValue("优选");
+                    if (StringUtils.isNotEmpty(cell15.getStringCellValue())){
+                        if (preferredCodes.contains(report.getMaterialCode())){
+                            cell19.setCellValue("优选");
+                        }else {
+                            cell19.setCellValue("非优选");
+                        }
                     }else {
-                        cell19.setCellValue("非优选");
+                        cell19.setCellValue("");
                     }
+
 //                    cell19.setCellValue(preferMap.get(report.getMaterialCode()).getThirdClassList());
                     //在途说明、审核说明、意见反馈
-                    cell20.setCellValue(test.get(report.getMaterialCode()));
+                    cell20.setCellValue(test.get(report.getMaterialCode() + "-" + report.getReportDepartment()));
+
                     MaterialQuota quota = quotaMap.get(report.getMaterialCode());
                     if(quota!=null){
                         Double quotaNum = quota.getQuota();
@@ -296,13 +301,28 @@ public class ExportUtil {
                         pc = changeVal02(report.getLocalWareBatch());
                     }
                     if (StringUtils.isNotEmpty(changeVal02(report.getRegionalBatch()))){
-                        pc = pc + "," + changeVal02(report.getRegionalBatch());
+                        if (StringUtils.isNotEmpty(pc)){
+                            pc = pc + "," + changeVal02(report.getRegionalBatch());
+                        }else {
+                            pc = changeVal02(report.getRegionalBatch());
+                        }
                     }
                     if (StringUtils.isNotEmpty(changeVal02(report.getLocalReplacementBatch()))){
-                        pc = pc + "," + changeVal02(report.getLocalReplacementBatch());
+                        if (StringUtils.isNotEmpty(pc)){
+                            pc = pc + "," + changeVal02(report.getLocalReplacementBatch());
+                        }else {
+                            pc = changeVal02(report.getLocalReplacementBatch());
+                        }
+
                     }
                     if (StringUtils.isNotEmpty(changeVal02(report.getRegionalReplacementBatch()))){
-                        pc = pc + "," + changeVal02(report.getRegionalReplacementBatch());
+
+                        if (StringUtils.isNotEmpty(pc)){
+                            pc = pc + "," + changeVal02(report.getRegionalReplacementBatch());
+                        }else {
+                            pc = changeVal02(report.getRegionalReplacementBatch());
+                        }
+
                     }
 
                     cell24.setCellValue(pc);
@@ -321,13 +341,29 @@ public class ExportUtil {
                         area = changeVal02(report.getLocalWareHouse());
                     }
                     if (StringUtils.isNotEmpty(changeVal02(report.getRegionalHouse()))){
-                        area = area + "," + changeVal02(report.getRegionalHouse());
+
+                        if (StringUtils.isNotEmpty(area)){
+                            area = area + "," + changeVal02(report.getRegionalHouse());
+                        }else {
+                            area = changeVal02(report.getRegionalHouse());
+                        }
+
                     }
                     if (StringUtils.isNotEmpty(changeVal02(report.getLocalReplacementHouse()))){
-                        area = area + "," + changeVal02(report.getLocalReplacementHouse());
+
+                        if (StringUtils.isNotEmpty(area)){
+                            area = area + "," + changeVal02(report.getLocalReplacementHouse());
+                        }else {
+                            area = changeVal02(report.getLocalReplacementHouse());
+                        }
                     }
                     if (StringUtils.isNotEmpty(changeVal02(report.getRegionalReplacementHouse()))){
-                        area = area + "," + changeVal02(report.getRegionalReplacementHouse());
+
+                        if (StringUtils.isNotEmpty(area)){
+                            area = area + "," + changeVal02(report.getRegionalReplacementHouse());
+                        }else {
+                            area = changeVal02(report.getRegionalReplacementHouse());
+                        }
                     }
 
                     cell26.setCellValue(area);

src/main/java/com/jeeplus/modules/sg/balancedlibrary/transitMaterialGoods/mapper/xml/TransitMaterialGoodsMapper.xml

@@ -6,7 +6,8 @@
 		a.id AS "id",
         a.materialCode,
         a.contractCount,
-        a.planner
+        a.planner,
+        a.factory
 	</sql>
 
     <insert id="insertList">

src/main/java/com/jeeplus/modules/sg/balancedlibrary/transitMaterialGoods/web/TransitMaterialGoodsController.java

@@ -115,7 +115,7 @@ public class TransitMaterialGoodsController extends BaseController {
             ImportExcel onPassageMaterialsFile = new ImportExcel(file[0], 1, 0);
 //            ImportExcel materialInformationFile = new ImportExcel(file[1], 1, 0);
             //转换为集合
-            List<TransitMaterialGoods> onPassageMaterialsList = onPassageMaterialsFile.getDataList(TransitMaterialGoods.class);
+            List<TransitMaterialGoods> onPassageMaterialsList = onPassageMaterialsFile.getDataListTest(TransitMaterialGoods.class);
 
             service.insertList(onPassageMaterialsList);
 //            List<MaterialGoodsInfo> materialInformationList = materialInformationFile.getDataList(MaterialGoodsInfo.class);

src/main/webapp/webpage/modules/sg/balancedlibrary/materialReportDetails/MaterialReportDetailsList.js

@@ -2,7 +2,7 @@
 <script>
 $(document).ready(function() {
 	$('#leave1Table').bootstrapTable({
-		 
+
 		  //请求方法
                method: 'post',
                //类型json
@@ -24,23 +24,23 @@ $(document).ready(function() {
     	       minimumCountColumns: 2,
                //是否显示行间隔色
                striped: true,
-               //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）     
-               cache: false,    
-               //是否显示分页（*）  
-               pagination: true,   
-                //排序方式 
-               sortOrder: "asc",  
+               //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+               cache: false,
+               //是否显示分页（*）
+               pagination: true,
+                //排序方式
+               sortOrder: "asc",
                //初始化加载第一页，默认第一页
-               pageNumber:1,   
-               //每页的记录行数（*）   
-               pageSize: 10,  
-               //可供选择的每页的行数（*）    
+               pageNumber:1,
+               //每页的记录行数（*）
+               pageSize: 10,
+               //可供选择的每页的行数（*）
                pageList: [10, 25, 50, 100],
-               //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据  
+               //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据
                url: "${ctx}/MaterialReportDetails/data",
                //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
-               //queryParamsType:'',   
-               ////查询参数,每次调用是会带上这个参数，可自定义                         
+               //queryParamsType:'',
+               ////查询参数,每次调用是会带上这个参数，可自定义
                queryParams : function(params) {
                	var searchParam = $("#searchForm").serializeJSON();
                	searchParam.pageNo = params.limit === undefined? "1" :params.offset/params.limit+1;
@@ -296,7 +296,7 @@ $(document).ready(function() {
 					iframeWin.contentWindow.importExcel('${ctx}/MaterialReportDetails/import', function (data) {
 						if(data.success){
 							jp.success(data.msg);
-							// jp.downloadFile('${ctx}/MaterialReportDetails/export','finalAccount');//给个name是为了能够在某些条件下下载两个文件							refresh();
+							jp.downloadFile('${ctx}/MaterialReportDetails/export','finalAccount');//给个name是为了能够在某些条件下下载两个文件							refresh();
 							refresh();
 						}else{
 							jp.error(data.msg);