导入时间格式处理

airport-admin/src/main/java/com/sundot/airport/web/controller/ledger/LedgerImportController.java

@@ -1,5 +1,6 @@
 package com.sundot.airport.web.controller.ledger;
 
+import cn.hutool.core.date.DateUtil;
 import com.sundot.airport.common.utils.poi.ExcelUtil;
 import com.sundot.airport.common.annotation.Log;
 import com.sundot.airport.common.core.controller.BaseController;
@@ -262,6 +263,15 @@ public class LedgerImportController extends BaseController {
             item.setImportBatch(batchNo);
             item.setSourceType("1");
             item.setCreateBy(getUsername());
+            //合并 recordDate 和 seizureTime 字段
+            java.util.Calendar cal = java.util.Calendar.getInstance();
+            cal.setTime(item.getRecordDate());
+            java.util.Calendar timeCal = java.util.Calendar.getInstance();
+            timeCal.setTime(item.getSeizureTime());
+            cal.set(java.util.Calendar.HOUR_OF_DAY, timeCal.get(java.util.Calendar.HOUR_OF_DAY));
+            cal.set(java.util.Calendar.MINUTE, timeCal.get(java.util.Calendar.MINUTE));
+            cal.set(java.util.Calendar.SECOND, timeCal.get(java.util.Calendar.SECOND));
+            item.setRecordDate(cal.getTime());
         });
         seizureStatsService.batchInsert(list);
         return AjaxResult.success("导入成功，共" + list.size() + "条");

airport-ledger/src/main/java/com/sundot/airport/ledger/domain/LedgerSeizureStats.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 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.fasterxml.jackson.annotation.JsonFormat;
@@ -24,6 +25,10 @@ public class LedgerSeizureStats extends BaseEntity {
     @Excel(name = "查获日期", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date recordDate;
 
+    @TableField(exist = false)
+    @Excel(name = "查获时间", width = 20, dateFormat = "HH:mm:ss")
+    private Date seizureTime;
+
     @Excel(name = "部门名称")
     private String deptName;
 
@@ -129,6 +134,9 @@ public class LedgerSeizureStats extends BaseEntity {
     public Date getRecordDate() { return recordDate; }
     public void setRecordDate(Date recordDate) { this.recordDate = recordDate; }
 
+    public Date getSeizureTime() { return seizureTime; }
+    public void setSeizureTime(Date seizureTime) { this.seizureTime = seizureTime; }
+
     public String getDeptName() { return deptName; }
     public void setDeptName(String deptName) { this.deptName = deptName; }
 

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/LedgerCombinedImportServiceImpl.java

@@ -1322,7 +1322,7 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
         if (v instanceof Double) return DateUtil.getJavaDate((Double) v);
         // try parse string
         String s = v.toString().trim();
-        for (String fmt : new String[]{"yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM-dd", "yyyy/MM/dd"}) {
+        for (String fmt : new String[]{"yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM-dd", "yyyy/MM/dd", "HH:mm:ss", "HH:mm"}) {
             try {
                 return new SimpleDateFormat(fmt).parse(s.substring(0, Math.min(s.length(), fmt.length())));
             } catch (Exception ignore) {}