bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

退料审核代码提交

This commit is contained in:
liang.chao 2024-05-15 13:22:40 +08:00
parent 4964d48407
commit ec1c6141b1
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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