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);
}
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml
+15
View File
@@ -46,4 +46,19 @@
</if>
ORDER BY part_code ASC
</select>
<select id="getPublicAllIdeaExport" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
SELECT sar_public_idea_all.id,reason,ts_institution.name as deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid,chapter_name,wk_flag,sar_public_idea_all.state
FROM sar_public_idea_all
left join ts_user on ts_user.USID=sar_public_idea_all.user_id
left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
WHERE cid = #{cid}
<if test="null==type or ''==type">
and sar_public_idea_all.wk_flag is null
</if>
<if test="null!=type and type != ''">
and sar_public_idea_all.wk_flag ='1'
</if>
ORDER BY part_code ASC
</select>
</mapper>