获取订单中安装完成之前的所有订单信息

src/main/java/com/boco/nbd/wios/manage/controller/OrderController.java

@@ -173,6 +173,17 @@ public class OrderController {
     public BaseResponse<List<OrderVo>> getAll(OrderBo condition) {
     public BaseResponse<List<OrderVo>> getAll(OrderBo condition) {
         return new BaseResponse<>(orderService.getList(condition));
         return new BaseResponse<>(orderService.getList(condition));
     }
     }
+    /**
+     * 查询订单安装完成之前列表
+     *
+     * @param condition
+     * @return
+     */
+    @GetMapping(value = "order/installComplete")
+    @ApiOperation(value = "查询订单安装完成之前列表")
+    public BaseResponse<List<InstallComplete>> installCompleteList(OrderBo condition) {
+        return new BaseResponse<>(orderService.installCompleteList(condition));
+    }
 
 
     /**
     /**
      * 转派勘察
      * 转派勘察

src/main/java/com/boco/nbd/wios/manage/entity/bo/InstallComplete.java

+package com.boco.nbd.wios.manage.entity.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author haica
+ */
+@Data
+public class InstallComplete {
+
+    @ApiModelProperty(hidden = true)
+    private String id;
+
+    @ApiModelProperty(value = "安装单号", required = true)
+    private String outOrderId;
+
+    @ApiModelProperty(value = "仓库id", hidden = true)
+    private String warehouseId;
+    @ApiModelProperty(value = "订单状态")
+    private Integer status;
+}

src/main/java/com/boco/nbd/wios/manage/mapper/def/OrderMapper.java

@@ -89,6 +89,11 @@ public interface OrderMapper {
      * @return
      * @return
      */
      */
     List<Order> selectAll(OrderBo condition);
     List<Order> selectAll(OrderBo condition);
+    /**
+     * installCompleteList
+     * @return
+     */
+    List<InstallComplete> installCompleteList(OrderBo condition);
 
 
     /**
     /**
      * selectWarrantyOrders
      * selectWarrantyOrders

src/main/java/com/boco/nbd/wios/manage/service/impl/OrderService.java

@@ -760,6 +760,14 @@ public class OrderService {
         return list;
         return list;
     }
     }
 
 
+    /**
+     * 查询订单安装完成之前列表
+     * @return
+     */
+    public List<InstallComplete> installCompleteList(OrderBo condition) {
+        return orderMapper.installCompleteList(condition);
+    }
+
     private void setShowReserveExpBtn(OrderVo order, List<Dictionary> dic) {
     private void setShowReserveExpBtn(OrderVo order, List<Dictionary> dic) {
         if (order.getStatus() != null
         if (order.getStatus() != null
                 && (order.getStatus().intValue() == OrderStatus.SURVEY_RESERVING.getType()
                 && (order.getStatus().intValue() == OrderStatus.SURVEY_RESERVING.getType()

src/main/resources/mybatis/mapper/def/common/OrderMapper.xml

@@ -1465,6 +1465,14 @@ install_staff_phone,oem_agent_code,install_pack_type,survey_pack_type,know_after
         order by t.create_time desc
         order by t.create_time desc
     </select>
     </select>
 
 
+    <select id="installCompleteList" parameterType="com.boco.nbd.wios.manage.entity.bo.OrderBo"
+            resultType="com.boco.nbd.wios.manage.entity.bo.InstallComplete">
+        select *
+        from t_order
+        where status &lt; 64
+        order by create_time desc
+    </select>
+
     <select id="selectWarrantyOrders" resultType="com.boco.nbd.wios.manage.entity.bo.WarrantyOrder">
     <select id="selectWarrantyOrders" resultType="com.boco.nbd.wios.manage.entity.bo.WarrantyOrder">
         select tt.* from (
         select tt.* from (
         SELECT
         SELECT