公开征求意见导出 部门数据导出

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

@@ -102,10 +102,7 @@ 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)){
-                QueryWrapper<SarPublicIdeaAll> wrapper = new QueryWrapper<>();
+                data=sarPublicIdeaAllDao.getPublicAllIdea(cid);
-                wrapper.eq(SarPublicIdeaAll.CID,cid);
-                wrapper.orderByAsc("part_code");
-                data=sarPublicIdeaAllDao.selectList(wrapper);
             }
             List<GetExcelDto> standExcel=new ArrayList<>();
             for (SarPublicIdeaAll sarPublicIdeaAll:data){

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java

@@ -26,4 +26,6 @@ public interface SarPublicIdeaAllDao extends BaseMapper<SarPublicIdeaAll> {
     List<SarPublicIdeaAll> getAllDataByIdea(@Param("page")Integer page,@Param("size")Integer size, @Param("ideaId")String ideaId);
 
     Integer getAllDataByIdeaCount( @Param("ideaId")String ideaId);
+
+    List<SarPublicIdeaAll> getPublicAllIdea(@Param("cid") String cid);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java

@@ -125,12 +125,12 @@ public class SarStandItems extends BaseEntity {
     @ApiModelProperty(value = "新车型实施日期")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("XCXSSRQ")
-    private Date xccssrq;
+    private String xccssrq;
 
     @ApiModelProperty(value = "在产车实施日期")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField("ZCCSSRQ")
-    private Date zccssrq;
+    private String zccssrq;
 
 
     @ApiModelProperty(value = "符合性要求-符合性状态")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java

@@ -4,8 +4,11 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 /**
  * //TODO 添加类/接口功能描述

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml

@@ -24,4 +24,12 @@
          FROM sar_public_idea_all WHERE
          idea_id = #{ideaId}
     </select>
+
+    <select id="getPublicAllIdea" resultType="com.adc.da.slrs.sarStandIdea.entity.SarPublicIdeaAll">
+        SELECT sar_public_idea_all.id,reason,ts_user.INSTITUTION_NAME as deptName,old_text,new_text,dept_id,part_code,user_name,user_id,content,idea_id,cid
+        FROM sar_public_idea_all
+        left join ts_user on ts_user.USID=sar_public_idea_all.user_id
+        WHERE cid = #{cid}
+        ORDER BY part_code ASC
+    </select>
 </mapper>