Procházet zdrojové kódy

1、订单结算审核导出excel改动

jxl před 3 měsíci
rodič
revize
d27f1b9a3c

+ 0 - 2
leromro-core/src/main/java/com/leromro/core/controller/OrdersController.java

@@ -23,7 +23,6 @@ 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.*;
 
@@ -219,7 +218,6 @@ public class OrdersController extends BaseController {
      * 导出订单费用结算列表
      */
     @ApiOperation("导出订单费用结算列表")
-    @PreAuthorize("@ss.hasPermi('core:orderSettlementApplication:export')")
     @Log(title = "订单费用结算申请", businessType = BusinessType.EXPORT)
     @PostMapping("/settlementOrderList/export")
     public void export(HttpServletResponse response, SettlementOrderListDTO settlementOrderListDTO)

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

@@ -27,7 +27,7 @@ public class OrderSettlementApplicationListVO {
     private String applyUserName;
 
     // 申请组织(区域/服务中心)
-    @Excel(name = "申请组织(区域/服务中心)")
+    @Excel(name = "申请组织")
     private String applicant;
 
     // 订单id
@@ -187,7 +187,7 @@ public class OrderSettlementApplicationListVO {
     private Date auditorTime;
 
     // 审核状态 10审核中 20审核通过 30审核未通过 40已取消
-    @Excel(name = "审核状态 10审核中 20审核通过 30审核未通过 40已取消",  handler = DictLaberHandler.class, args = { "auditor_status"})
+    @Excel(name = "审核状态",  handler = DictLaberHandler.class, args = { "auditor_status"})
     private String auditorStatus;
 
     // 审核结果说明

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

@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.id as id,
         a.application_time as applyTime,
         application_user.nick_name AS applyUserName,
-        sys_dept.dept_name AS applyUserName,
+        sys_dept.dept_name AS applicant,
         l_second_order.second_order_id AS secondOrderId,
         l_second_order.out_trade_no AS outTradeNo,
         l_second_order.create_time AS orderTime,