From 547e3f906547a4e8085916302faede30615d1bc9 Mon Sep 17 00:00:00 2001
From: liuwu <975499773@qq.com>
Date: Thu, 14 Sep 2023 14:16:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=92=8C?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TAmentPartyAffairsController.java    | 13 ++++++++++++-
 .../resources/templates/base/affairs/affairs.html   |  2 +-
 .../templates/base/affairs/partystyle.html          |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java
index 10f9cb0..a33dd06 100644
--- a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java
+++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java
@@ -1,5 +1,7 @@
 package com.cyx.web.base.controller;
 
+import java.io.*;
+import java.nio.file.Files;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -16,6 +18,12 @@ import com.cyx.common.utils.poi.ExcelUtil;
 import com.cyx.system.service.ISysDeptService;
 import com.cyx.web.base.domain.*;
 import com.cyx.web.base.service.*;
+import com.itextpdf.text.Document;
+import com.itextpdf.text.Phrase;
+import com.itextpdf.text.pdf.PdfPCell;
+import com.itextpdf.text.pdf.PdfPTable;
+import com.itextpdf.text.pdf.PdfWriter;
+import org.apache.commons.io.FileUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -26,6 +34,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 党务Controller
  * 
@@ -116,7 +127,7 @@ public class TAmentPartyAffairsController extends BaseController
     }
 
     @GetMapping("getFiles")
-    public void getFiles(String path, HttpServletResponse response,String filename) {
+    public void getFiles(String path, HttpServletResponse response, String filename) {
         File inputFile = new File("D:\\ruoyi\\uploadPath\\upload\\2023\\08\\31\\牛舍管理查询导出_20230831105444A002.xlsx");
         try {
 
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html
index ebdcc69..9fbdb94 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html
@@ -297,7 +297,7 @@
             var options = {
                 url: url,
                 data:{
-                    type:'日常考核指标'
+                    type:'党务及意识形态'
                 },
                 expandLevel: 2,
                 onClick : zOnClick
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html b/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html
index 6ace4b4..eab8433 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html
@@ -284,7 +284,7 @@
             var options = {
                 url: url,
                 data:{
-                    type:'日常考核指标'
+                    type:'党风廉政建设'
                 },
                 expandLevel: 2,
                 onClick : zOnClick