订单列表报错问题

src/main/java/com/boco/nbd/wios/flow/controller/FlowOrderController.java

@@ -17,6 +17,7 @@ import com.boco.nbd.wios.flow.util.ValidUtil;
 import com.boco.nbd.wios.manage.contants.WiosConstant;
 import com.boco.nbd.wios.manage.contants.WiosConstant;
 import com.boco.nbd.wios.flow.entity.pdf.BlockPairBo;
 import com.boco.nbd.wios.flow.entity.pdf.BlockPairBo;
 import com.boco.nbd.wios.manage.entity.bo.MaterialsEx;
 import com.boco.nbd.wios.manage.entity.bo.MaterialsEx;
+import com.boco.nbd.wios.manage.entity.bo.OrderVo;
 import com.boco.nbd.wios.manage.mapper.extdb.MaterialsMapperEx;
 import com.boco.nbd.wios.manage.mapper.extdb.MaterialsMapperEx;
 import com.boco.nbd.wios.manage.service.impl.OrderInvoiceService;
 import com.boco.nbd.wios.manage.service.impl.OrderInvoiceService;
 import com.ihidea.core.support.session.SessionInfo;
 import com.ihidea.core.support.session.SessionInfo;
@@ -195,7 +196,7 @@ public class FlowOrderController {
     @GetMapping("/getCanDeliveryOrder")
     @GetMapping("/getCanDeliveryOrder")
     @ApiOperation("获取可以发货的订单列表")
     @ApiOperation("获取可以发货的订单列表")
     public ResponseMessage2 getCanDeliveryOrder(@RequestParam String orderId,@RequestParam String  isproduct){
     public ResponseMessage2 getCanDeliveryOrder(@RequestParam String orderId,@RequestParam String  isproduct){
-        List<OrderPO> list=flowOrderMapper.getCanDeliveryOrder(orderId);
+        List<OrderVo> list=flowOrderMapper.getCanDeliveryOrder(orderId);
         list.stream().forEach(i->{
         list.stream().forEach(i->{
             MaterialsEx materials=materialsMapperEx.materialsByMaterialsCode(i.getItemModel());
             MaterialsEx materials=materialsMapperEx.materialsByMaterialsCode(i.getItemModel());
            if (materials!=null){
            if (materials!=null){
@@ -203,7 +204,7 @@ public class FlowOrderController {
            }
            }
         });
         });
         if ("品牌墙盒".equals(isproduct)){
         if ("品牌墙盒".equals(isproduct)){
-            List<OrderPO> has = list.stream().filter(i -> i.getInstallWallboxModel().equals("CAMS")).collect(Collectors.toList());
+            List<OrderVo> has = list.stream().filter(i -> i.getInstallWallboxModel().equals("CAMS")).collect(Collectors.toList());
             return ResponseMessage2.Success2(has);
             return ResponseMessage2.Success2(has);
         }else {
         }else {
             //List<OrderPO> has = list.stream().filter(i -> !i.getInstallWallboxModel().equals("CAMS")).collect(Collectors.toList());
             //List<OrderPO> has = list.stream().filter(i -> !i.getInstallWallboxModel().equals("CAMS")).collect(Collectors.toList());

src/main/java/com/boco/nbd/wios/flow/entity/po/OrderPO.java

@@ -713,9 +713,6 @@ public class OrderPO implements Serializable {
     @ApiModelProperty(value = "流程标识信息字段", hidden = true)
     @ApiModelProperty(value = "流程标识信息字段", hidden = true)
     @Transient
     @Transient
     private String message;
     private String message;
-    @Column(name = "material_name")
-    @ApiModelProperty(value = "物料名称", required = true)
-    private String materialName;
 
 
 
 
     /**
     /**

src/main/java/com/boco/nbd/wios/flow/mapper/def/FlowOrderMapper.java

@@ -5,6 +5,7 @@ import com.boco.nbd.wios.flow.entity.bo.OrderBO;
 import com.boco.nbd.wios.flow.entity.po.*;
 import com.boco.nbd.wios.flow.entity.po.*;
 import com.boco.nbd.wios.flow.entity.qo.CamsOrderQo;
 import com.boco.nbd.wios.flow.entity.qo.CamsOrderQo;
 import com.boco.nbd.wios.manage.entity.bo.OrderBo;
 import com.boco.nbd.wios.manage.entity.bo.OrderBo;
+import com.boco.nbd.wios.manage.entity.bo.OrderVo;
 import com.ihidea.core.support.session.SessionInfo;
 import com.ihidea.core.support.session.SessionInfo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Select;
@@ -97,6 +98,6 @@ public interface FlowOrderMapper extends BaseMapper3<OrderPO> {
     List<VisitOrderPO> getVisitOrderScore(OrderBo orderBo);
     List<VisitOrderPO> getVisitOrderScore(OrderBo orderBo);
 
 
     @Select("select o.* from t_order o inner join t_wallbox_apply w on o.id=w.order_id where o.id like concat('%', #{orderId}, '%') and w.check_status=2 and IFNULL(w.tracking_status,'0')='0'")
     @Select("select o.* from t_order o inner join t_wallbox_apply w on o.id=w.order_id where o.id like concat('%', #{orderId}, '%') and w.check_status=2 and IFNULL(w.tracking_status,'0')='0'")
-    List<OrderPO> getCanDeliveryOrder(@Param("orderId")String orderId);
+    List<OrderVo> getCanDeliveryOrder(@Param("orderId")String orderId);
 
 
 }
 }

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

@@ -211,6 +211,14 @@ public class WallboxApplyController {
     public BaseResponse<Object> getInfo(@PathVariable("id") Long id) {
     public BaseResponse<Object> getInfo(@PathVariable("id") Long id) {
         return new BaseResponse<>(wallboxApplyService.selectWallboxApplyById(id));
         return new BaseResponse<>(wallboxApplyService.selectWallboxApplyById(id));
     }
     }
+    /**
+     * 根据订单号查询详情
+     */
+    @ApiOperation(value = "根据订单号查询详情")
+    @GetMapping(value = "/{orderId}")
+    public BaseResponse<Object> getInfoByOrderId(@PathVariable("orderId") String orderId) {
+        return new BaseResponse<>(wallboxApplyService.getInfoByOrderId(orderId));
+    }
 
 
     /**
     /**
      * 获取墙盒详细信息
      * 获取墙盒详细信息

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

 package com.boco.nbd.wios.manage.entity.bo;
 package com.boco.nbd.wios.manage.entity.bo;
+import com.boco.nbd.framework.workflow.annotation.EnumConvert;
 import com.boco.nbd.wios.manage.entity.common.bo.UploadFile;
 import com.boco.nbd.wios.manage.entity.common.bo.UploadFile;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
+import javax.persistence.Column;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.List;
 
 
@@ -107,4 +109,8 @@ public class OrderVo extends Order {
 
 
     @ApiModelProperty("设备id")
     @ApiModelProperty("设备id")
     private String wallboxItemId;
     private String wallboxItemId;
+    @ApiModelProperty("墙盒设备型号")
+    private String itemModel;
+    @ApiModelProperty("物料名称")
+    private String materialName;
 }
 }

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

@@ -27,6 +27,14 @@ public interface WallboxApplyMapper {
      * @return 墙盒申请
      * @return 墙盒申请
      */
      */
     WallboxApplyInstallInfoVO selectWallboxApplyById(Long id);
     WallboxApplyInstallInfoVO selectWallboxApplyById(Long id);
+    /**
+     * 根据订单号查询详情
+     *
+     * @param orderId
+     * @return 墙盒申请
+     */
+    WallboxApplyInstallInfoVO getInfoByOrderId(String orderId);
+
 
 
     /**
     /**
      * 墙盒状态
      * 墙盒状态

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

@@ -65,6 +65,18 @@ public class WallboxApplyService {
         wallboxApplyInstallInfoVO.setLogisticCompany("德邦物流");
         wallboxApplyInstallInfoVO.setLogisticCompany("德邦物流");
         return wallboxApplyInstallInfoVO;
         return wallboxApplyInstallInfoVO;
     }
     }
+    /**
+     * 根据订单号查询详情
+     *
+     * @param id 墙盒申请主键
+     * @return 墙盒申请
+     */
+
+    public WallboxApplyInstallInfoVO getInfoByOrderId(String orderId) {
+        WallboxApplyInstallInfoVO wallboxApplyInstallInfoVO=wallboxApplyMapper.getInfoByOrderId(orderId);
+        wallboxApplyInstallInfoVO.setLogisticCompany("德邦物流");
+        return wallboxApplyInstallInfoVO;
+    }
 
 
 
 
     /**
     /**

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

@@ -196,6 +196,42 @@
                  left join t_oem_cascade tc on tc.id = t_wallbox_apply.wallbox_model
                  left join t_oem_cascade tc on tc.id = t_wallbox_apply.wallbox_model
         where t_wallbox_apply.id = #{id}
         where t_wallbox_apply.id = #{id}
     </select>
     </select>
+    <select id="getInfoByOrderId" parameterType="Long"
+            resultType="com.boco.nbd.wios.manage.entity.vo.WallboxApplyInstallInfoVO">
+        SELECT t_wallbox_apply.id,
+               t_wallbox_apply.order_id,
+               t_wallbox_apply.supplier_id,
+               t_wallbox_apply.supplier_team,
+               t_order.wallbox_model,
+               t_order.item_model as material_type,
+               t_wallbox_apply.tracking_status,
+               t_order.region_id,
+               reg.name           as region_name,
+               t_order.install_reserve_time,
+               t_order.address,
+               t_order.out_order_id,
+               t_wallbox_apply.if_emergency,
+               t_wallbox_apply.if_timeout,
+               t_wallbox_apply.check_account,
+               wb_account.name    as check_name,
+               t_wallbox_apply.check_status,
+               t_wallbox_apply.check_remarks,
+               t_wallbox_apply.check_time,
+               t_order.install_reserve_time,
+               t_wallbox_apply.create_account,
+               t_wallbox_apply.created_time,
+               t_wallbox_apply.modify_account,
+               t_wallbox_apply.modify_time,
+               t_order.shipno     as tracking_number,
+               t_order.status     as install_status,
+               tc.name as wallboxModelName
+        FROM t_wallbox_apply
+                 LEFT JOIN t_order ON t_wallbox_apply.order_id = t_order.id
+                 left join t_region reg on reg.id = t_wallbox_apply.region_id
+                 left join wb_account on wb_account.id = t_wallbox_apply.check_account
+                 left join t_oem_cascade tc on tc.id = t_wallbox_apply.wallbox_model
+        where t_wallbox_apply.order_id = #{orderId}
+    </select>
 
 
     <select id="selectWallboxDetail" parameterType="com.boco.nbd.wios.manage.entity.dto.WallboxApplyDetailQueryDTO"
     <select id="selectWallboxDetail" parameterType="com.boco.nbd.wios.manage.entity.dto.WallboxApplyDetailQueryDTO"
             resultType="com.boco.nbd.wios.manage.entity.vo.WallboxApplyDetailVO">
             resultType="com.boco.nbd.wios.manage.entity.vo.WallboxApplyDetailVO">