1、新增订单结算列表导出接口

2、新增订单结算审核列表导出接口
3、把字典表相关如状态等key值改为string类型

leromro-common/src/main/java/com/leromro/common/enums/ApplicantTypeEnum.java

@@ -4,18 +4,18 @@ package com.leromro.common.enums;
  * 结算申请方类型 1区域管理  2服务中心
  */
 public enum ApplicantTypeEnum {
-    AREA(1, "区域管理"),
-    SERVICE_CENTER(2, "服务中心");
+    AREA("1", "区域管理"),
+    SERVICE_CENTER("2", "服务中心");
 
-    private Integer code;
+    private String code;
     private String message;
 
-    ApplicantTypeEnum(Integer code, String message) {
+    ApplicantTypeEnum(String code, String message) {
         this.code = code;
         this.message = message;
     }
 
-    public Integer getCode() {
+    public String getCode() {
         return code;
     }
 
@@ -53,7 +53,7 @@ public enum ApplicantTypeEnum {
     /**
      * 根据部门类型转换为结算申请方类型
      */
-    public static Integer getCodeByAreaType(String areaType) {
+    public static String getCodeByAreaType(String areaType) {
         if("3".equals(areaType)){
             return ApplicantTypeEnum.AREA.getCode();
         }

leromro-common/src/main/java/com/leromro/common/enums/AreaSettlementStatusEnum.java

@@ -7,36 +7,36 @@ public enum AreaSettlementStatusEnum {
     /**
      * 未结算
      */
-    PENDING_SETTLEMENT(10, "未结算"),
+    PENDING_SETTLEMENT("10", "未结算"),
     /**
      * 审核中
      */
-    PENDING_AUDIT(20, "审核中"),
+    PENDING_AUDIT("20", "审核中"),
     /**
      * 审核未通过
      */
-    REJECTED(30, "审核未通过"),
+    REJECTED("30", "审核未通过"),
     /**
      * 打款中
      */
-    PENDING_PAYMENT(40, "打款中"),
+    PENDING_PAYMENT("40", "打款中"),
 
     /**
      * 已结算
      */
-    SETTLED(50, "已结算");
+    SETTLED("50", "已结算");
 
 
 
-    private final Integer code;
+    private final String code;
     private final String message;
 
-    AreaSettlementStatusEnum(Integer code, String message) {
+    AreaSettlementStatusEnum(String code, String message) {
         this.code = code;
         this.message = message;
     }
 
-    public Integer getCode() {
+    public String getCode() {
         return code;
     }
 

leromro-common/src/main/java/com/leromro/common/enums/AuditorStatusEnum.java

@@ -5,19 +5,19 @@ package com.leromro.common.enums;
  * 审核状态 10审核中 20审核通过 30审核未通过 40已取消
  */
 public enum AuditorStatusEnum {
-    AUDITING(10, "审核中"),
-    AUDIT_PASS(20, "审核通过"),
-    AUDIT_NOT_PASS(30, "审核未通过"),
-    CANCEL(40, "已取消");
-    private Integer code;
+    AUDITING("10", "审核中"),
+    AUDIT_PASS("20", "审核通过"),
+    AUDIT_NOT_PASS("30", "审核未通过"),
+    CANCEL("40", "已取消");
+    private String code;
     private String message;
 
-    AuditorStatusEnum(Integer code, String message) {
+    AuditorStatusEnum(String code, String message) {
         this.code = code;
         this.message = message;
     }
 
-    public Integer getCode() {
+    public String getCode() {
         return code;
     }
 
@@ -25,7 +25,7 @@ public enum AuditorStatusEnum {
         return message;
     }
 
-    public static AuditorStatusEnum getEnumByCode(Integer code) {
+    public static AuditorStatusEnum getEnumByCode(String code) {
         for (AuditorStatusEnum value : AuditorStatusEnum.values()) {
             if (value.getCode().equals(code)) {
                 return value;
@@ -52,7 +52,7 @@ public enum AuditorStatusEnum {
         return null;
     }
 
-    public static Integer getCodeByMessage(String message) {
+    public static String getCodeByMessage(String message) {
         for (AuditorStatusEnum value : AuditorStatusEnum.values()) {
             if (value.getMessage().equals(message)) {
                 return value.getCode();

leromro-common/src/main/java/com/leromro/common/enums/ServiceCentreSettlementStatusEnum.java

@@ -7,36 +7,36 @@ public enum ServiceCentreSettlementStatusEnum {
     /**
      * 未结算
      */
-    PENDING_SETTLEMENT(10, "未结算"),
+    PENDING_SETTLEMENT("10", "未结算"),
     /**
      * 审核中
      */
-    PENDING_AUDIT(20, "审核中"),
+    PENDING_AUDIT("20", "审核中"),
     /**
      * 审核未通过
      */
-    REJECTED(30, "审核未通过"),
+    REJECTED("30", "审核未通过"),
     /**
      * 打款中
      */
-    PENDING_PAYMENT(40, "打款中"),
+    PENDING_PAYMENT("40", "打款中"),
 
     /**
      * 已结算
      */
-    SETTLED(50, "已结算");
+    SETTLED("50", "已结算");
 
 
 
-    private final Integer code;
+    private final String code;
     private final String message;
 
-    ServiceCentreSettlementStatusEnum(Integer code, String message) {
+    ServiceCentreSettlementStatusEnum(String code, String message) {
         this.code = code;
         this.message = message;
     }
 
-    public Integer getCode() {
+    public String getCode() {
         return code;
     }
 

leromro-core/src/main/java/com/leromro/core/controller/OrdersController.java

@@ -10,6 +10,7 @@ import com.leromro.common.core.domain.R;
 import com.leromro.common.core.page.TableDataInfo;
 import com.leromro.common.enums.BusinessType;
 import com.leromro.common.utils.SecurityUtils;
+import com.leromro.common.utils.poi.ExcelUtil;
 import com.leromro.core.domain.Address;
 import com.leromro.core.domain.MainOrders;
 import com.leromro.core.domain.SecondOrder;
@@ -28,9 +29,11 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -219,6 +222,27 @@ public class OrdersController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 导出订单费用结算列表
+     */
+    @ApiOperation("导出订单费用结算列表")
+    @PreAuthorize("@ss.hasPermi('core:orderSettlementApplication:export')")
+    @Log(title = "订单费用结算申请", businessType = BusinessType.EXPORT)
+    @PostMapping("/settlementOrderList/export")
+    public void export(HttpServletResponse response, SettlementOrderListDTO settlementOrderListDTO)
+    {
+        List<SettlementOrderListVO> list = secondOrderService.selectSettlementOrderList(settlementOrderListDTO);
+        ExcelUtil<SettlementOrderListVO> util = new ExcelUtil<SettlementOrderListVO>(SettlementOrderListVO.class);
+        // 如果当前是服务中心，则不导出区域公司结算信息
+        // 获取当前用户部门类型
+        String areaType = SecurityUtils.getAreaType();
+        if ("4".equals(areaType)) {
+            // 隐藏区域公司相关结算信息
+            util.hideColumn("areaDistributionAmount","areaSettlementStatus", "areaSettlementTime");
+        }
+        util.exportExcel(response, list, "订单费用结算申请数据");
+    }
+
     /**
      * 区域公司订单抽成结算
      */

leromro-core/src/main/java/com/leromro/core/domain/OrderSettlementApplication.java

@@ -1,17 +1,17 @@
 package com.leromro.core.domain;
 
-import java.math.BigDecimal;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.leromro.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.leromro.common.annotation.Excel;
-import com.leromro.common.core.domain.BaseEntity;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 订单费用结算申请对象 l_order_settlement_application
@@ -39,7 +39,7 @@ public class OrderSettlementApplication extends BaseEntity
 
     @TableField("applicant_type")
     @ApiModelProperty("结算申请方类型 1区域管理  2服务中心")
-    private Integer applicantType;
+    private String applicantType;
 
     @TableField("applicant_id")
     @ApiModelProperty("结算申请者id（区域管理/服务中心id）")
@@ -60,7 +60,7 @@ public class OrderSettlementApplication extends BaseEntity
 
     @TableField("payee_method")
     @ApiModelProperty("收款方式 1银行卡")
-    private Integer payeeMethod;
+    private String payeeMethod;
 
     @TableField("payee_account")
     @ApiModelProperty("收款账号")
@@ -89,7 +89,7 @@ public class OrderSettlementApplication extends BaseEntity
 
     @TableField("auditor_status")
     @ApiModelProperty("审核状态 10审核中 20审核通过 30审核未通过")
-    private Integer auditorStatus;
+    private String auditorStatus;
 
     @TableField("auditor_remark")
     @ApiModelProperty("审核结果说明")

leromro-core/src/main/java/com/leromro/core/domain/SecondOrder.java

@@ -225,7 +225,7 @@ public class SecondOrder extends BaseEntity
      * 区域结算状态 10未结算 20审核中 30审核未通过 40打款中 50已结算
      */
     @ApiModelProperty("区域结算状态 10未结算 20审核中 30审核未通过 40打款中 50已结算")
-    private Integer areaSettlementStatus;
+    private String areaSettlementStatus;
 
     /**
      * 区域结算时间
@@ -244,7 +244,7 @@ public class SecondOrder extends BaseEntity
      * 区域管理费用付款方式 1银行卡
      */
     @ApiModelProperty("区域管理费用付款方式 1银行卡")
-    private Integer areaPayerMethod;
+    private String areaPayerMethod;
 
     /**
      * 区域管理费用付款账户
@@ -262,7 +262,7 @@ public class SecondOrder extends BaseEntity
      * 区域收款方式 1银行卡
      */
     @ApiModelProperty("区域收款方式 1银行卡")
-    private Integer areaPayeeMethod;
+    private String areaPayeeMethod;
 
     /**
      * 区域收款账号
@@ -298,7 +298,7 @@ public class SecondOrder extends BaseEntity
      * 服务中心费用结算状态 10未结算 20审核中 30审核未通过 40打款中 50已结算
      */
     @ApiModelProperty("服务中心费用结算状态 10未结算 20审核中 30审核未通过 40打款中 50已结算")
-    private Integer serviceCentreSettlementStatus;
+    private String serviceCentreSettlementStatus;
 
     /**
      * 服务中心费用结算时间
@@ -317,7 +317,7 @@ public class SecondOrder extends BaseEntity
      * 服务中心费用付款方式 1银行卡
      */
     @ApiModelProperty("服务中心费用付款方式 1银行卡")
-    private Integer serviceCentrePayerMethod;
+    private String serviceCentrePayerMethod;
 
     /**
      * 服务中心费用付款账户
@@ -335,7 +335,7 @@ public class SecondOrder extends BaseEntity
      * 服务中心收款方式 1银行卡
      */
     @ApiModelProperty("服务中心收款方式 1银行卡")
-    private Integer serviceCentrePayeeMethod;
+    private String serviceCentrePayeeMethod;
 
     /**
      * 服务中心收款账号

leromro-core/src/main/java/com/leromro/core/domain/dto/OrderSettlementApplicationListDTO.java

@@ -13,7 +13,7 @@ import java.util.Date;
 @Data
 public class OrderSettlementApplicationListDTO {
     // 审核状态 10审核中 20审核通过 30审核未通过 40已取消
-    private Integer auditorStatus;
+    private String auditorStatus;
 
     // 审核时间范围查询（开始时间）
     private Date auditorTimeStart;

leromro-core/src/main/java/com/leromro/core/domain/dto/SettlementOrderApplyDTO.java

@@ -17,7 +17,7 @@ public class SettlementOrderApplyDTO {
     private List<Long> secondOrderIds;
     // 收款方式 1银行卡
     @NotNull(message = "收款方式不能为空")
-    private Integer payeeMethod;
+    private String payeeMethod;
     // 收款银行账号
     @NotBlank(message = "收款银行账号不能为空")
     private String payeeAccount;

leromro-core/src/main/java/com/leromro/core/domain/dto/SettlementOrderAuditorDTO.java

@@ -16,7 +16,7 @@ public class SettlementOrderAuditorDTO {
     private List<Long> ids;
     // 审核状态 20:审核通过 30:审核未通过
     @NotNull(message = "审核状态不能为空")
-    private Integer auditorStatus;
+    private String auditorStatus;
     // 审核备注（审核未通过时，必传）
     private String auditorRemark;
 }

leromro-core/src/main/java/com/leromro/core/domain/dto/SettlementOrderDTO.java

@@ -20,7 +20,7 @@ public class SettlementOrderDTO {
     private String payerTime;
     // 付款方式 1银行卡
     @NotNull(message = "付款方式不能为空")
-    private Integer payerMethod;
+    private String payerMethod;
     // 付款银行账号
     @NotBlank(message = "付款银行账号不能为空")
     private String payerAccount;

leromro-core/src/main/java/com/leromro/core/domain/dto/SettlementOrderListDTO.java

@@ -22,7 +22,7 @@ public class SettlementOrderListDTO {
     private String businessManagementId;
 
     // 订单状态
-    private Integer orderStatus;
+    private String orderStatus;
 
     // 用户手机号
     private String userPhone;
@@ -43,7 +43,7 @@ public class SettlementOrderListDTO {
     private Date serviceCompleteEndTime;
 
     // 区域抽成结算状态筛选
-    private Integer areaSettlementStatus;
+    private String areaSettlementStatus;
 
     // 区域抽成结算操作人名称筛选
     private String areaSettlementName;
@@ -55,7 +55,7 @@ public class SettlementOrderListDTO {
     private Date areaSettlementEndTime;
 
     // 服务中心抽成结算状态筛选
-    private Integer serviceCentreSettlementStatus;
+    private String serviceCentreSettlementStatus;
 
     // 服务中心抽成结算操作人名称筛选
     private String serviceCentreSettlementName;

leromro-core/src/main/java/com/leromro/core/domain/vo/OrderSettlementApplicationListVO.java

@@ -1,5 +1,7 @@
 package com.leromro.core.domain.vo;
 
+import com.leromro.common.annotation.Excel;
+import com.leromro.framework.handler.DictLaberHandler;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -14,80 +16,106 @@ import java.util.Date;
 @Data
 public class OrderSettlementApplicationListVO {
     // 申请时间
+    @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date applyTime;
 
     // 申请人
+    @Excel(name = "申请人")
     private String applyUserName;
 
     // 申请组织（区域/服务中心）
+    @Excel(name = "申请组织（区域/服务中心）")
     private String applicant;
 
     // 订单id
+    @Excel(name = "订单id")
     private Long secondOrderId;
 
     // 订单号
+    @Excel(name = "订单号")
     private String outTradeNo;
 
     // 下单时间
+    @Excel(name = "下单时间",  width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date orderTime;
 
     // 用户名称
+    @Excel(name = "用户名称")
     private String userNickName;
 
     // 志愿者名称
+    @Excel(name = "志愿者名称")
     private String volunteerName;
 
     // 服务项目内容
+    @Excel(name = "服务项目内容")
     private String businessDescribe;
 
     // 服务项目类型
+    @Excel(name = "服务项目类型")
     private String businessTierName;
 
     // 服务开始时间
+    @Excel(name = "服务开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date serviceStartTime;
 
     // 服务结束时间
+    @Excel(name = "服务结束时间",  width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date serviceEndTime;
 
     // 订单总金额
+    @Excel(name = "订单总金额")
     private BigDecimal orderTotalPrice;
 
     // 订单状态
+    @Excel(name = "订单状态",  handler = DictLaberHandler.class, args = { "order_status"})
     private String orderStatus;
 
     // 区域公司
+    @Excel(name = "区域公司")
     private String areaName;
 
     // 服务中心
+    @Excel(name = "服务中心")
     private String serviceCentreName;
 
     // 区域公司抽成金额
+    @Excel(name = "区域公司抽成金额")
     private BigDecimal areaDistributionAmount;
 
     // 区域公司结算状态
-    private Integer areaSettlementStatus;
+    @Excel(name = "区域公司结算状态", handler = DictLaberHandler.class, args = { "area_settlement_status"})
+    private String areaSettlementStatus;
 
     // 区域公司结算时间
+    @Excel(name = "区域公司结算时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date areaSettlementTime;
 
     // 服务中心抽成金额
+    @Excel(name = "服务中心抽成金额")
     private BigDecimal serviceCentreDistributionAmount;
 
     // 服务中心结算状态
-    private Integer serviceCentreSettlementStatus;
+    @Excel(name = "服务中心结算状态",  handler = DictLaberHandler.class, args = { "service_centre_settlement_stauts"})
+    private String serviceCentreSettlementStatus;
 
     // 服务中心结算时间
+    @Excel(name = "服务中心结算时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date serviceCentreSettlementTime;
 
     // 审核人名称
+    @Excel(name = "审核人名称")
     private Long auditorUserNickName;
 
     // 审核时间
+    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date auditorTime;
 
     // 审核状态 10审核中 20审核通过 30审核未通过 40已取消
-    private Integer auditorStatus;
+    @Excel(name = "审核状态 10审核中 20审核通过 30审核未通过 40已取消",  handler = DictLaberHandler.class, args = { "auditor_status"})
+    private String auditorStatus;
 
     // 审核结果说明
+    @Excel(name = "审核结果说明")
     private String auditorRemark;
 }

leromro-core/src/main/java/com/leromro/core/domain/vo/SettlementOrderListVO.java

@@ -1,5 +1,7 @@
 package com.leromro.core.domain.vo;
 
+import com.leromro.common.annotation.Excel;
+import com.leromro.framework.handler.DictLaberHandler;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -15,56 +17,74 @@ public class SettlementOrderListVO {
     private Long orderId;
 
     // 订单号
+    @Excel(name = "订单号")
     private String outTradeNo;
 
     // 下单时间
+    @Excel(name = "下单时间")
     private Date orderTime;
 
     // 用户名称
+    @Excel(name = "用户名称")
     private String userNickName;
 
     // 志愿者名称
+    @Excel(name = "志愿者名称")
     private String volunteerName;
 
     // 服务项目内容
+    @Excel(name = "服务项目内容")
     private String businessDescribe;
 
     // 服务项目类型
+    @Excel(name = "服务项目类型")
     private String businessTierName;
 
     // 服务开始时间
+    @Excel(name = "服务开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date serviceStartTime;
 
     // 服务结束时间
+    @Excel(name = "服务结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date serviceEndTime;
 
     // 订单总金额
+    @Excel(name = "订单总金额(元)")
     private BigDecimal orderTotalPrice;
 
     // 订单状态
+    @Excel(name = "订单状态",handler = DictLaberHandler.class, args = { "order_status"})
     private String orderStatus;
 
     // 区域公司
+    @Excel(name = "区域公司")
     private String areaName;
 
     // 服务中心
+    @Excel(name = "服务中心")
     private String serviceCentreName;
 
     // 区域公司抽成金额
+    @Excel(name = "区域公司抽成金额(元)")
     private BigDecimal areaDistributionAmount;
 
     // 区域公司结算状态
-    private Integer areaSettlementStatus;
+    @Excel(name = "区域公司结算状态", handler = DictLaberHandler.class, args = { "area_settlement_status"})
+    private String areaSettlementStatus;
 
     // 区域公司结算时间
+    @Excel(name = "区域公司结算时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date areaSettlementTime;
 
     // 服务中心抽成金额
+    @Excel(name = "服务中心抽成金额(元)")
     private BigDecimal serviceCentreDistributionAmount;
 
     // 服务中心结算状态
-    private Integer serviceCentreSettlementStatus;
+    @Excel(name = "服务中心结算状态", handler = DictLaberHandler.class, args = { "service_centre_settlement_stauts"})
+    private String serviceCentreSettlementStatus;
 
     // 服务中心结算时间
+    @Excel(name = "服务中心结算时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date serviceCentreSettlementTime;
 }

leromro-core/src/main/java/com/leromro/core/service/ISecondOrderService.java

@@ -44,7 +44,7 @@ public interface ISecondOrderService extends IService<SecondOrder> {
      * @param secondOrderIds
      * @param status
      */
-    void updateAreaSettlementStatus(List<Long> secondOrderIds, Integer status);
+    void updateAreaSettlementStatus(List<Long> secondOrderIds, String status);
 
     /**
      * 提交结算申请时修改订单区域公司结算信息
@@ -63,5 +63,5 @@ public interface ISecondOrderService extends IService<SecondOrder> {
      * @param secondOrderIds
      * @param status
      */
-    void updateServiceCentreSettlementStatus(List<Long> secondOrderIds, Integer status);
+    void updateServiceCentreSettlementStatus(List<Long> secondOrderIds, String status);
 }

leromro-core/src/main/java/com/leromro/core/service/impl/SecondOrdersServiceImpl.java

@@ -230,7 +230,7 @@ public class SecondOrdersServiceImpl extends ServiceImpl<SecondOrdersMapper, Sec
 
     @Override
     @Transactional
-    public void updateAreaSettlementStatus(List<Long> secondOrderIds, Integer status) {
+    public void updateAreaSettlementStatus(List<Long> secondOrderIds, String status) {
         this.update(new LambdaUpdateWrapper<SecondOrder>()
                 .set(SecondOrder::getAreaSettlementStatus, status)
                 .eq(SecondOrder::getSecondOrderId, secondOrderIds));
@@ -263,7 +263,7 @@ public class SecondOrdersServiceImpl extends ServiceImpl<SecondOrdersMapper, Sec
 
     @Override
     @Transactional
-    public void updateServiceCentreSettlementStatus(List<Long> secondOrderIds, Integer status) {
+    public void updateServiceCentreSettlementStatus(List<Long> secondOrderIds, String status) {
         this.update(new LambdaUpdateWrapper<SecondOrder>()
                 .set(SecondOrder::getServiceCentreSettlementStatus, status)
                 .eq(SecondOrder::getSecondOrderId, secondOrderIds));

leromro-core/src/main/resources/mapper/core/OrderSettlementApplicationMapper.xml

@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     #{item}
                 </foreach>
             </if>
-            <if test="auditorStatus!=null">
+            <if test="auditorStatus!=null and auditorStatus!=''">
                 and a.auditor_status = #{auditorStatus}
             </if>
             <if test="auditorTimeStart != null">

leromro-core/src/main/resources/mapper/core/SecondOrdersMapper.xml

@@ -272,7 +272,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="businessManagementId != null and businessManagementId != ''">
                 AND mo.business_management_id = #{businessManagementId}
             </if>
-            <if test="orderStatus != null">
+            <if test="orderStatus != null and orderStatus != ''">
                 AND a.order_status = #{orderStatus}
             </if>
             <if test="userPhone != null and userPhone != ''">
@@ -297,7 +297,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     AND a.work_end_time <= #{serviceEndTime}
                 ]]>
             </if>
-            <if test="areaSettlementStatus != null">
+            <if test="areaSettlementStatus != null and areaSettlementStatus != ''">
                 AND a.area_settlement_status = #{areaSettlementStatus}
             </if>
             <if test="areaSettlementName != null and areaSettlementName != ''">
@@ -311,7 +311,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     AND a.area_settlement_time <= #{areaSettlementEndTime}
                 ]]>
             </if>
-            <if test="serviceCentreSettlementStatus != null">
+            <if test="serviceCentreSettlementStatus != null and serviceCentreSettlementStatus != ''">
                 AND a.service_centre_settlement_status = #{serviceCentreSettlementStatus}
             </if>
             <if test="serviceCentreSettlementName != null and serviceCentreSettlementName!=''">

leromro-framework/src/main/java/com/leromro/framework/handler/DictLaberHandler.java

@@ -0,0 +1,28 @@
+package com.leromro.framework.handler;
+
+import com.leromro.common.utils.DictUtils;
+import com.leromro.common.utils.poi.ExcelHandlerAdapter;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Workbook;
+
+/**
+ * 导出excel 字典格式化
+ */
+public class DictLaberHandler implements ExcelHandlerAdapter {
+    /**
+     *
+     * @param value 单元格数据值
+     * @param args excel注解args参数组 args[0]为字典的dict_type
+     * @param cell 单元格对象
+     * @param wb 工作簿对象
+     *
+     * @return
+     */
+    @Override
+    public Object format(Object value, String[] args, Cell cell, Workbook wb) {
+        // 字典类型
+        String dictType = args[0];
+        // 获取字典label
+        return DictUtils.getDictLabel(dictType, (String) value);
+    }
+}