qu

yamato-bbib/src/main/java/com/yamato/bbib/controller/TBaseOrderController.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.yamato.common.utils.DateUtils;
 import com.yamato.bbib.param.MCertificationItemParam;
 import com.yamato.common.validator.utils.ValidatorGroup;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -43,6 +44,16 @@ public class TBaseOrderController extends BaseController
         return getDataTable(list);
     }
 
+    @Log(title = "発注管理", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('yamato:order:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TBaseOrder tBaseOrder)
+    {
+        List<TBaseOrder> list = tBaseOrderService.selectCsvList(tBaseOrder);
+        ExcelUtil<TBaseOrder> util = new ExcelUtil<TBaseOrder>(TBaseOrder.class);
+        util.exportExcel(response, list, "発注数据");
+    }
+
 
 
     /**

yamato-bbib/src/main/java/com/yamato/bbib/domain/TBaseOrder.java

@@ -25,6 +25,7 @@ public class TBaseOrder extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 発注ID */
+    @Excel(name = "発注ID")
     @LmLength(min = 1, max = 64, params = {"{orderId}", "64"}, groups = {ValidatorGroup.AddGroup.class})
     @LmType(params = {"{orderId}", "{halfNumeric}"}, checkType = CheckTypeEnum.NUMERIC, groups = {ValidatorGroup.AddGroup.class})
     private String orderId;
@@ -46,9 +47,11 @@ public class TBaseOrder extends BaseEntity
     private String monthYear;
 
     /** バージョン */
+    @Excel(name = "バージョン")
     private String version;
 
     /** 輸送パートナー名 */
+    @Excel(name = "輸送パートナー名")
     private String partnerName;
 
     /** 線便ID */
@@ -92,15 +95,15 @@ public class TBaseOrder extends BaseEntity
     private String newData;
 
     /** エリア */
-    @Excel(name = "エリア")
+    @Excel(name = "エリア", readConverterExp = "11=男,12=関西,13=中部")
     private String area;
 
     /** 区間種別 */
-    @Excel(name = "区間種別")
+    @Excel(name = "区間種別", readConverterExp = "1=横持,2=輸送")
     private Long sectionType;
 
     /** ステータス */
-    @Excel(name = "ステータス")
+    @Excel(name = "ステータス", readConverterExp = "1=未承諾,2=承諾,3=変更未承諾,4=変更承諾,5=キャンセル未承諾,6=キャンセル承諾")
     private Integer orderStatus;
 
     private List<Integer> statusList;
@@ -116,7 +119,6 @@ public class TBaseOrder extends BaseEntity
 
     /** 入庫時間 */
     @JsonFormat(pattern = "HH:mm")
-    @Excel(name = "入庫時間", width = 30, dateFormat = "HH:mm")
     private Date wareHouseTime;
 
     /** 承諾日 */
@@ -132,12 +134,10 @@ public class TBaseOrder extends BaseEntity
     private String actionId;
 
     /** アクションコード */
-    @Excel(name = "アクションコード")
     private String actionCode;
 
     /** 発生日 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-    @Excel(name = "発生日", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
     private Date actionDate;
 
     /** アクション種別 */

yamato-bbib/src/main/java/com/yamato/bbib/service/ITBaseOrderService.java

@@ -40,6 +40,14 @@ public interface ITBaseOrderService
     public List<TBaseOrder> selectTBaseOrderByCompilation(TBaseOrder tBaseOrder);
 
     /**
+     * 根据条件分页查询用户列表
+     *
+     * @param tBaseOrder 用户信息
+     * @return 用户信息集合信息
+     */
+    public List<TBaseOrder> selectCsvList(TBaseOrder tBaseOrder);
+
+    /**
      * 新增発注管理
      *
      * @param tBaseOrder 発注管理

yamato-bbib/src/main/java/com/yamato/bbib/service/impl/TBaseOrderServiceImpl.java

@@ -2,6 +2,7 @@ package com.yamato.bbib.service.impl;
 
 import java.util.*;
 
+import com.yamato.common.annotation.DataScope;
 import com.yamato.common.constant.IdPrefixConstants;
 import com.yamato.common.utils.DateUtils;
 import com.yamato.common.utils.uuid.IdUtils;
@@ -167,6 +168,18 @@ public class TBaseOrderServiceImpl implements ITBaseOrderService
     }
 
     /**
+     * 根据条件分页查询用户列表
+     *
+     * @param tBaseOrder 用户信息
+     * @return 用户信息集合信息
+     */
+    @Override
+    public List<TBaseOrder> selectCsvList(TBaseOrder tBaseOrder)
+    {
+        return tBaseOrderMapper.selectTBaseOrderList(tBaseOrder);
+    }
+
+    /**
      * 查询アクション履歴
      *
      * @param tBaseOrder アクション履歴