公开征求意见 导出bug修复

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java

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

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

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