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

xieb

2024-01-24 e143a763c75da7cc020bf19259256c8155b5da96

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

@@ -63,15 +63,15 @@
   }

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

      byte[] data = WordUtil.GetOverInfo(totalList,dzkList,overDetailList,szInfoList);

@@ -86,12 +86,12 @@
   }

   @GetMapping("/download/getOverFloodInfoExcel")
   public void getOverFloodInfoExcel(HttpServletResponse response) throws Exception {
   public void getOverFloodInfoExcel(HttpServletResponse response,String isShow) throws Exception {

      //获取总览、大中库、明细数据
      List<TotalInfo> totalList = sjztmdService.getTotalInfo();
      List<DzkInfo> dzkList = sjztmdService.getDzkInfo();
      List<OverDetail> overDetailList = sjztmdService.getOverDetailInfo();
      List<TotalInfo> totalList = sjztmdService.getTotalInfo(isShow);
      List<DzkInfo> dzkList = sjztmdService.getDzkInfo(isShow);
      List<OverDetail> overDetailList = sjztmdService.getOverDetailInfo(isShow);

      ExcelUtil.generateExcel(response,totalList,dzkList,overDetailList);
   }