墙盒申请的导出功能

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

@@ -101,5 +101,5 @@ public class Contants {
     public static final String export_wallBox_title = "序号,申请团队,安装订单号,安装单最近状态,区域,是否特殊申请,审核状态,物流状态,剩余时间,超时类型,数量,申请时间";
     public static final String export_wallBox_title = "序号,申请团队,安装订单号,安装单最近状态,区域,是否特殊申请,审核状态,物流状态,剩余时间,超时类型,数量,申请时间";
 
 
     public static final String export_wallBox_field =
     public static final String export_wallBox_field =
-            "no,supplierTeam,orderId,installStatus,areaName,ifEmergency,checkStatus,logisticsStatus,timeRemaining,ifTimeout,number,createdTime";
+            "no,supplierTeam,orderId,installStatus,regionName,ifEmergency,checkStatus,logisticsStatus,timeRemaining,ifTimeout,number,createdTime";
 }
 }

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,String areaName) {
+    public BaseResponse<Object> applyInstallation(String orderId, Integer ifEmergency) {
         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,7 +91,6 @@ 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/resources/mybatis/mapper/def/common/WallboxApplyMapper.xml

@@ -91,7 +91,6 @@
             <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>
 
 
@@ -255,7 +254,6 @@
             <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>
@@ -282,7 +280,6 @@
             <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>