Merge remote-tracking branch 'origin/qms/develop' into qms/develop

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoSearchQO.java

@@ -16,8 +16,7 @@ public class QmsIncomingInspectionTaskTodoSearchQO extends PageQO {
     private String key;
 
     /**
-     * 检验状态，不传则默认查 0 和 1
-     * 0=待检，1=检验中，2=已检
+     * 检验状态：0=待检，1=检验中，2=已检
      */
     private Short inspectionStatus;
 

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java

@@ -147,7 +147,7 @@ public class QmsIncomingInspectionTaskVO {
     }
 
     /**
-     * 检验状态：0=待检，1=已检
+     * 检验状态：0=待检，1=检验中，2=已检
      */
     private Short inspectionStatus;
 

nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml

@@ -155,9 +155,6 @@
                 <when test="request.inspectionStatus != null">
                     t.inspection_status = #{request.inspectionStatus}
                 </when>
-                <otherwise>
-                    t.inspection_status IN (0, 1)
-                </otherwise>
             </choose>
             AND (t.inspector_id = #{inspectorId} OR t.agent_id = #{inspectorId})
             <if test="request.key != null and request.key != ''">