FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

公开征求意见 导出bug修复

Browse Source
This commit is contained in:
yuezhihang
2022-01-05 16:18:42 +08:00
parent d7c9a117b5
commit 055b3a7fc5
3 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java
+5 -1
View File
@@ -118,7 +118,11 @@ public class SarPublicIdeaAllController extends BaseController<SarPublicIdeaAll>
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
List<SarPublicIdeaAll> data=new ArrayList<>();
if (!StringUtils.isEmpty(cid)){
data=sarPublicIdeaAllDao.getPublicAllIdea(cid,type);
if (null!=type) {
data = sarPublicIdeaAllDao.getPublicAllIdea(cid, type);
}else {
data = sarPublicIdeaAllDao.getPublicAllIdeaExport(cid,type);
}
}
List<GetExcelDto> standExcel=new ArrayList<>();
List<GetExcelDto2> standExcel2=new ArrayList<>();
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java
+2
View File
@@ -28,4 +28,6 @@ public interface SarPublicIdeaAllDao extends BaseMapper<SarPublicIdeaAll> {
Integer getAllDataByIdeaCount( @Param("ideaId")String ideaId);
List<SarPublicIdeaAll> getPublicAllIdea(@Param("cid") String cid,@Param("type")String type);
List<SarPublicIdeaAll> getPublicAllIdeaExport(@Param("cid") String cid,@Param("type")String type);
}