From 2f402f737de6fc0d0cb04b38884458cee71dd1d6 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Thu, 9 Dec 2021 10:24:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=BC=80=E5=BE=81=E6=B1=82=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=E5=AF=BC=E5=87=BA=20=E9=83=A8=E9=97=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SarPublicIdeaAllController.java            | 5 +----
 .../adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java | 2 ++
 .../adc/da/slrs/sarStandItems/entity/SarStandItems.java   | 4 ++--
 .../sarStandProjectLibrary/entity/StandAttrInfoDto.java   | 3 +++
 .../mapper/sarStandIdea/SarPublicIdeaAllMapper.xml        | 8 ++++++++
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java
index 7077606a..4d02e421 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaAllController.java
+++ b/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<>();
-                wrapper.eq(SarPublicIdeaAll.CID,cid);
-                wrapper.orderByAsc("part_code");
-                data=sarPublicIdeaAllDao.selectList(wrapper);
+                data=sarPublicIdeaAllDao.getPublicAllIdea(cid);
             }
             List<GetExcelDto> standExcel=new ArrayList<>();
             for (SarPublicIdeaAll sarPublicIdeaAll:data){
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java
index 55791c62..d3fae93a 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/dao/SarPublicIdeaAllDao.java
+++ b/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);
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java
index 06cd41a3..7d32b016 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java
+++ b/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 = "符合性要求-符合性状态")
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java
index e6a4db9e..5ed171da 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java
+++ b/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 添加类/接口功能描述
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml
index 61e052a0..864e0387 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml
+++ b/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>