Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

This commit is contained in:
段冬梅
2018-12-14 20:03:51 +08:00

View File

@@ -2209,10 +2209,16 @@ public class ExportExcel {
int j=0;
sheets=new HashMap<>();
rownums=new HashMap<>();
int num=0;
for (String title : titleList) {
List<String> headerList=headerMap.get(title);
List<String> commentList=commentMap.get(title);
Sheet sheet = wb.createSheet(StringUtil.isEmpty(msgProp.get(title)) ? title:msgProp.get(title).toString());
String titleName=StringUtil.isEmpty(msgProp.get(title)) ? title:msgProp.get(title).toString();
if(num > 0){
titleName+=String.valueOf(num);
}
Sheet sheet = wb.createSheet(titleName);
num++;
rownums.put(title, 0);
sheets.put(title, sheet);
this.styles = createStyles(wb);