|
@@ -33,14 +33,14 @@ public class MisDailyUtil {
|
|
|
Workbook wb = null;
|
|
|
List<MisDailyData> list = new ArrayList<>();
|
|
|
try{
|
|
|
- String fileName = file.getOriginalFilename();
|
|
|
- is = file.getInputStream();
|
|
|
+ String fileName = file.getOriginalFilename(); //读取文件名
|
|
|
+ is = file.getInputStream(); //读取文件流
|
|
|
|
|
|
String year = fileName.substring(0, 4);
|
|
|
String month = fileName.substring(5,fileName.indexOf("月"));
|
|
|
Calendar cal = Calendar.getInstance();
|
|
|
cal.setTime(DateUtils.parseStrtoDate(year + "-" + month + "-01", DateUtils.YYYY_MM_DD));
|
|
|
- int dayMaximum = cal.getActualMaximum(Calendar.DAY_OF_MONTH);
|
|
|
+ int dayMaximum = cal.getActualMaximum(Calendar.DAY_OF_MONTH); //获取当月最大的一天
|
|
|
|
|
|
//校验文件类型
|
|
|
if (checkFile(fileName) == 1) {
|
|
@@ -53,16 +53,16 @@ public class MisDailyUtil {
|
|
|
|
|
|
Iterator<Sheet> sheets = wb.sheetIterator();
|
|
|
while(sheets.hasNext()){
|
|
|
- Sheet sheet = sheets.next();
|
|
|
+ Sheet sheet = sheets.next(); //读取sheet
|
|
|
|
|
|
//如果sheet不是日报内容则过滤
|
|
|
- String name = sheet.getSheetName();
|
|
|
+ String name = sheet.getSheetName(); //读取sheet名称
|
|
|
if (StringUtils.isEmpty(name) || !name.contains("日"))
|
|
|
continue;
|
|
|
String day = name.substring(0, name.indexOf("日"));
|
|
|
|
|
|
for (int i = 8; i <= sheet.getLastRowNum(); i++){
|
|
|
- Row row = sheet.getRow(i);
|
|
|
+ Row row = sheet.getRow(i); //读取行
|
|
|
if (row == null)
|
|
|
continue;
|
|
|
if (i > 25)
|