diff --git a/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt b/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt index 4389e35..115ccae 100644 --- a/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt +++ b/src/main/java/com/ffii/tsms/modules/report/service/ReportService.kt @@ -684,12 +684,12 @@ open class ReportService( rowIndex = 9 sheet.getRow(rowIndex).apply { createCell(1).apply { - setCellValue(project.expectedTotalFee!!) + setCellValue(project.expectedTotalFee!! * 0.8) cellStyle.dataFormat = accountingStyle } createCell(2).apply { - setCellValue(project.expectedTotalFee!! / 0.8) + setCellValue(project.expectedTotalFee!!) cellStyle.dataFormat = accountingStyle } } diff --git a/src/main/resources/db/changelog/changes/20240529_01_cyril/01_insert_authority.sql b/src/main/resources/db/changelog/changes/20240529_01_cyril/01_insert_authority.sql new file mode 100644 index 0000000..471ea88 --- /dev/null +++ b/src/main/resources/db/changelog/changes/20240529_01_cyril/01_insert_authority.sql @@ -0,0 +1,8 @@ +-- liquibase formatted sql +-- changeset cyril:authority, user_authority + +INSERT INTO authority (authority,name) +VALUES ('DELETE_PROJECT','delete project'); + +INSERT INTO user_authority (userId,authId) +VALUES (1,19);