Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop
This commit is contained in:
@@ -2209,10 +2209,16 @@ public class ExportExcel {
|
|||||||
int j=0;
|
int j=0;
|
||||||
sheets=new HashMap<>();
|
sheets=new HashMap<>();
|
||||||
rownums=new HashMap<>();
|
rownums=new HashMap<>();
|
||||||
|
int num=0;
|
||||||
for (String title : titleList) {
|
for (String title : titleList) {
|
||||||
List<String> headerList=headerMap.get(title);
|
List<String> headerList=headerMap.get(title);
|
||||||
List<String> commentList=commentMap.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);
|
rownums.put(title, 0);
|
||||||
sheets.put(title, sheet);
|
sheets.put(title, sheet);
|
||||||
this.styles = createStyles(wb);
|
this.styles = createStyles(wb);
|
||||||
|
|||||||
Reference in New Issue
Block a user