|
@@ -489,22 +489,38 @@ public class AssetsReportServiceImpl extends ServiceImpl<AssetsReportMapper, Ass
|
|
|
for (DebtorInfoStrBO infoStr : debtorInfoStrList) {
|
|
|
CRReportBaseInfoBO.DebtorInfo debtorInfo = new CRReportBaseInfoBO.DebtorInfo();
|
|
|
String debtorStr = infoStr.getInfoStr();
|
|
|
- debtorInfo.setDebtorName(debtorStr.substring(debtorStr.indexOf("公司名称:") + "公司名称:".length(), debtorStr.indexOf("\n")));
|
|
|
- debtorStr = debtorStr.replaceFirst("\n", "");
|
|
|
- debtorInfo.setDebtorUnifiedSocialCreditCode(debtorStr.substring(debtorStr.indexOf("统一社会信用代码:") + "统一社会信用代码:".length(), debtorStr.indexOf("\n")));
|
|
|
- debtorStr = debtorStr.replaceFirst("\n", "");
|
|
|
- debtorInfo.setDebtorResidence(debtorStr.substring(debtorStr.indexOf("住所:") + "住所:".length(), debtorStr.indexOf("\n")));
|
|
|
- debtorStr = debtorStr.replaceFirst("\n", "");
|
|
|
- debtorInfo.setDebtorRegisteredCapital(debtorStr.substring(debtorStr.indexOf("注册资本:") + "注册资本:".length(), debtorStr.indexOf("\n")));
|
|
|
- debtorStr = debtorStr.replaceFirst("\n", "");
|
|
|
- debtorInfo.setDebtorLegalRepresentative(debtorStr.substring(debtorStr.indexOf("法定代表人:") + "法定代表人:".length(), debtorStr.indexOf("\n")));
|
|
|
- debtorStr = debtorStr.replaceFirst("\n", "");
|
|
|
- debtorInfo.setDebtorType(debtorStr.substring(debtorStr.indexOf("企业类型:") + "企业类型:".length(), debtorStr.indexOf("\n")));
|
|
|
- debtorStr = debtorStr.replaceFirst("\n", "");
|
|
|
- debtorInfo.setDebtorEstablishmentDate(debtorStr.substring(debtorStr.indexOf("成立日期:") + "成立日期:".length(), debtorStr.indexOf("\n")));
|
|
|
- debtorStr = debtorStr.replaceFirst("\n", "");
|
|
|
- debtorInfo.setDebtorBusinessOperationPeriod(debtorStr.indexOf("营业期限:") > 0 ? debtorStr.substring(debtorStr.indexOf("营业期限:") + "营业期限:".length(), debtorStr.indexOf("\n")) : null);
|
|
|
- debtorStr = debtorStr.replaceFirst("\n", "");
|
|
|
+ if (debtorStr.contains("\n")) {
|
|
|
+ debtorInfo.setDebtorName(debtorStr.substring(debtorStr.indexOf("公司名称:") + "公司名称:".length(), debtorStr.indexOf("\n")));
|
|
|
+ debtorStr = debtorStr.replaceFirst("\n", "");
|
|
|
+ }
|
|
|
+ if (debtorStr.contains("\n")) {
|
|
|
+ debtorInfo.setDebtorUnifiedSocialCreditCode(debtorStr.substring(debtorStr.indexOf("统一社会信用代码:") + "统一社会信用代码:".length(), debtorStr.indexOf("\n")));
|
|
|
+ debtorStr = debtorStr.replaceFirst("\n", "");
|
|
|
+ }
|
|
|
+ if (debtorStr.contains("\n")) {
|
|
|
+ debtorInfo.setDebtorResidence(debtorStr.substring(debtorStr.indexOf("住所:") + "住所:".length(), debtorStr.indexOf("\n")));
|
|
|
+ debtorStr = debtorStr.replaceFirst("\n", "");
|
|
|
+ }
|
|
|
+ if (debtorStr.contains("\n")) {
|
|
|
+ debtorInfo.setDebtorRegisteredCapital(debtorStr.substring(debtorStr.indexOf("注册资本:") + "注册资本:".length(), debtorStr.indexOf("\n")));
|
|
|
+ debtorStr = debtorStr.replaceFirst("\n", "");
|
|
|
+ }
|
|
|
+ if (debtorStr.contains("\n")) {
|
|
|
+ debtorInfo.setDebtorLegalRepresentative(debtorStr.substring(debtorStr.indexOf("法定代表人:") + "法定代表人:".length(), debtorStr.indexOf("\n")));
|
|
|
+ debtorStr = debtorStr.replaceFirst("\n", "");
|
|
|
+ }
|
|
|
+ if (debtorStr.contains("\n")) {
|
|
|
+ debtorInfo.setDebtorType(debtorStr.substring(debtorStr.indexOf("企业类型:") + "企业类型:".length(), debtorStr.indexOf("\n")));
|
|
|
+ debtorStr = debtorStr.replaceFirst("\n", "");
|
|
|
+ }
|
|
|
+ if (debtorStr.contains("\n")) {
|
|
|
+ debtorInfo.setDebtorEstablishmentDate(debtorStr.substring(debtorStr.indexOf("成立日期:") + "成立日期:".length(), debtorStr.indexOf("\n")));
|
|
|
+ debtorStr = debtorStr.replaceFirst("\n", "");
|
|
|
+ }
|
|
|
+ if (debtorStr.contains("\n")) {
|
|
|
+ debtorInfo.setDebtorBusinessOperationPeriod(debtorStr.indexOf("营业期限:") > 0 ? debtorStr.substring(debtorStr.indexOf("营业期限:") + "营业期限:".length(), debtorStr.indexOf("\n")) : null);
|
|
|
+ debtorStr = debtorStr.replaceFirst("\n", "");
|
|
|
+ }
|
|
|
debtorInfo.setDebtorBusinessScope(debtorStr.substring(debtorStr.indexOf("经营范围:") + "经营范围:".length()));
|
|
|
// 设置债务人信息
|
|
|
debtorInfoList.add(debtorInfo);
|
|
@@ -530,22 +546,38 @@ public class AssetsReportServiceImpl extends ServiceImpl<AssetsReportMapper, Ass
|
|
|
CRReportBaseInfoBO.EnterpriseGuarantor enterpriseGuarantor = new CRReportBaseInfoBO.EnterpriseGuarantor();
|
|
|
enterpriseGuarantor.setRepaymentCapacityAnalysis(infoStr.getRepaymentCapacityAnalysisStr());
|
|
|
String guarantorStr = infoStr.getInfoStr();
|
|
|
- enterpriseGuarantor.setGuarantorName(guarantorStr.substring(guarantorStr.indexOf("公司名称:") + "公司名称:".length(), guarantorStr.indexOf("\n")));
|
|
|
- guarantorStr = guarantorStr.replaceFirst("\n", "");
|
|
|
- enterpriseGuarantor.setGuarantorUnifiedSocialCreditCode(guarantorStr.substring(guarantorStr.indexOf("统一社会信用代码:") + "统一社会信用代码:".length(), guarantorStr.indexOf("\n")));
|
|
|
- guarantorStr = guarantorStr.replaceFirst("\n", "");
|
|
|
- enterpriseGuarantor.setGuarantorType(guarantorStr.substring(guarantorStr.indexOf("企业类型:") + "企业类型:".length(), guarantorStr.indexOf("\n")));
|
|
|
- guarantorStr = guarantorStr.replaceFirst("\n", "");
|
|
|
- enterpriseGuarantor.setGuarantorRegisteredCapital(guarantorStr.substring(guarantorStr.indexOf("注册资本:") + "注册资本:".length(), guarantorStr.indexOf("\n")));
|
|
|
- guarantorStr = guarantorStr.replaceFirst("\n", "");
|
|
|
- enterpriseGuarantor.setGuarantorLegalRepresentative(guarantorStr.substring(guarantorStr.indexOf("法定代表人:") + "法定代表人:".length(), guarantorStr.indexOf("\n")));
|
|
|
- guarantorStr = guarantorStr.replaceFirst("\n", "");
|
|
|
- enterpriseGuarantor.setGuarantorEstablishmentDate(guarantorStr.substring(guarantorStr.indexOf("成立日期:") + "成立日期:".length(), guarantorStr.indexOf("\n")));
|
|
|
- guarantorStr = guarantorStr.replaceFirst("\n", "");
|
|
|
- enterpriseGuarantor.setGuarantorBusinessOperationPeriod(guarantorStr.indexOf("营业期限:") > 0 ? guarantorStr.substring(guarantorStr.indexOf("营业期限:") + "营业期限:".length(), guarantorStr.indexOf("\n")) : null);
|
|
|
- guarantorStr = guarantorStr.replaceFirst("\n", "");
|
|
|
- enterpriseGuarantor.setGuarantorResidence(guarantorStr.substring(guarantorStr.indexOf("住所:") + "住所:".length(), guarantorStr.indexOf("\n")));
|
|
|
- guarantorStr = guarantorStr.replaceFirst("\n", "");
|
|
|
+ if (guarantorStr.contains("\n")) {
|
|
|
+ enterpriseGuarantor.setGuarantorName(guarantorStr.substring(guarantorStr.indexOf("公司名称:") + "公司名称:".length(), guarantorStr.indexOf("\n")));
|
|
|
+ guarantorStr = guarantorStr.replaceFirst("\n", "");
|
|
|
+ }
|
|
|
+ if (guarantorStr.contains("\n")) {
|
|
|
+ enterpriseGuarantor.setGuarantorUnifiedSocialCreditCode(guarantorStr.substring(guarantorStr.indexOf("统一社会信用代码:") + "统一社会信用代码:".length(), guarantorStr.indexOf("\n")));
|
|
|
+ guarantorStr = guarantorStr.replaceFirst("\n", "");
|
|
|
+ }
|
|
|
+ if (guarantorStr.contains("\n")) {
|
|
|
+ enterpriseGuarantor.setGuarantorType(guarantorStr.substring(guarantorStr.indexOf("企业类型:") + "企业类型:".length(), guarantorStr.indexOf("\n")));
|
|
|
+ guarantorStr = guarantorStr.replaceFirst("\n", "");
|
|
|
+ }
|
|
|
+ if (guarantorStr.contains("\n")) {
|
|
|
+ enterpriseGuarantor.setGuarantorRegisteredCapital(guarantorStr.substring(guarantorStr.indexOf("注册资本:") + "注册资本:".length(), guarantorStr.indexOf("\n")));
|
|
|
+ guarantorStr = guarantorStr.replaceFirst("\n", "");
|
|
|
+ }
|
|
|
+ if (guarantorStr.contains("\n")) {
|
|
|
+ enterpriseGuarantor.setGuarantorLegalRepresentative(guarantorStr.substring(guarantorStr.indexOf("法定代表人:") + "法定代表人:".length(), guarantorStr.indexOf("\n")));
|
|
|
+ guarantorStr = guarantorStr.replaceFirst("\n", "");
|
|
|
+ }
|
|
|
+ if (guarantorStr.contains("\n")) {
|
|
|
+ enterpriseGuarantor.setGuarantorEstablishmentDate(guarantorStr.substring(guarantorStr.indexOf("成立日期:") + "成立日期:".length(), guarantorStr.indexOf("\n")));
|
|
|
+ guarantorStr = guarantorStr.replaceFirst("\n", "");
|
|
|
+ }
|
|
|
+ if (guarantorStr.contains("\n")) {
|
|
|
+ enterpriseGuarantor.setGuarantorBusinessOperationPeriod(guarantorStr.indexOf("营业期限:") > 0 ? guarantorStr.substring(guarantorStr.indexOf("营业期限:") + "营业期限:".length(), guarantorStr.indexOf("\n")) : null);
|
|
|
+ guarantorStr = guarantorStr.replaceFirst("\n", "");
|
|
|
+ }
|
|
|
+ if (guarantorStr.contains("\n")) {
|
|
|
+ enterpriseGuarantor.setGuarantorResidence(guarantorStr.substring(guarantorStr.indexOf("住所:") + "住所:".length(), guarantorStr.indexOf("\n")));
|
|
|
+ guarantorStr = guarantorStr.replaceFirst("\n", "");
|
|
|
+ }
|
|
|
enterpriseGuarantor.setGuarantorBusinessScope(guarantorStr.substring(guarantorStr.indexOf("经营范围:") + "经营范围:".length()));
|
|
|
// 设置保证人信息
|
|
|
enterpriseGuarantorList.add(enterpriseGuarantor);
|
|
@@ -553,13 +585,21 @@ public class AssetsReportServiceImpl extends ServiceImpl<AssetsReportMapper, Ass
|
|
|
CRReportBaseInfoBO.PersonGuarantor personGuarantor = new CRReportBaseInfoBO.PersonGuarantor();
|
|
|
personGuarantor.setRepaymentCapacityAnalysis(infoStr.getRepaymentCapacityAnalysisStr());
|
|
|
String guarantorStr = infoStr.getInfoStr();
|
|
|
- personGuarantor.setGuarantorName(guarantorStr.substring(guarantorStr.indexOf("姓名:") + "姓名:".length(), guarantorStr.indexOf("\n")));
|
|
|
- guarantorStr = guarantorStr.replaceFirst("\n", "");
|
|
|
- personGuarantor.setGuarantorEthnicGroup(guarantorStr.substring(guarantorStr.indexOf("民族:") + "民族:".length(), guarantorStr.indexOf("\n")));
|
|
|
- guarantorStr = guarantorStr.replaceFirst("\n", "");
|
|
|
- personGuarantor.setGuarantorDateOfBirth(guarantorStr.substring(guarantorStr.indexOf("出生年月:") + "出生年月:".length(), guarantorStr.indexOf("\n")));
|
|
|
- guarantorStr = guarantorStr.replaceFirst("\n", "");
|
|
|
- personGuarantor.setGuarantorIdentificationNumber(guarantorStr.substring(guarantorStr.indexOf("身份证号码:") + "身份证号码:".length(), guarantorStr.indexOf("\n")));
|
|
|
+ if (guarantorStr.contains("\n")) {
|
|
|
+ personGuarantor.setGuarantorName(guarantorStr.substring(guarantorStr.indexOf("姓名:") + "姓名:".length(), guarantorStr.indexOf("\n")));
|
|
|
+ guarantorStr = guarantorStr.replaceFirst("\n", "");
|
|
|
+ }
|
|
|
+ if (guarantorStr.contains("\n")) {
|
|
|
+ personGuarantor.setGuarantorEthnicGroup(guarantorStr.substring(guarantorStr.indexOf("民族:") + "民族:".length(), guarantorStr.indexOf("\n")));
|
|
|
+ guarantorStr = guarantorStr.replaceFirst("\n", "");
|
|
|
+ }
|
|
|
+ if (guarantorStr.contains("\n")) {
|
|
|
+ personGuarantor.setGuarantorDateOfBirth(guarantorStr.substring(guarantorStr.indexOf("出生年月:") + "出生年月:".length(), guarantorStr.indexOf("\n")));
|
|
|
+ guarantorStr = guarantorStr.replaceFirst("\n", "");
|
|
|
+ }
|
|
|
+ if (guarantorStr.contains("\n")) {
|
|
|
+ personGuarantor.setGuarantorIdentificationNumber(guarantorStr.substring(guarantorStr.indexOf("身份证号码:") + "身份证号码:".length(), guarantorStr.indexOf("\n")));
|
|
|
+ }
|
|
|
personGuarantor.setGuarantorResidence(guarantorStr.substring(guarantorStr.indexOf("住址:") + "住址:".length()));
|
|
|
// 设置保证人信息
|
|
|
personGuarantorList.add(personGuarantor);
|
|
@@ -600,7 +640,7 @@ public class AssetsReportServiceImpl extends ServiceImpl<AssetsReportMapper, Ass
|
|
|
crReportFillBO.setChineseReportDate(DateToChinese.dateStrConvertChinese(crReportFillBO.getReportBaseInfo().getReportDate()));
|
|
|
|
|
|
// 获取汇总表合计行的下标(用来获取债权汇总表的合计信息)
|
|
|
- Integer rowindexAggregate = hasColumnIndexGetRowIndexByValue(1,"合计",fileNetConfig.getBaseDir() + calculateDoc.getDocUrl(), "汇总表");
|
|
|
+ Integer rowindexAggregate = hasColumnIndexGetRowIndexByValue(1, "合计", fileNetConfig.getBaseDir() + calculateDoc.getDocUrl(), "汇总表");
|
|
|
if (ObjectUtil.isNotNull(rowindexAggregate)) {
|
|
|
// 千分位格式处理
|
|
|
DecimalFormat decimalFormat = new DecimalFormat("#,##0.00");
|
|
@@ -622,7 +662,7 @@ public class AssetsReportServiceImpl extends ServiceImpl<AssetsReportMapper, Ass
|
|
|
}
|
|
|
|
|
|
// 获取汇总表合计行的下标(用来获取债权汇总表的合计信息)
|
|
|
- Integer rowindexAggregateTenThousand = hasColumnIndexGetRowIndexByValue(1,"合计",fileNetConfig.getBaseDir() + calculateDoc.getDocUrl(), "汇总万元表");
|
|
|
+ Integer rowindexAggregateTenThousand = hasColumnIndexGetRowIndexByValue(1, "合计", fileNetConfig.getBaseDir() + calculateDoc.getDocUrl(), "汇总万元表");
|
|
|
if (ObjectUtil.isNotNull(rowindexAggregateTenThousand)) {
|
|
|
// 千分位格式处理
|
|
|
DecimalFormat decimalFormat = new DecimalFormat("#,##0.00");
|
|
@@ -646,10 +686,11 @@ public class AssetsReportServiceImpl extends ServiceImpl<AssetsReportMapper, Ass
|
|
|
|
|
|
// 设置本次所需处置时间与清算率取值
|
|
|
crReportFillBO.setTimeNeededForThisDisposal(getCellValueByIndex(66, 1, fileNetConfig.getBaseDir() + calculateDoc.getDocUrl(), "债权清算率"));
|
|
|
- crReportFillBO.setLiquidationRateForThis(String.valueOf(new Double(getCellValueByIndex(66, 2, fileNetConfig.getBaseDir() + calculateDoc.getDocUrl(), "债权清算率")) * 100));
|
|
|
+ Integer liquidationRateForThis = (int) (new Double(getCellValueByIndex(66, 2, fileNetConfig.getBaseDir() + calculateDoc.getDocUrl(), "债权清算率")) * 100);
|
|
|
+ crReportFillBO.setLiquidationRateForThis(String.valueOf(liquidationRateForThis));
|
|
|
|
|
|
// 获取汇总万元表合计行的下标
|
|
|
- Integer allSheetRowIndex = hasColumnIndexGetRowIndexByValue(1,"合计",fileNetConfig.getBaseDir() + calculateDoc.getDocUrl(), "汇总万元表");
|
|
|
+ Integer allSheetRowIndex = hasColumnIndexGetRowIndexByValue(1, "合计", fileNetConfig.getBaseDir() + calculateDoc.getDocUrl(), "汇总万元表");
|
|
|
if (ObjectUtil.isNotNull(allSheetRowIndex)) {
|
|
|
// 设置债权综合受偿比率
|
|
|
double compositeRecoveryRatioDouble = Double.parseDouble(getCellValueByIndex(allSheetRowIndex, 13, fileNetConfig.getBaseDir() + calculateDoc.getDocUrl(), "汇总万元表"));
|
|
@@ -664,10 +705,10 @@ public class AssetsReportServiceImpl extends ServiceImpl<AssetsReportMapper, Ass
|
|
|
crReportFillBO.setConsolidatedList(consolidatedList);
|
|
|
|
|
|
// 读取综合因素分析表信息
|
|
|
- List<CRReportFillBO.IntegratedAnalysis> integratedAnalysisList = EasyExcel.read(fileNetConfig.getBaseDir() + calculateDoc.getDocUrl()).head(CRReportFillBO.IntegratedAnalysis.class).sheet("债权清算率").doReadSync();
|
|
|
+ List<CRReportFillBO.IntegratedAnalysis> integratedAnalysisList = EasyExcel.read(fileNetConfig.getBaseDir() + calculateDoc.getDocUrl()).head(CRReportFillBO.IntegratedAnalysis.class).sheet("债权清算率").doReadSync();
|
|
|
for (int i = 0; i < 56; i++) {
|
|
|
if (ObjectUtil.isNotEmpty(integratedAnalysisList.get(i).getWeight())) {
|
|
|
- integratedAnalysisList.get(i).setWeight( (int) (new Double(integratedAnalysisList.get(i).getWeight()) * 100) + "%");
|
|
|
+ integratedAnalysisList.get(i).setWeight((int) (new Double(integratedAnalysisList.get(i).getWeight()) * 100) + "%");
|
|
|
}
|
|
|
}
|
|
|
crReportFillBO.setIntegratedAnalysisList(integratedAnalysisList.subList(0, 56)); // 后边的信息是清算率信息,此处不需要
|
|
@@ -842,80 +883,80 @@ public class AssetsReportServiceImpl extends ServiceImpl<AssetsReportMapper, Ass
|
|
|
tableBuilder.endBookmark("table");
|
|
|
AsposeWordUtil.createTable(tableDoc, CRReportFillBO.IntegratedAnalysis.class, crReportFillBO.getIntegratedAnalysisList(), "table", false);
|
|
|
//将第一列整列合并
|
|
|
- tableBuilder.moveToCell(0,1,0,0);
|
|
|
+ tableBuilder.moveToCell(0, 1, 0, 0);
|
|
|
tableBuilder.getCellFormat().setVerticalMerge(CellMerge.FIRST);//合并的第一个单元格 保留的值是第一个单元格的值
|
|
|
- for(int i = 2; i < 56; i++ ) {
|
|
|
+ for (int i = 2; i < 56; i++) {
|
|
|
tableBuilder.moveToCell(0, i, 0, 0);
|
|
|
tableBuilder.getCellFormat().setVerticalMerge(CellMerge.PREVIOUS);
|
|
|
}
|
|
|
//将第二列第2行合并到31行
|
|
|
- tableBuilder.moveToCell(0,1,1,0);
|
|
|
+ tableBuilder.moveToCell(0, 1, 1, 0);
|
|
|
tableBuilder.getCellFormat().setVerticalMerge(CellMerge.FIRST);//合并的第一个单元格 保留的值是第一个单元格的值
|
|
|
- for(int i = 2; i < 31; i++ ) {
|
|
|
+ for (int i = 2; i < 31; i++) {
|
|
|
tableBuilder.moveToCell(0, i, 1, 0);
|
|
|
tableBuilder.getCellFormat().setVerticalMerge(CellMerge.PREVIOUS);
|
|
|
}
|
|
|
//将第二列第33行合并到38行
|
|
|
- tableBuilder.moveToCell(0,32,1,0);
|
|
|
+ tableBuilder.moveToCell(0, 32, 1, 0);
|
|
|
tableBuilder.getCellFormat().setVerticalMerge(CellMerge.FIRST);//合并的第一个单元格 保留的值是第一个单元格的值
|
|
|
- for(int i = 33; i < 38; i++ ) {
|
|
|
+ for (int i = 33; i < 38; i++) {
|
|
|
tableBuilder.moveToCell(0, i, 1, 0);
|
|
|
tableBuilder.getCellFormat().setVerticalMerge(CellMerge.PREVIOUS);
|
|
|
}
|
|
|
//将第二列第40行合并到47行
|
|
|
- tableBuilder.moveToCell(0,39,1,0);
|
|
|
+ tableBuilder.moveToCell(0, 39, 1, 0);
|
|
|
tableBuilder.getCellFormat().setVerticalMerge(CellMerge.FIRST);//合并的第一个单元格 保留的值是第一个单元格的值
|
|
|
- for(int i = 40; i < 47; i++ ) {
|
|
|
+ for (int i = 40; i < 47; i++) {
|
|
|
tableBuilder.moveToCell(0, i, 1, 0);
|
|
|
tableBuilder.getCellFormat().setVerticalMerge(CellMerge.PREVIOUS);
|
|
|
}
|
|
|
//将第二列第49行合并到51行
|
|
|
- tableBuilder.moveToCell(0,48,1,0);
|
|
|
+ tableBuilder.moveToCell(0, 48, 1, 0);
|
|
|
tableBuilder.getCellFormat().setVerticalMerge(CellMerge.FIRST);//合并的第一个单元格 保留的值是第一个单元格的值
|
|
|
- for(int i = 49; i < 51; i++ ) {
|
|
|
+ for (int i = 49; i < 51; i++) {
|
|
|
tableBuilder.moveToCell(0, i, 1, 0);
|
|
|
tableBuilder.getCellFormat().setVerticalMerge(CellMerge.PREVIOUS);
|
|
|
}
|
|
|
//将第二列第53行合并到55行
|
|
|
- tableBuilder.moveToCell(0,52,1,0);
|
|
|
+ tableBuilder.moveToCell(0, 52, 1, 0);
|
|
|
tableBuilder.getCellFormat().setVerticalMerge(CellMerge.FIRST);//合并的第一个单元格 保留的值是第一个单元格的值
|
|
|
- for(int i = 53; i < 55; i++ ) {
|
|
|
+ for (int i = 53; i < 55; i++) {
|
|
|
tableBuilder.moveToCell(0, i, 1, 0);
|
|
|
tableBuilder.getCellFormat().setVerticalMerge(CellMerge.PREVIOUS);
|
|
|
}
|
|
|
|
|
|
//将第三列第2行合并到31行
|
|
|
- tableBuilder.moveToCell(0,1,2,0);
|
|
|
+ tableBuilder.moveToCell(0, 1, 2, 0);
|
|
|
tableBuilder.getCellFormat().setVerticalMerge(CellMerge.FIRST);//合并的第一个单元格 保留的值是第一个单元格的值
|
|
|
- for(int i = 2; i < 31; i++ ) {
|
|
|
+ for (int i = 2; i < 31; i++) {
|
|
|
tableBuilder.moveToCell(0, i, 2, 0);
|
|
|
tableBuilder.getCellFormat().setVerticalMerge(CellMerge.PREVIOUS);
|
|
|
}
|
|
|
//将第二列第33行合并到38行
|
|
|
- tableBuilder.moveToCell(0,32,2,0);
|
|
|
+ tableBuilder.moveToCell(0, 32, 2, 0);
|
|
|
tableBuilder.getCellFormat().setVerticalMerge(CellMerge.FIRST);//合并的第一个单元格 保留的值是第一个单元格的值
|
|
|
- for(int i = 33; i < 38; i++ ) {
|
|
|
+ for (int i = 33; i < 38; i++) {
|
|
|
tableBuilder.moveToCell(0, i, 2, 0);
|
|
|
tableBuilder.getCellFormat().setVerticalMerge(CellMerge.PREVIOUS);
|
|
|
}
|
|
|
//将第二列第40行合并到47行
|
|
|
- tableBuilder.moveToCell(0,39,2,0);
|
|
|
+ tableBuilder.moveToCell(0, 39, 2, 0);
|
|
|
tableBuilder.getCellFormat().setVerticalMerge(CellMerge.FIRST);//合并的第一个单元格 保留的值是第一个单元格的值
|
|
|
- for(int i = 40; i < 47; i++ ) {
|
|
|
+ for (int i = 40; i < 47; i++) {
|
|
|
tableBuilder.moveToCell(0, i, 2, 0);
|
|
|
tableBuilder.getCellFormat().setVerticalMerge(CellMerge.PREVIOUS);
|
|
|
}
|
|
|
//将第二列第49行合并到51行
|
|
|
- tableBuilder.moveToCell(0,48,2,0);
|
|
|
+ tableBuilder.moveToCell(0, 48, 2, 0);
|
|
|
tableBuilder.getCellFormat().setVerticalMerge(CellMerge.FIRST);//合并的第一个单元格 保留的值是第一个单元格的值
|
|
|
- for(int i = 49; i < 51; i++ ) {
|
|
|
+ for (int i = 49; i < 51; i++) {
|
|
|
tableBuilder.moveToCell(0, i, 2, 0);
|
|
|
tableBuilder.getCellFormat().setVerticalMerge(CellMerge.PREVIOUS);
|
|
|
}
|
|
|
//将第二列第53行合并到55行
|
|
|
- tableBuilder.moveToCell(0,52,2,0);
|
|
|
+ tableBuilder.moveToCell(0, 52, 2, 0);
|
|
|
tableBuilder.getCellFormat().setVerticalMerge(CellMerge.FIRST);//合并的第一个单元格 保留的值是第一个单元格的值
|
|
|
- for(int i = 53; i < 55; i++ ) {
|
|
|
+ for (int i = 53; i < 55; i++) {
|
|
|
tableBuilder.moveToCell(0, i, 2, 0);
|
|
|
tableBuilder.getCellFormat().setVerticalMerge(CellMerge.PREVIOUS);
|
|
|
}
|