Merge remote-tracking branch 'origin/jtdev' into jtdev

ke

2024-05-17 086a63de1dbccc0b49a1eead4c871f1a3572762e

Merge remote-tracking branch 'origin/jtdev' into jtdev

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/controller/DownTemplateController.java

@@ -74,8 +74,8 @@

    @GetMapping("/download/overFloodInfo")
    public ResponseEntity overFloodInfo(String isShow) throws Exception{
        String time = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
        String fileName =  time+ "全省水库防汛情况.docx";
        String time = new SimpleDateFormat("yyyy-MM-dd HH").format(new Date());
        String fileName =  time+ "时报汛文件.docx";
        String fileNameURL = URLEncoder.encode(fileName, "UTF-8");
        //获取总览、大中库、明细数据
        List<TotalInfo> totalList = sjztmdService.getTotalInfo(isShow);

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/word/util/ExcelUtil.java

@@ -42,7 +42,9 @@

        //获取模板(带公式的模板需要文件编辑之后才会显示正常数据)
        InputStream inputStream = ExcelUtil.class.getClassLoader().getResourceAsStream("excel/xlsx/totalTemplateNoFormula.xlsx");
        String fileName = StringUtil.format("水库超汛限水位情况计表（{}）.xlsx",tm);
        String time = new SimpleDateFormat("yyyy-MM-dd HH").format(new Date());
        String fileName =  time+ "时报汛统计.xlsx";
//        String fileName = StringUtil.format("水库超汛限水位情况计表（{}）.xlsx",tm);
        ExcelWriter excelWriter = EasyExcel.write(getOutputStream(fileName, response)).withTemplate(inputStream).excelType(ExcelTypeEnum.XLSX).build();
        //设置公式生效
//        excelWriter.writeContext().writeWorkbookHolder().getWorkbook().setForceFormulaRecalculation(true);