Merge remote-tracking branch 'origin/master'

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

@@ -20,13 +20,10 @@ public class LedgerSeizureStats extends BaseEntity {
     @TableId(type = IdType.AUTO)
     private Long id;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "查获日期", width = 20, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "查获日期", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date recordDate;
 
-    @Excel(name = "查获时间")
-    private String seizureTime;
-
     @Excel(name = "部门名称")
     private String deptName;
 
@@ -132,9 +129,6 @@ public class LedgerSeizureStats extends BaseEntity {
     public Date getRecordDate() { return recordDate; }
     public void setRecordDate(Date recordDate) { this.recordDate = recordDate; }
 
-    public String getSeizureTime() { return seizureTime; }
-    public void setSeizureTime(String 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

@@ -801,8 +801,22 @@ public class LedgerCombinedImportServiceImpl implements ILedgerCombinedImportSer
         List<LedgerSeizureStats> list = new ArrayList<>();
         for (Object[] c : dataRows(sheet, 2)) {
             LedgerSeizureStats o = new LedgerSeizureStats();
-            o.setRecordDate(date(c, 0));         // 查获日期
-            o.setSeizureTime(timeStr(c, 1));      // 查获时间
+            // 合并日期和时间到 recordDate
+            Date recordDate = date(c, 0);         // 查获日期
+            Date seizureTime = date(c, 1);        // 查获时间
+            if (recordDate != null && seizureTime != null) {
+                // 将时间的时分秒合并到日期中
+                java.util.Calendar cal = java.util.Calendar.getInstance();
+                cal.setTime(recordDate);
+                java.util.Calendar timeCal = java.util.Calendar.getInstance();
+                timeCal.setTime(seizureTime);
+                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));
+                o.setRecordDate(cal.getTime());
+            } else if (recordDate != null) {
+                o.setRecordDate(recordDate);
+            }
             o.setDeptName(str(c, 2));            // 部门/队室
             o.setWorkArea(str(c, 3));            // 工作区域
             String inspectorName = str(c, 4);    // 安检员

airport-ledger/src/main/resources/mapper/ledger/LedgerSeizureStatsMapper.xml

@@ -5,7 +5,6 @@
     <resultMap id="BaseResultMap" type="com.sundot.airport.ledger.domain.LedgerSeizureStats">
         <id property="id" column="id" />
         <result property="recordDate" column="record_date" />
-        <result property="seizureTime" column="seizure_time" />
         <result property="deptName" column="dept_name" />
         <result property="deptId" column="dept_id" />
         <result property="teamName" column="team_name" />
@@ -49,7 +48,7 @@
     </resultMap>
 
     <sql id="selectVo">
-        SELECT id, record_date, seizure_time, dept_name, dept_id, team_name, team_id, group_name, group_id,
+        SELECT id, record_date, dept_name, dept_id, team_name, team_id, group_name, group_id,
                work_area, area_id, qualification_level, position, position_id,
                inspector_name, inspector_id,
                passenger_name, passenger_gender, passenger_ethnicity, passenger_age,