提交专题报告年

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;
     }

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);
 

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);
 

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

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>