fix: 修复拉取结算数据的bug
This commit is contained in:
parent
4673a7137a
commit
3a41badcda
|
@ -9,6 +9,7 @@ import org.springframework.data.relational.core.mapping.Table;
|
||||||
import java.io.Serial;
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@Table("c_trip_car_record")
|
@Table("c_trip_car_record")
|
||||||
|
@ -33,7 +34,7 @@ public class CTripCarRecord implements Serializable {
|
||||||
@MappedCollection(idColumn = "c_trip_car_record_id")
|
@MappedCollection(idColumn = "c_trip_car_record_id")
|
||||||
private CTripCarPassengerInfo cTripCarPassengerInfo;
|
private CTripCarPassengerInfo cTripCarPassengerInfo;
|
||||||
|
|
||||||
public static CTripCarRecord of(CTripCarRecordBase cTripCarRecordBase, CTripCarQuickInfo cTripCarQuickInfo , CTripCarPassengerInfo cTripCarPassengerInfo) {
|
public static CTripCarRecord of(CTripCarRecordBase cTripCarRecordBase, CTripCarQuickInfo cTripCarQuickInfo, CTripCarPassengerInfo cTripCarPassengerInfo) {
|
||||||
CTripCarRecord cTripCarRecord = new CTripCarRecord();
|
CTripCarRecord cTripCarRecord = new CTripCarRecord();
|
||||||
cTripCarRecord.setCTripCarQuickInfo(cTripCarQuickInfo);
|
cTripCarRecord.setCTripCarQuickInfo(cTripCarQuickInfo);
|
||||||
cTripCarRecord.setCTripCarRecordBase(cTripCarRecordBase);
|
cTripCarRecord.setCTripCarRecordBase(cTripCarRecordBase);
|
||||||
|
@ -42,4 +43,17 @@ public class CTripCarRecord implements Serializable {
|
||||||
cTripCarRecord.setCTripCarPassengerInfo(cTripCarPassengerInfo);
|
cTripCarRecord.setCTripCarPassengerInfo(cTripCarPassengerInfo);
|
||||||
return cTripCarRecord;
|
return cTripCarRecord;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object o) {
|
||||||
|
if (this == o) return true;
|
||||||
|
if (o == null || getClass() != o.getClass()) return false;
|
||||||
|
CTripCarRecord that = (CTripCarRecord) o;
|
||||||
|
return Objects.equals(recordId, that.recordId) && Objects.equals(createTime, that.createTime) && Objects.equals(routeOrderNo, that.routeOrderNo) && Objects.equals(orderDate, that.orderDate) && Objects.equals(bookingUserName, that.bookingUserName) && Objects.equals(bookingUserCode, that.bookingUserCode) && Objects.equals(bookingUserPhone, that.bookingUserPhone) && Objects.equals(userName, that.userName) && Objects.equals(userCode, that.userCode) && Objects.equals(cTripCarRecordBase, that.cTripCarRecordBase) && Objects.equals(cTripCarQuickInfo, that.cTripCarQuickInfo) && Objects.equals(cTripCarPassengerInfo, that.cTripCarPassengerInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return Objects.hash(recordId, createTime, routeOrderNo, orderDate, bookingUserName, bookingUserCode, bookingUserPhone, userName, userCode, cTripCarRecordBase, cTripCarQuickInfo, cTripCarPassengerInfo);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,7 @@ import org.springframework.data.relational.core.mapping.Table;
|
||||||
import java.io.Serial;
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@Table("c_trip_flight_record")
|
@Table("c_trip_flight_record")
|
||||||
|
@ -55,4 +56,17 @@ public class CTripFlightRecord implements Serializable {
|
||||||
this.setCTripFlightPrintInfo(cTripFlightPrintInfo);
|
this.setCTripFlightPrintInfo(cTripFlightPrintInfo);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object o) {
|
||||||
|
if (this == o) return true;
|
||||||
|
if (o == null || getClass() != o.getClass()) return false;
|
||||||
|
CTripFlightRecord that = (CTripFlightRecord) o;
|
||||||
|
return Objects.equals(recordId, that.recordId) && Objects.equals(createTime, that.createTime) && Objects.equals(routeOrderNo, that.routeOrderNo) && Objects.equals(ticketNo, that.ticketNo) && Objects.equals(bookingUserName, that.bookingUserName) && Objects.equals(bookingUserCode, that.bookingUserCode) && Objects.equals(bookingUserPhone, that.bookingUserPhone) && Objects.equals(userName, that.userName) && Objects.equals(userCode, that.userCode) && Objects.equals(cTripFlightRecordBase, that.cTripFlightRecordBase) && Objects.equals(cTripFlightInfo, that.cTripFlightInfo) && Objects.equals(cTripFlightBaseInfo, that.cTripFlightBaseInfo) && Objects.equals(cTripFlightTripInfo, that.cTripFlightTripInfo) && Objects.equals(cTripFlightPrintInfo, that.cTripFlightPrintInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return Objects.hash(recordId, createTime, routeOrderNo, ticketNo, bookingUserName, bookingUserCode, bookingUserPhone, userName, userCode, cTripFlightRecordBase, cTripFlightInfo, cTripFlightBaseInfo, cTripFlightTripInfo, cTripFlightPrintInfo);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,7 @@ import org.springframework.data.relational.core.mapping.Table;
|
||||||
import java.io.Serial;
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@Table("c_trip_hotel_record")
|
@Table("c_trip_hotel_record")
|
||||||
|
@ -41,4 +42,17 @@ public class CTripHotelRecord implements Serializable {
|
||||||
cTripHotelRecord.setCreateTime(DateTimeUtil.strToTimeMM(cTripHotelRecordBase.getCreateTime()));
|
cTripHotelRecord.setCreateTime(DateTimeUtil.strToTimeMM(cTripHotelRecordBase.getCreateTime()));
|
||||||
return cTripHotelRecord;
|
return cTripHotelRecord;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object o) {
|
||||||
|
if (this == o) return true;
|
||||||
|
if (o == null || getClass() != o.getClass()) return false;
|
||||||
|
CTripHotelRecord that = (CTripHotelRecord) o;
|
||||||
|
return Objects.equals(recordId, that.recordId) && Objects.equals(createTime, that.createTime) && Objects.equals(routeOrderNo, that.routeOrderNo) && Objects.equals(bookingUserName, that.bookingUserName) && Objects.equals(bookingUserCode, that.bookingUserCode) && Objects.equals(bookingUserPhone, that.bookingUserPhone) && Objects.equals(userName, that.userName) && Objects.equals(userCode, that.userCode) && Objects.equals(cTripHotelRecordBase, that.cTripHotelRecordBase) && Objects.equals(cTripHotelInfo, that.cTripHotelInfo) && Objects.equals(cTripHotelOrderDetail, that.cTripHotelOrderDetail);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return Objects.hash(recordId, createTime, routeOrderNo, bookingUserName, bookingUserCode, bookingUserPhone, userName, userCode, cTripHotelRecordBase, cTripHotelInfo, cTripHotelOrderDetail);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue