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

bug-预报废审核列表

This commit is contained in:
mashuai 2024-05-15 09:15:42 +08:00
parent 244c850889
commit 7426badbf3
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/ScrapApplyDetailsVO.java
View File

@ -59,6 +59,14 @@ public class ScrapApplyDetailsVO {
*/ */
@Excel(name = "维修单号",sort = 6) @Excel(name = "维修单号",sort = 6)
private String repairNum; private String repairNum;
/**
* 单位id
*/
private String unitId;
/**
* 工程id
*/
private String projectId;
/** /**
* 审核状态 * 审核状态

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

@ -428,7 +428,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
tk.CODE scrapNum, tk.CODE scrapNum,
tk.task_status taskStatus, tk.task_status taskStatus,
dic.NAME taskStatusName, dic.NAME taskStatusName,
bui.unit_id unitId,
bui.unit_name unitName, bui.unit_name unitName,
bpl.lot_id projectId,
bpl.lot_name projectName, bpl.lot_name projectName,
su.nick_name createBy, su.nick_name createBy,
tk.create_time createTime, tk.create_time createTime,
@ -464,18 +466,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE WHERE
sad.scrap_source IN ( '1', '2' ) sad.scrap_source IN ( '1', '2' )
AND tk.task_type IN ('20' , '21') AND tk.task_type IN ('20' , '21')
<if test="keyword != null and keyword != ''"> <if test="keywords != null and keywords != ''">
AND (locate(#{keyword}, tk.create_by) > 0 AND (locate(#{keywords}, tk.create_by) > 0
or locate(#{keyword}, tk.CODE) > 0 or locate(#{keywords}, tk.CODE) > 0
or locate(#{keyword}, bui.unit_name) > 0 or locate(#{keywords}, bui.unit_name) > 0
or locate(#{keyword}, bpl.lot_name) > 0 or locate(#{keywords}, bpl.lot_name) > 0
or locate(#{keyword}, tk1.CODE) > 0) or locate(#{keywords}, tk1.CODE) > 0)
</if> </if>
<if test="backUnit != null and backUnit != ''"> <if test="backUnit != null and backUnit != ''">
and bui.unit_id = #{backUnit} and bui.unit_id = #{backUnit}
</if> </if>
<if test="repairStatus != null and repairStatus != ''"> <if test="taskStatus != null and taskStatus != ''">
and tk.task_status = #{repairStatus} and tk.task_status = #{taskStatus}
</if> </if>
<if test="taskIdList != null and taskIdList != ''"> <if test="taskIdList != null and taskIdList != ''">
and tk.task_id in #{taskIdList} and tk.task_id in #{taskIdList}
@ -483,14 +485,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="backPro != null and backPro != ''"> <if test="backPro != null and backPro != ''">
and bpl.lot_id = #{backPro} and bpl.lot_id = #{backPro}
</if> </if>
<if test="scrapSource != null and scrapSource != ''">
and sad.scrap_source = #{scrapSource}
</if>
<if test="type != null and type != ''"> <if test="type != null and type != ''">
and mt1.type_id = #{type} and mt1.type_id = #{type}
</if> </if>
<if test="backCode != null and backCode != ''"> <if test="backCode != null and backCode != ''">
and locate(#{backCode}, tk.code) > 0 and locate(#{backCode}, tk.code) > 0
</if> </if>
<if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''"> <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
and tk.create_time between #{params.beginTime} and #{params.endTime} and DATE(tk.create_time) between #{beginTime} and #{endTime}
</if> </if>
GROUP BY tk.CODE GROUP BY tk.CODE
order by tk.create_time desc order by tk.create_time desc