Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

提交专题报告年

Browse Source
This commit is contained in:
18536819133 2023-10-20 17:14:48 +08:00
parent e9a3ad8dc2
commit 34bf6a2580
6 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialReportController.java
View File

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

10
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadSpecialVO.java
View File

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

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/SpecialReportMapper.java
View File

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

2
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ISpecialReportService.java
View File

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

4
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/SpecialReportServiceimpl.java
View File

@ -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

2
ruoyi-system/src/main/resources/mapper/system/SpecialReportMapper.xml
View File

@ -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>