github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update AbstractInvoice.java 

Delete system.out.println
pull/6221/head
Qiuyi LI 2023-09-15 11:20:28 +02:00 committed by GitHub
parent 0561f8a870
commit abada459bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/invoice/AbstractInvoice.java
View File

@ -158,7 +158,6 @@ public abstract class AbstractInvoice<E, F, G, H, I> {
int dataRowNumber = LAST_ROW - FIRST_ROW; int dataRowNumber = LAST_ROW - FIRST_ROW;
int additionalRowNum = Math.max(data.size() - dataRowNumber - 1, 0); int additionalRowNum = Math.max(data.size() - dataRowNumber - 1, 0);
TOTAL_ROW = LAST_ROW + additionalRowNum; TOTAL_ROW = LAST_ROW + additionalRowNum;
System.out.println("initial TOTAL_ROW : " + TOTAL_ROW);
Sheet sheet = factory.getWorkbook().getSheetAt(0); Sheet sheet = factory.getWorkbook().getSheetAt(0);
org.apache.poi.ss.usermodel.Row sourceRow = sheet.getRow(FIRST_ROW); org.apache.poi.ss.usermodel.Row sourceRow = sheet.getRow(FIRST_ROW);
int footerRow = TOTAL_ROW + 1; // la ligne à laquelle le footer commence (1 ligne avant le total) int footerRow = TOTAL_ROW + 1; // la ligne à laquelle le footer commence (1 ligne avant le total)
@ -169,10 +168,7 @@ public abstract class AbstractInvoice<E, F, G, H, I> {
int fileLastRow = sheet.getLastRowNum(); //62 int fileLastRow = sheet.getLastRowNum(); //62
// shifting the footer of the file, to X rows below // shifting the footer of the file, to X rows below
// making sure the whole footer is in the same page (13 lines) and we fill the end of page with blank data lines // making sure the whole footer is in the same page (13 lines) and we fill the end of page with blank data lines
System.out.println("additionalRowNum : " + additionalRowNum);
System.out.println("PAGE_ROW_MAX : " + PAGE_ROW_MAX);
System.out.println("additionalRowNum%PAGE_ROW_MAX : " + additionalRowNum%PAGE_ROW_MAX);
// si le nombre de lignes de data rentre dans 1 page A4 // si le nombre de lignes de data rentre dans 1 page A4
if(data.size() < 44) { if(data.size() < 44) {
if(TOTAL_ROW > LAST_ROW + 3) { // s'il ne reste pas assez de place pour le footer if(TOTAL_ROW > LAST_ROW + 3) { // s'il ne reste pas assez de place pour le footer
@ -343,7 +339,6 @@ public abstract class AbstractInvoice<E, F, G, H, I> {
if (targetClient.getCurrency().equals("USD")) { if (targetClient.getCurrency().equals("USD")) {
org.apache.poi.ss.usermodel.Row dollarRow; org.apache.poi.ss.usermodel.Row dollarRow;
String formula; String formula;
System.out.println(((LAST_ROW + additionalRowNum - 44) % 63));
if ((((LAST_ROW + additionalRowNum - 44) % 63) < 13) && ((LAST_ROW + additionalRowNum - 44) % 63) > 0) { if ((((LAST_ROW + additionalRowNum - 44) % 63) < 13) && ((LAST_ROW + additionalRowNum - 44) % 63) > 0) {
dollarRow = sheet.getRow(TOTAL_ROW + 2); dollarRow = sheet.getRow(TOTAL_ROW + 2);
formula = "H"+ (TOTAL_ROW + 2) +" *" + exchangeRate; formula = "H"+ (TOTAL_ROW + 2) +" *" + exchangeRate;