导出表修改

src/main/java/cn/palmte/work/controller/backend/ProjectController.java

@@ -204,7 +204,7 @@ public class ProjectController extends BaseController {
         //项目管理成本明细
         List<ProjectBudgetCostProjectManageDetail> budgetCostProjectManageDetail = projectBudgetService.getBudgetCostProjectManageDetail(project);
         Integer costProjectManageTotalAmount = projectBudgetService.getBudgetCostProjectManageAmount(project);
-        String[] headers4 = {"序号", "财务费用类别", "业务项目", "项目明细", "单位", "数量", "单价", "总金额(元)", "预估计算防范", "预估依据", "备注"};
+        String[] headers4 = {"序号", "财务费用类别", "业务项目", "项目明细", "单位", "数量", "单价", "总金额(元)", "预估计算方法", "预估依据", "备注"};
         String[] columns4 = {"tempId", "type", "name", "detail", "unit", "amount", "price", "total", "predictMethod", "predictWhy", "remark"};
         exportExcelUtils.exportCostManageDetailExcel(headers4, columns4, project, budgetBean, budgetCostProjectManageDetail, costProjectManageTotalAmount, "yyyy-MM-dd", 0, "项目管理成本表", outputStream);
         //资金计划明细

src/main/java/cn/palmte/work/utils/excel/ExportExcelUtils.java

@@ -551,7 +551,7 @@ public class ExportExcelUtils {
         Cell remarkCell = row.createCell(0);
         remarkCell.setCellStyle(style);
         remarkCell.setCellType(CellType.STRING);
-        remarkCell.setCellValue("(备注：财务记取以不含税方式核算)");
+        remarkCell.setCellValue("(备注：财务计取以不含税方式核算)");
         return index;
     }
 

src/main/java/cn/palmte/work/utils/excel/ExportFinalExcelUtils.java

@@ -422,6 +422,7 @@ public class ExportFinalExcelUtils {
         createExpropriationRow(budgetBean, cashFlowBean, settleBean, finalBean, sheet, index++, style2);
         createCompanyManageRow(budgetBean, cashFlowBean, settleBean, finalBean, sheet, index++, style2);
         createCostIncomeTaxRow(budgetBean, cashFlowBean, settleBean, finalBean, sheet, index++, style2);
+        createTotalCostManageRow(budgetBean, cashFlowBean, settleBean, finalBean, sheet, index++, style2);
         return index;
     }
 
@@ -521,6 +522,31 @@ public class ExportFinalExcelUtils {
         fifthCell.setCellValue(Utils.format(finalBean.getCostIncomeTaxFinalTotal()));
     }
 
+
+    private void createTotalCostManageRow(BudgetBean budgetBean, CashFlowBean cashFlowBean, SettleBean settleBean, FinalBean finalBean, XSSFSheet sheet, int index, CellStyle style2) {
+        Row row = sheet.createRow(index);
+        Cell firstCell = row.createCell(0);
+        firstCell.setCellStyle(style2);
+        firstCell.setCellType(CellType.STRING);
+        firstCell.setCellValue("合计");
+        Cell secondCell = row.createCell(1);
+        secondCell.setCellStyle(style2);
+        secondCell.setCellType(CellType.STRING);
+        secondCell.setCellValue("");
+        Cell thirdCell = row.createCell(2);
+        thirdCell.setCellStyle(style2);
+        thirdCell.setCellType(CellType.NUMERIC);
+        thirdCell.setCellValue(Utils.format(budgetBean.getCostExpropriationTaxExclude().add(budgetBean.getCostCompanyManageTaxExclude())));
+        Cell fourthCell = row.createCell(3);
+        fourthCell.setCellStyle(style2);
+        fourthCell.setCellType(CellType.NUMERIC);
+        fourthCell.setCellValue(Utils.format(settleBean.getCostManageTotal()));
+        Cell fifthCell = row.createCell(4);
+        fifthCell.setCellStyle(style2);
+        fifthCell.setCellType(CellType.NUMERIC);
+        fifthCell.setCellValue(Utils.format(finalBean.getCostManageTotal()));
+    }
+
     private int createProfitRow(BudgetBean budgetBean, CashFlowBean cashFlowBean, FormerBean settleBean, FinalBean finalBean, XSSFSheet sheet, int index, CellStyle style, CellStyle style2) {
         createSubTitleProfitRow(sheet, index++, style);
         createGrossProfitRow(budgetBean, cashFlowBean, settleBean, finalBean, sheet, index++, style2);

src/main/java/cn/palmte/work/utils/excel/ExportSettleExcelUtils.java

@@ -478,6 +478,7 @@ public class ExportSettleExcelUtils {
         createExpropriationRow(budgetBean, cashFlowBean, formerBean, settleBean, currentBean, sheet, index++, style2);
         createCompanyManageRow(budgetBean, cashFlowBean, formerBean, settleBean, currentBean, sheet, index++, style2);
         createCostIncomeTaxRow(budgetBean, cashFlowBean, formerBean, settleBean, currentBean, sheet, index++, style2);
+        createTotalCostManageRow(budgetBean, cashFlowBean, formerBean, settleBean, currentBean, sheet, index++, style2);
         return index;
     }
 
@@ -593,6 +594,34 @@ public class ExportSettleExcelUtils {
         sixthCell.setCellValue(Utils.format(currentBean.getCostIncomeTax()));
     }
 
+    private void createTotalCostManageRow(BudgetBean budgetBean, CashFlowBean cashFlowBean, FormerBean formerBean, SettleBean settleBean, FormerBean currentBean, XSSFSheet sheet, int index, CellStyle style2) {
+        Row row = sheet.createRow(index);
+        Cell firstCell = row.createCell(0);
+        firstCell.setCellStyle(style2);
+        firstCell.setCellType(CellType.STRING);
+        firstCell.setCellValue("合计");
+        Cell secondCell = row.createCell(1);
+        secondCell.setCellStyle(style2);
+        secondCell.setCellType(CellType.STRING);
+        secondCell.setCellValue("");
+        Cell thirdCell = row.createCell(2);
+        thirdCell.setCellStyle(style2);
+        thirdCell.setCellType(CellType.NUMERIC);
+        thirdCell.setCellValue(Utils.format(budgetBean.getCostExpropriationTaxExclude().add(budgetBean.getCostCompanyManageTaxExclude())));
+        Cell fourthCell = row.createCell(3);
+        fourthCell.setCellStyle(style2);
+        fourthCell.setCellType(CellType.NUMERIC);
+        fourthCell.setCellValue(Utils.format(formerBean.getCostManageTotal()));
+        Cell fifthCell = row.createCell(4);
+        fifthCell.setCellStyle(style2);
+        fifthCell.setCellType(CellType.NUMERIC);
+        fifthCell.setCellValue(Utils.format(settleBean.getCostManageTotal()));
+        Cell sixthCell = row.createCell(5);
+        sixthCell.setCellStyle(style2);
+        sixthCell.setCellType(CellType.NUMERIC);
+        sixthCell.setCellValue(Utils.format(currentBean.getCostManageTotal()));
+    }
+
     private int createProfitRow(BudgetBean budgetBean, CashFlowBean cashFlowBean, FormerBean formerBean, SettleBean settleBean, FormerBean currentBean, XSSFSheet sheet, int index, CellStyle style, CellStyle style2) {
         createSubTitleProfitRow(sheet, index++, style);
         createGrossProfitRow(budgetBean, cashFlowBean, formerBean, settleBean, currentBean, sheet, index++, style2);
@@ -656,12 +685,12 @@ public class ExportSettleExcelUtils {
         Cell sixthCell = row.createCell(5);
         sixthCell.setCellStyle(style2);
         sixthCell.setCellType(CellType.NUMERIC);
-//        if (currentBean.getIncomeTotalTaxExclude().abs().compareTo(BigDecimal.valueOf(0.01)) > 0) {
+        if (currentBean.getIncomeTotalTaxExclude().abs().compareTo(BigDecimal.valueOf(0.01)) > 0) {
-//
+            sixthCell.setCellValue(Utils.format(currentBean.getGrossProfit().multiply(new BigDecimal(100)).divide(currentBean.getIncomeTotalTaxExclude())));
-//        } else {
+        } else {
-//
+            sixthCell.setCellValue(Utils.format(currentBean.getGrossProfit().multiply(new BigDecimal(100))));
-//        }
+        }
-        sixthCell.setCellValue(Utils.format(currentBean.getGrossProfitMargin()));
+//        Utils.format(currentBean.getGrossProfit().multiply(new BigDecimal(100)).divide(currentBean.getIncomeTotalTaxExclude()));
     }
 
 //    private void createGrossProfitMarginRow(BudgetBean budgetBean, CashFlowBean cashFlowBean, FormerBean formerBean, SettleBean settleBean, FormerBean currentBean, XSSFSheet sheet, int index, CellStyle style2) {
@@ -701,12 +730,12 @@ public class ExportSettleExcelUtils {
         Cell sixthCell = row.createCell(5);
         sixthCell.setCellStyle(style2);
         sixthCell.setCellType(CellType.NUMERIC);
-//        if (currentBean.getIncomeTotalTaxExclude().abs().compareTo(BigDecimal.valueOf(0.01)) > 0) {
+        if (currentBean.getIncomeTotalTaxExclude().abs().compareTo(BigDecimal.valueOf(0.01)) > 0) {
-//
+            sixthCell.setCellValue(Utils.format(currentBean.getContributionProfit().multiply(new BigDecimal(100)).divide(currentBean.getIncomeTotalTaxExclude())));
-//        } else {
+        } else {
-//
+            sixthCell.setCellValue(Utils.format(currentBean.getContributionProfit().multiply(new BigDecimal(100))));
-//        }
+        }
-        sixthCell.setCellValue(Utils.format(currentBean.getContributionProfitMargin()));
+//        sixthCell.setCellValue(Utils.format(currentBean.getContributionProfitMargin()));
     }
 
 //    private void createContributionProfitRateRow(BudgetBean budgetBean, CashFlowBean cashFlowBean, FormerBean formerBean, SettleBean settleBean, FormerBean currentBean, XSSFSheet sheet, int index, CellStyle style2) {

src/main/resources/templates/admin/monthly_settle_info.ftl

@@ -354,7 +354,9 @@
             <!--选项卡（tabs）end-->
             <div class="am-margin">
                 <button type="button" class="am-btn am-btn-warning am-btn-xs" onclick="javascript:history.go(-1);">返回上一级</button>
+                <@shiro.hasPermission name="MONTHLY_SETTLE_EXPORT">
                 <button type="button" class="am-btn am-btn-primary am-btn-xs" id="exportSingle">导出</button>
+                </@shiro.hasPermission>
             </div>
         </form>
     </div>

src/main/resources/templates/admin/monthly_settle_list.ftl

@@ -125,10 +125,12 @@
                                 <div align='right'>
                                     <button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary"
                                             id="submit-btn" onclick="sub_function('query')">搜索
-                                    </button>
+                                    </button>F
+                                    <@shiro.hasPermission name="MONTHLY_SETTLE_EXPORT">
                                     <button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary"
                                             id="submit-btn-export" onclick="sub_function('export')">导出
                                     </button>
+                                    </@shiro.hasPermission>
                                 </div>
                             </td>
                         </tr>
@@ -139,6 +141,7 @@
             <div class="am-u-sm-12 am-u-md-12" style="padding:0 1.6rem 1.6rem 1rem;margin:0;">
                 <div class="am-btn-toolbar" style="padding-left:.5rem;">
                     <div class="am-btn-group am-btn-group-xs">
+                        <@shiro.hasPermission name="MONTHLY_SETTLE_IMPORT">
                         <div class="am-btn-group am-btn-group-xs am-form-file">
                             <button type="button" id="importAccount" onclick="windows()" class="am-btn am-btn-default"><span
                                         class="am-icon-archive"></span> 批量导入
@@ -148,6 +151,7 @@
                                 onclick="location.href='${base}/monthlySettle/template'">
                             <span class="am-icon-archive"></span> 导入模板下载
                         </button>
+                        </@shiro.hasPermission>
                     </div>
                 </div>
             </div>

src/main/resources/templates/admin/project_approve.ftl

@@ -1306,7 +1306,7 @@
                                                        required readonly title="公司管理费用不含税总额"></td>
                                         </tr>
                                         </tbody>
-                                        (备注：财务记取以不含税方式核算)
+                                        (备注：财务计取以不含税方式核算)
                                     </table>
 
                                     <span class="am-text-lg">利润率计算</span>

src/main/resources/templates/admin/project_budget_edit.ftl

@@ -1090,7 +1090,7 @@
                         <td><input type="text" class="number" maxlength="16" name="costCompanyManageTaxExclude" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" readonly required title="公司管理费用不含税总额"></td>
                     </tr>
                     </tbody>
-                    (备注：财务记取以不含税方式核算)
+                    (备注：财务计取以不含税方式核算)
                 </table>
 
                 <span>利润率计算</span>