Compare commits
No commits in common. "8fc926f7ffcf2dcbec7146d54aed7e78a45176d8" and "24bdaeaea464417d31b2bb1ddc899f74d4f3090e" have entirely different histories.
8fc926f7ff
...
24bdaeaea4
|
|
@ -16,7 +16,8 @@ public class QmsIncomingInspectionTaskTodoSearchQO extends PageQO {
|
||||||
private String key;
|
private String key;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 检验状态:0=待检,1=检验中,2=已检
|
* 检验状态,不传则默认查 0 和 1
|
||||||
|
* 0=待检,1=检验中,2=已检
|
||||||
*/
|
*/
|
||||||
private Short inspectionStatus;
|
private Short inspectionStatus;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -147,7 +147,7 @@ public class QmsIncomingInspectionTaskVO {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 检验状态:0=待检,1=检验中,2=已检
|
* 检验状态:0=待检,1=已检
|
||||||
*/
|
*/
|
||||||
private Short inspectionStatus;
|
private Short inspectionStatus;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -155,6 +155,9 @@
|
||||||
<when test="request.inspectionStatus != null">
|
<when test="request.inspectionStatus != null">
|
||||||
t.inspection_status = #{request.inspectionStatus}
|
t.inspection_status = #{request.inspectionStatus}
|
||||||
</when>
|
</when>
|
||||||
|
<otherwise>
|
||||||
|
t.inspection_status IN (0, 1)
|
||||||
|
</otherwise>
|
||||||
</choose>
|
</choose>
|
||||||
AND (t.inspector_id = #{inspectorId} OR t.agent_id = #{inspectorId})
|
AND (t.inspector_id = #{inspectorId} OR t.agent_id = #{inspectorId})
|
||||||
<if test="request.key != null and request.key != ''">
|
<if test="request.key != null and request.key != ''">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue