From 34bf6a2580672e6fde851e0658e98989f1118589 Mon Sep 17 00:00:00 2001
From: 18536819133 <gty308525>
Date: Fri, 20 Oct 2023 17:14:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=93=E9=A2=98=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E5=B9=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/yada/SpecialReportController.java   |  6 +++---
 .../com/ruoyi/system/domain_yada/UploadSpecialVO.java  | 10 ++++++++++
 .../ruoyi/system/mapper_yada/SpecialReportMapper.java  |  2 +-
 .../system/service_yada/ISpecialReportService.java     |  2 +-
 .../service_yada/impl/SpecialReportServiceimpl.java    |  4 ++--
 .../resources/mapper/system/SpecialReportMapper.xml    |  2 +-
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialReportController.java
index 08d7f4309..9da237698 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialReportController.java
@@ -28,7 +28,7 @@ public class SpecialReportController {
 
     @RequestMapping(value = "/getSpecial", method = {RequestMethod.GET})
     @ApiOperation(value = "返回专题数据", httpMethod = "GET")
-    public AjaxResult getSpecial(String zone) {
+    public AjaxResult getSpecial(String zone,String year) {
         List<SpecialVO> value = service.selectSpecial(zone);
 
         return AjaxResult.success(value);
@@ -60,8 +60,8 @@ public class SpecialReportController {
 
     @RequestMapping(value = "/getUploadSpecial")
     @ApiOperation(value = "返回专题通报")
-    public AjaxResult getUploadSpecial(String fileName) {
-        List<UploadSpecialVO> value = service.selectUploadSpecial(fileName);
+    public AjaxResult getUploadSpecial(String fileName,@RequestParam(value = "year",required = false) String year) {
+        List<UploadSpecialVO> value = service.selectUploadSpecial(fileName,year);
 
         return AjaxResult.success(value);
     }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadSpecialVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadSpecialVO.java
index 5672e1637..62a7f24e8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadSpecialVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadSpecialVO.java
@@ -27,6 +27,16 @@ public class UploadSpecialVO extends SysBaseEntity {
 
     private String sign;
 
+    private String year;
+
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
+
     public String getId() {
         return id;
     }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/SpecialReportMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/SpecialReportMapper.java
index f4969a62c..9c965c129 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/SpecialReportMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/SpecialReportMapper.java
@@ -14,7 +14,7 @@ public interface SpecialReportMapper {
 
   List<SpecialVO> selectSpecial(@Param("zone") String zone);
 
-  List<UploadSpecialVO> selectUploadSpecial(@Param("fileName") String fileName);
+  List<UploadSpecialVO> selectUploadSpecial(@Param("fileName") String fileName,@Param("year")String year);
 
   List<UploadSpecialVO> selectUploadSpecial1(@Param("fileName") String fileName);
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ISpecialReportService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ISpecialReportService.java
index b369afcf0..bd99018f0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ISpecialReportService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ISpecialReportService.java
@@ -15,7 +15,7 @@ public interface ISpecialReportService {
 
     List<SpecialVO> selectSpecial(String zone);
 
-    List<UploadSpecialVO> selectUploadSpecial(String fileName);
+    List<UploadSpecialVO> selectUploadSpecial(String fileName,String year);
 
     List<UploadSpecialVO> selectUploadSpecial1(String fileName);
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/SpecialReportServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/SpecialReportServiceimpl.java
index b77b004de..daa0ab1b8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/SpecialReportServiceimpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/SpecialReportServiceimpl.java
@@ -27,8 +27,8 @@ public class SpecialReportServiceimpl implements ISpecialReportService {
     }
 
     @Override
-    public List<UploadSpecialVO> selectUploadSpecial(String fileName) {
-        return mapper.selectUploadSpecial(fileName);
+    public List<UploadSpecialVO> selectUploadSpecial(String fileName,String year) {
+        return mapper.selectUploadSpecial(fileName,year);
     }
 
     @Override
diff --git a/ruoyi-system/src/main/resources/mapper/system/SpecialReportMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SpecialReportMapper.xml
index 09511f925..0f79eaf11 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SpecialReportMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SpecialReportMapper.xml
@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT  <include refid="Upload"/>  FROM  upload_special
         WHERE type='1'
         <if test="fileName!= null and fileName !=''">
-            AND file_name = #{fileName}
+            AND file_name = #{fileName} and year=#{year}
         </if>
     </select>