退料审核代码提交

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapApplyDetails.java

@@ -119,6 +119,7 @@ public class ScrapApplyDetails extends BaseEntity
     private Integer repairStatus;
 
     private String keywords;
+    private String keyword;
     private String typeName;
 
     /** 任务ID集合 --导出时可以选择导出*/

sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml

@@ -423,7 +423,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         group by scrap_type
     </select>
     <select id="getScrapApplyList" resultType="com.bonus.sgzb.material.vo.ScrapApplyDetailsVO">
-
         SELECT
         tk.CODE scrapNum,
         tk.task_status taskStatus,
@@ -498,7 +497,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         GROUP BY tk.CODE
         order by tk.create_time desc
-
     </select>
     <select id="scrapTaskReviewList" resultType="com.bonus.sgzb.material.vo.ScrapApplyDetailsVO">
         SELECT