墙盒申请的导出功能和墙盒申请添加的多加一个所属区域字段

src/main/java/com/boco/nbd/wios/export/Contants.java

@@ -98,4 +98,8 @@ public class Contants {
 
 
     public static final String export_orderDetail_field =
     public static final String export_orderDetail_field =
             "id,installType,orderType,itemName,itemBrand,itemModel,materialsCode,unit,qunatity,ratePrice,fee,hasPay,payName,payType,payTime,invoiceType,invoiceName,invoiceTime,invoiceNum";
             "id,installType,orderType,itemName,itemBrand,itemModel,materialsCode,unit,qunatity,ratePrice,fee,hasPay,payName,payType,payTime,invoiceType,invoiceName,invoiceTime,invoiceNum";
+    public static final String export_wallBox_title = "序号,申请团队,安装订单号,安装单最近状态,区域,是否特殊申请,审核状态,物流状态,剩余时间,超时类型,数量,申请时间";
+
+    public static final String export_wallBox_field =
+            "no,supplierTeam,orderId,installStatus,areaName,ifEmergency,checkStatus,logisticsStatus,timeRemaining,ifTimeout,number,createdTime";
 }
 }

src/main/java/com/boco/nbd/wios/export/impl/WallBoxExport.java

+package com.boco.nbd.wios.export.impl;
+
+import com.boco.nbd.wios.export.Export;
+import com.boco.nbd.wios.manage.entity.bo.SupplierBo;
+import com.boco.nbd.wios.manage.entity.bo.SupplierVo;
+import com.boco.nbd.wios.manage.entity.bo.WallboxApply;
+import com.boco.nbd.wios.manage.entity.vo.WallboxApplyInstallListVO;
+import com.boco.nbd.wios.manage.mapper.def.WallboxApplyMapper;
+import com.boco.nbd.wios.manage.service.impl.SupplierService;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 辅材导出WallboxApplyInstallListVO
+ * 
+ * @author
+ * @version
+ */
+@Service
+public class WallBoxExport implements Export<WallboxApplyInstallListVO> {
+
+    @Autowired
+    private WallboxApplyMapper wallboxApplyMapper;
+    
+    @Override
+    public List<WallboxApplyInstallListVO> getExportList(String json) throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        WallboxApply condition = mapper.readValue(json, WallboxApply.class);
+        List<WallboxApplyInstallListVO> list =
+                wallboxApplyMapper.selectWallboxApplyListFromOrder(condition);
+        Long no = 1L;
+        for (WallboxApplyInstallListVO vo : list) {
+            vo.setId(no++);
+        }
+        return list;
+    }
+    
+}

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

@@ -65,7 +65,7 @@ public class WallboxApplyController {
     @ApiImplicitParams({@ApiImplicitParam(name = "orderId", value = "订单id", dataType = "string", paramType = "query",
     @ApiImplicitParams({@ApiImplicitParam(name = "orderId", value = "订单id", dataType = "string", paramType = "query",
             required = true), @ApiImplicitParam(name = "ifEmergency", value = "是否紧急0否，1是", dataType = "int",
             required = true), @ApiImplicitParam(name = "ifEmergency", value = "是否紧急0否，1是", dataType = "int",
             paramType = "query", required = true),})
             paramType = "query", required = true),})
-    public BaseResponse<Object> applyInstallation(String orderId, Integer ifEmergency) {
+    public BaseResponse<Object> applyInstallation(String orderId, Integer ifEmergency,String areaName) {
         Assert.notNull(orderId, "订单id不能为空");
         Assert.notNull(orderId, "订单id不能为空");
         Order order = orderService.get(orderId);
         Order order = orderService.get(orderId);
         if (ObjectUtil.isNull(order)) {
         if (ObjectUtil.isNull(order)) {
@@ -91,6 +91,7 @@ public class WallboxApplyController {
         wa.setOrderId(orderId);
         wa.setOrderId(orderId);
         wa.setIfEmergency(ifEmergency);
         wa.setIfEmergency(ifEmergency);
         wa.setCreateAccount(tokenService.getUser().getUserId());
         wa.setCreateAccount(tokenService.getUser().getUserId());
+        wa.setAreaName(areaName);
         wallboxApplyService.insertWallboxApply(wa);
         wallboxApplyService.insertWallboxApply(wa);
         return new BaseResponse<>(true);
         return new BaseResponse<>(true);
 
 

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

@@ -88,4 +88,6 @@ public class WallboxApply {
     /** 更新时间 */
     /** 更新时间 */
     private Date modifyTime;
     private Date modifyTime;
 
 
+    /** 所属区域 */
+    private String areaName;
 }
 }

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

@@ -114,10 +114,24 @@ public class WallboxApplyInstallListVO {
     @ApiModelProperty(value = "收货人")
     @ApiModelProperty(value = "收货人")
     private String receiver;
     private String receiver;
     /**
     /**
+     * 发货人电话
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "发货人电话")
+    private String senderPhone;
+    /**
      * 物流状态0未发货，1已发货
      * 物流状态0未发货，1已发货
      *
      *
      * @mbg.generated
      * @mbg.generated
      */
      */
     @ApiModelProperty(value = "物流状态0未发货，1已发货")
     @ApiModelProperty(value = "物流状态0未发货，1已发货")
     private String trackingStatus;
     private String trackingStatus;
+    /**
+     * 所属区域
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "所属区域")
+    private String areaName;
 }
 }

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

@@ -53,7 +53,7 @@ public interface WallboxApplyMapper {
     /**
     /**
      * 新增墙盒申请
      * 新增墙盒申请
      *
      *
-     * @param tWallboxApply 墙盒申请
+     * @param WallboxApply 墙盒申请
      * @return 结果
      * @return 结果
      */
      */
     int insertWallboxApply(WallboxApply WallboxApply);
     int insertWallboxApply(WallboxApply WallboxApply);

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

@@ -91,6 +91,7 @@
             <if test="createdTime != null ">and created_time = #{createdTime}</if>
             <if test="createdTime != null ">and created_time = #{createdTime}</if>
             <if test="modifyAccount != null  and modifyAccount != ''">and modify_account = #{modifyAccount}</if>
             <if test="modifyAccount != null  and modifyAccount != ''">and modify_account = #{modifyAccount}</if>
             <if test="modifyTime != null ">and modify_time = #{modifyTime}</if>
             <if test="modifyTime != null ">and modify_time = #{modifyTime}</if>
+            <if test="areaName != null ">and area_name = #{modifyTime}</if>
         </where>
         </where>
     </select>
     </select>
 
 
@@ -120,9 +121,10 @@
         t_wallbox_apply.created_time,
         t_wallbox_apply.created_time,
         t_wallbox_apply.modify_account,
         t_wallbox_apply.modify_account,
         t_wallbox_apply.modify_time,
         t_wallbox_apply.modify_time,
+        t_wallbox_apply.area_name,
         t_order.shipno as tracking_number,
         t_order.shipno as tracking_number,
         t_order.status as install_status,
         t_order.status as install_status,
-        td.logistic_order deliveryLogisticOrder,td.logistic_company logisticCompany,td.sender sender,td.receiver receiver
+        td.logistic_order deliveryLogisticOrder,td.logistic_company logisticCompany,td.sender sender,td.sender_phone senderPhone,td.receiver receiver
         FROM t_wallbox_apply
         FROM t_wallbox_apply
         LEFT JOIN t_order ON t_wallbox_apply.order_id = t_order.id
         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 t_region reg on reg.id=t_wallbox_apply.region_id
@@ -253,6 +255,7 @@
             <if test="createdTime != null">created_time,</if>
             <if test="createdTime != null">created_time,</if>
             <if test="modifyAccount != null">modify_account,</if>
             <if test="modifyAccount != null">modify_account,</if>
             <if test="modifyTime != null">modify_time,</if>
             <if test="modifyTime != null">modify_time,</if>
+            <if test="areaName != null">area_name,</if>
         </trim>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderId != null and orderId != ''">#{orderId},</if>
             <if test="orderId != null and orderId != ''">#{orderId},</if>
@@ -279,6 +282,7 @@
             <if test="createdTime != null">#{createdTime},</if>
             <if test="createdTime != null">#{createdTime},</if>
             <if test="modifyAccount != null">#{modifyAccount},</if>
             <if test="modifyAccount != null">#{modifyAccount},</if>
             <if test="modifyTime != null">#{modifyTime},</if>
             <if test="modifyTime != null">#{modifyTime},</if>
+            <if test="areaName != null">#{areaName},</if>
         </trim>
         </trim>
     </insert>
     </insert>