|
|
|
@@ -1590,7 +1590,7 @@ open class ReportService( |
|
|
|
|
|
|
|
val cell4 = getCell(4) ?: createCell(4) |
|
|
|
cell4.cellFormula = |
|
|
|
"(((C{currentRow}+B{currentRow})/2)/20)/8".replace("{currentRow}", (rowIndex + 1).toString()) |
|
|
|
"(((C{currentRow}+B{currentRow})/2)/150)".replace("{currentRow}", (rowIndex + 1).toString()) |
|
|
|
// getCell(4).cellStyle.dataFormat = accountingStyle |
|
|
|
cell4.cellStyle.dataFormat = accountingStyle |
|
|
|
CellUtil.setAlignment(cell4, HorizontalAlignment.CENTER) |
|
|
|
@@ -1941,6 +1941,7 @@ open class ReportService( |
|
|
|
+ " select p.code, sum(i.issueAmount) as sumIssuedAmount , sum(i.paidAmount) as sumPaidAmount" |
|
|
|
+ " from invoice i" |
|
|
|
+ " left join project p on p.code = i.projectCode" |
|
|
|
+ " where i.deleted = false " |
|
|
|
+ " group by p.code" |
|
|
|
+ " )" |
|
|
|
+ " select p.code, p.description, c.name as client, IFNULL(s2.name, \"N/A\") as subsidiary, concat(t.code, \' - \', t.name) as teamLead, p.planStart , p.planEnd , p.expectedTotalFee, ifnull(p.subContractFee, 0) as subContractFee, " |
|
|
|
@@ -2266,6 +2267,7 @@ open class ReportService( |
|
|
|
+ " select p.code, sum(i.issueAmount) as sumIssuedAmount , sum(i.paidAmount) as sumPaidAmount" |
|
|
|
+ " from invoice i" |
|
|
|
+ " left join project p on p.code = i.projectCode" |
|
|
|
+ " where i.deleted = false " |
|
|
|
+ " group by p.code" |
|
|
|
+ " )" |
|
|
|
+ " select p.code, p.description, c.name as client, IFNULL(s2.name, \"N/A\") as subsidiary, concat(t.code, \" - \", t.name) as teamLead," |
|
|
|
|
