Merge branch 'liweidong'

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/dto/TaskDto.java

@@ -65,4 +65,7 @@ public class TaskDto extends BaseEntity {
     @Schema(description = "终点站点")
     private String endStationCode;
 
+    @Schema(description = "状态")
+    private String status;
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBoxController.java

@@ -118,7 +118,8 @@ public class OrderBoxController extends BladeController {
             @Parameter(name = "wcId", description = "作业中心ID", in = ParameterIn.QUERY, schema = @Schema(type = "Long")),
             @Parameter(name = "taskStatus", description = "当前状态 0:退回(超重) 1:站点 2:库位 3:等待 4:回库 5:结束", in = ParameterIn.QUERY, schema = @Schema(type = "Integer")),
             @Parameter(name = "startTime", description = "开始时间", in = ParameterIn.QUERY, schema = @Schema(type = "Date")),
-            @Parameter(name = "endTime", description = "结束时间", in = ParameterIn.QUERY, schema = @Schema(type = "Date"))
+            @Parameter(name = "endTime", description = "结束时间", in = ParameterIn.QUERY, schema = @Schema(type = "Date")),
+            @Parameter(name = "status", description = "任务状态", in = ParameterIn.QUERY, schema = @Schema(type = "String"))
 
     })
     public R<IPage<TaskVO>> page(@Parameter(hidden = true) TaskDto taskDto, Query query) {

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/mapper/TaskMapper.xml

@@ -70,6 +70,9 @@
         <if test="taskDto.endStationCode != null and taskDto.endStationCode != ''">
             AND ls.STATION_CODE LIKE '%' || #{taskDto.endStationCode} || '%'
         </if>
+        <if test="taskDto.status != null and taskDto.status != ''">
+            AND l.STATUS = #{taskDto.status}
+        </if>
         ORDER BY l.UPDATE_TIME DESC
     </select>
 </mapper>