Merge branch 'feature/20260228-export' of AHX-Bid/auction into dev

auc/src/main/java/cn/hobbystocks/auc/web/LotController.java

@@ -196,5 +196,13 @@ public class LotController extends AdminBaseController {
         return AjaxResult.success();
     }
 
+    @ApiOperation(value = "导出拍品列表信息2", notes = "拍品列表信息\n", response = AjaxResult.class, responseContainer = "AjaxResult.success")
+    @PostMapping("/export2")
+    public AjaxResult exportV2(@RequestBody LotRequest request) {
+
+        List<LotExportDTO> lotList = lotService.exportLotList(request);
+        return AjaxResult.successPage(lotList);
+    }
+
 
 }

lot/src/main/java/cn/hobbystocks/auc/common/utils/DateUtils.java

@@ -11,7 +11,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 
 /**
  * 时间工具类
- * 
+ *
  * @author ruoyi
  */
 public class DateUtils extends org.apache.commons.lang3.time.DateUtils
@@ -27,13 +27,13 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
 
     private static String[] parsePatterns = {
-            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", 
+            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
             "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
             "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
 
     /**
      * 获取当前Date型日期
-     * 
+     *
      * @return Date() 当前日期
      */
     public static Date getNowDate()
@@ -43,7 +43,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
 
     /**
      * 获取当前日期, 默认格式为yyyy-MM-dd
-     * 
+     *
      * @return String
      */
     public static String getDate()
@@ -208,4 +208,12 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
             throw new IllegalArgumentException("时间格式无效，请使用 HH:mm:ss 格式", e);
         }
     }
+
+    /**
+     * 获取当前时间
+     * @return
+     */
+    public static String parseDateToStr(Date date) {
+        return parseDateToStr(YYYY_MM_DD_HH_MM_SS, date);
+    }
 }

lot/src/main/java/cn/hobbystocks/auc/dto/LotExportDTO.java

@@ -49,17 +49,17 @@ public class LotExportDTO {
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Excel(name = "创建时间")
-    private Date createTime;
+    private String createTime;
 
     /** 拍卖开始时间 */
     @Excel(name = "拍卖开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date startTime;
+    private String startTime;
 
     /** 拍卖结束时间 */
     @Excel(name = "拍卖结束时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date endTime;
+    private String endTime;
 
     /** 保证金（元） */
     @Excel(name ="保证金（元）")

lot/src/main/java/cn/hobbystocks/auc/service/impl/LotServiceImpl.java

@@ -672,9 +672,9 @@ public class LotServiceImpl extends ServiceImpl<LotMapper,Lot> implements ILotSe
             lotExportDTO.setBidCount(String.valueOf(l.getBidCount()));
             lotExportDTO.setPubStatus(PubStatusEnum.of(l.getPubStatus()).getDesc());
             lotExportDTO.setStatus(LotStatusEnum.of(l.getStatus()).getDesc());
-            lotExportDTO.setCreateTime(l.getCreateTime());
-            lotExportDTO.setStartTime(l.getStartTime());
-            lotExportDTO.setEndTime(l.getEndTime());
+            lotExportDTO.setCreateTime(DateUtils.parseDateToStr(l.getCreateTime()));
+            lotExportDTO.setStartTime(DateUtils.parseDateToStr(l.getStartTime()));
+            lotExportDTO.setEndTime(DateUtils.parseDateToStr(l.getEndTime()));
             lotExportDTO.setDeposit(String.valueOf(l.getDeposit()));
             lotExportDTO.setServiceTariff(String.valueOf(l.getServiceTariff()));
             lotExportDTO.setRuleType(RuleTypeEnum.getByCode(l.getRuleType()).getDesc());