|
|
|
@ -532,9 +532,7 @@ public class CollectController extends Controller {
|
|
|
|
|
|
|
|
|
|
//数据有效行数
|
|
|
|
|
int lastRowNum = sheet.getLastRowNum();
|
|
|
|
|
if (data_start_row > lastRowNum) {
|
|
|
|
|
blankSheet.add(i);
|
|
|
|
|
}
|
|
|
|
|
if (data_start_row > lastRowNum) blankSheet.add(i);
|
|
|
|
|
//遍历每一列
|
|
|
|
|
List<Record> list = cm.getSheetMapping(upload_excel_filename_finish, i);
|
|
|
|
|
for (Record record : list) {//列
|
|
|
|
@ -599,12 +597,10 @@ public class CollectController extends Controller {
|
|
|
|
|
FileOutputStream fileOut = new FileOutputStream(f2);
|
|
|
|
|
wb.write(fileOut);
|
|
|
|
|
|
|
|
|
|
if (blankSheet.size() > 0) {
|
|
|
|
|
String t = "";
|
|
|
|
|
for (Integer i : blankSheet) {
|
|
|
|
|
t += i + ",";
|
|
|
|
|
}
|
|
|
|
|
t = t.substring(0, t.length() - 1);
|
|
|
|
|
if (!blankSheet.isEmpty()) {
|
|
|
|
|
StringBuilder t = new StringBuilder();
|
|
|
|
|
for (Integer i : blankSheet) t.append(i).append(",");
|
|
|
|
|
t = new StringBuilder(t.substring(0, t.length() - 1));
|
|
|
|
|
Kv kv = Kv.create();
|
|
|
|
|
kv.set("success", false);
|
|
|
|
|
kv.set("message", "检查到输入的文件中存在空的Sheet表,序号为" + t + ",请下载文件后查看处理后,重新上传!");
|
|
|
|
|