feat: 墙盒申请状态查询

src/main/java/com/boco/nbd/wios/manage/entity/vo/WallboxApplyDetailVO.java

@@ -3,6 +3,8 @@ package com.boco.nbd.wios.manage.entity.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * <p>
  * 墙盒申请详情页面
@@ -31,41 +33,80 @@ public class WallboxApplyDetailVO {
 
     @ApiModelProperty(value = "墙盒设备编号")
     private String wallboxCode;
+    @ApiModelProperty(value = "预约安装时间")
+    private String installFinishTime;
 
     @ApiModelProperty(value = "墙盒品牌")
     private String wallboxModel;
-
-
-    /**
-     * t_wallbox_apply
-     */
+    private String regionLevel;
+    private String provinceName;
+    private String areaName;
+    private String countryName;
+    private String warehouseId;
+    private String address;
+    private String outOrderId;
     @ApiModelProperty(value = "物流单号")
     private String trackingNumber;
-    @ApiModelProperty(value = "物流状态0未发货，1已发货")
-    private String trackingStatus;
-    @ApiModelProperty(value = "墙盒是否申请")
-    private String checkStatus;
-
+    /** 物流状态 */
+    @ApiModelProperty(value = "物流状态")
+    private String logisticsStatus;
     /**
      * t_delivery
      */
     @ApiModelProperty(value = "物流供应商")
     private String logisticCompany;
 
+
+    /**
+     * t_wallbox_apply
+     */
+    @ApiModelProperty(value = "安装状态")
+    private String installStatus;
+
+    /** 安装服务商id */
+    @ApiModelProperty(value = "安装服务商id")
+    private String supplierId;
+
+    /** 申请团队名称 */
+    @ApiModelProperty(value = "申请团队名称")
+    private String supplierTeam;
+
+    /** 墙盒设备型号（对应物料id） */
+    @ApiModelProperty(value = "墙盒设备型号（对应物料id）")
+    private String wallboxItemId;
+
+    /** 墙盒类型*/
+    @ApiModelProperty(value = "墙盒类型")
+    private String wallboxType;
+
+    @ApiModelProperty(value = "预约安装时间")
+    private String installReserveTime;
+
+    /** 是否紧急：0：否，1：是 */
+    @ApiModelProperty(value = "是否特殊申请")
+    private Integer ifEmergency;
+
+    /** 申请状态：0：已申请，1：已通过，2：已驳回，3：已关闭 */
+    @ApiModelProperty(value = "审核状态")
+    private Long checkStatus;
+
+    /** 创建时间 */
+    @ApiModelProperty(value = "申请时间")
+    private Date createdTime;
+
+    @ApiModelProperty(value = "审核时间")
+    private Date checkTime;
+
+    @ApiModelProperty(value = "审核人员")
+    private String checkAccount;
+    private String checkName;
+
+    @ApiModelProperty(value = "审核意见")
+    private String checkRemarks;
+
     /**
      * 物流接口
      */
-    //发货客户名称
-    private String shipperName;
-    //发货联系人名称
-    private String contactName;
-    //联系人手机
-    private String contactMobile;
-    //收货人联系姓名
-    private String receiverCustName;
-    //接货人联系手机
-    private String receiveMobile;
-    //接货人联系电话
-    private String receivePhone;
+    private String trackingInfo;
 
 }

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

@@ -75,9 +75,9 @@ public class WallboxApplyService {
         List<SupplierStaff> supplier = supplierStaffDao.selectByAccountId(Integer.valueOf(userId));
         WallboxApplyDetailQueryDTO query = new WallboxApplyDetailQueryDTO();
         query.setOrderId(orderId);
-       if (supplier.size()!=0){
-           query.setSupplierId(supplier.stream().findFirst().get().getSupplierId().toString());
-       }
+//       if (supplier.size()!=0){
+//           query.setSupplierId(supplier.stream().findFirst().get().getSupplierId().toString());
+//       }
         return wallboxApplyMapper.selectWallboxDetail(query);
     }
 

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

@@ -139,7 +139,8 @@
         </where>
     </select>
 
-    <select id="selectWallboxApplyById" parameterType="Long" resultType="com.boco.nbd.wios.manage.entity.vo.WallboxApplyInstallInfoVO">
+    <select id="selectWallboxApplyById" 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,
@@ -155,7 +156,7 @@
                t_wallbox_apply.if_emergency,
                t_wallbox_apply.if_timeout,
                t_wallbox_apply.check_account,
-               wb_account.name as check_name,
+               wb_account.name    as check_name,
                t_wallbox_apply.check_status,
                t_wallbox_apply.check_remarks,
                t_wallbox_apply.check_time,
@@ -169,7 +170,7 @@
         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 wb_account on wb_account.id = t_wallbox_apply.check_account
         where t_wallbox_apply.id = #{id}
     </select>
 
@@ -182,10 +183,6 @@
                t_wallbox_apply.tracking_number,
                t_wallbox_apply.supplier_id,
                t_wallbox_apply.wallbox_item_id as wallbox_code,
-               t_order.user_name,
-               t_order.user_phone,
-               t_order.wallbox_model,
-               t_order.item_model,
                t_wallbox_apply.if_emergency,
                t_wallbox_apply.if_timeout,
                t_wallbox_apply.check_account,
@@ -195,11 +192,24 @@
                t_wallbox_apply.create_account,
                t_wallbox_apply.created_time,
                t_wallbox_apply.modify_account,
-               t_wallbox_apply.modify_time
+               t_wallbox_apply.modify_time,
+               t_order.user_name,
+               t_order.user_phone,
+               t_order.wallbox_model,
+               t_order.item_model,
+               t_order.region_level,
+               t_order.province_name,
+               t_order.area_name,
+               t_order.country_name,
+               t_order.warehouse_id,
+               t_order.address,
+               t_order.out_order_id,
+               t_order.install_finish_time,
+               t_order.shipno as tracking_number
+
         FROM t_order
                  LEFT JOIN t_wallbox_apply ON t_wallbox_apply.order_id = t_order.id
         where t_wallbox_apply.order_id = #{orderId}
-          and t_wallbox_apply.supplier_id = #{supplierId}
     </select>
 
 
@@ -209,7 +219,8 @@
     </select>
 
 
-    <insert id="insertWallboxApply" parameterType="com.boco.nbd.wios.manage.entity.bo.WallboxApply" useGeneratedKeys="true"
+    <insert id="insertWallboxApply" parameterType="com.boco.nbd.wios.manage.entity.bo.WallboxApply"
+            useGeneratedKeys="true"
             keyProperty="id">
         insert into t_wallbox_apply
         <trim prefix="(" suffix=")" suffixOverrides=",">