lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-07-25 07:07:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(WeightDeviceDataEntity): handle null ecgbTime in weight data filtering

Browse Source
This commit is contained in:
lihongjie0209
2025-06-28 23:08:57 +08:00
parent 03d8e99362
commit 99152ebf41
2 changed files with 239 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/lihongjie/coal/orderCarNumberBind/service/OrderCarNumberBindService.java
View File

@@ -183,7 +183,7 @@ public class OrderCarNumberBindService
dto.setWeightDataList(all.stream()
.filter(x -> dto.getStartTime()==null || x.getYcgbTIme().isAfter(dto.getStartTime()) )
.filter(x -> dto.getEndTime()==null || x.getEcgbTime().isBefore(dto.getEndTime()) )
.filter(x -> dto.getEndTime()==null || x.getEcgbTime() == null || x.getEcgbTime().isBefore(dto.getEndTime()) )
.map(weightDeviceDataMapper::toDto)

337
src/main/java/cn/lihongjie/coal/weightDeviceData/entity/WeightDeviceDataEntity.java
View File

@@ -193,9 +193,18 @@ import java.util.stream.Stream;
*/
@Data
@Entity
@jakarta.persistence.Table(indexes = @jakarta.persistence.Index(name ="idx_weight_device_data_org_id", columnList = "organization_id"))
@jakarta.persistence.Table(
indexes = {
@jakarta.persistence.Index(
name = "idx_weight_device_data_org_id",
columnList = "organization_id"),
@jakarta.persistence.Index(
name = "idx_weight_device_data_purchase_order",
columnList = "purchase_order_id,plate_no"),
@jakarta.persistence.Index(
name = "idx_weight_device_data_sale_order",
columnList = "sale_order_id,plate_no"),
})
public class WeightDeviceDataEntity extends OrgCommonEntity {
@ManyToOne(fetch = FetchType.LAZY)
@@ -207,9 +216,6 @@ public class WeightDeviceDataEntity extends OrgCommonEntity {
@ManyToOne(fetch = FetchType.LAZY)
private SaleOrderEntity saleOrder;
@Comment("序号")
private Integer sequenceNumber;
@@ -505,100 +511,233 @@ public class WeightDeviceDataEntity extends OrgCommonEntity {
&& this.ycgbTIme != null;
}
@Override
public String toString() {
return "WeightDeviceDataEntity{" +
"sequenceNumber=" + sequenceNumber +
", flowNumber='" + flowNumber + '\'' +
", plateNo='" + plateNo + '\'' +
", weighType='" + weighType + '\'' +
", sendOrganization='" + sendOrganization + '\'' +
", receiveOrganization='" + receiveOrganization + '\'' +
", goods='" + goods + '\'' +
", specification='" + specification + '\'' +
", mz=" + mz +
", pz=" + pz +
", jz=" + jz +
", kz=" + kz +
", sz=" + sz +
", price=" + price +
", amount=" + amount +
", zfxs=" + zfxs +
", fl=" + fl +
", weightFee=" + weightFee +
", mzUser='" + mzUser + '\'' +
", pzUser='" + pzUser + '\'' +
", mzbh='" + mzbh + '\'' +
", pzbh='" + pzbh + '\'' +
", mzTime=" + mzTime +
", pzTime=" + pzTime +
", ycgbTIme=" + ycgbTIme +
", ecgbTime=" + ecgbTime +
", updateUser='" + updateUser + '\'' +
", dataUpdateTime=" + dataUpdateTime +
", remark='" + remark + '\'' +
", printCount=" + printCount +
", upload=" + upload +
", reserve1='" + reserve1 + '\'' +
", reserve2='" + reserve2 + '\'' +
", reserve3='" + reserve3 + '\'' +
", reserve4='" + reserve4 + '\'' +
", reserve5='" + reserve5 + '\'' +
", reserve6=" + reserve6 +
", reserve7=" + reserve7 +
", reserve8=" + reserve8 +
", reserve9=" + reserve9 +
", reserve10='" + reserve10 + '\'' +
", reserve11='" + reserve11 + '\'' +
", reserve12='" + reserve12 + '\'' +
", reserve13='" + reserve13 + '\'' +
", reserve14='" + reserve14 + '\'' +
", reserve15=" + reserve15 +
", reserve16=" + reserve16 +
", reserve17=" + reserve17 +
", reserve18=" + reserve18 +
", clientType=" + clientType +
", ycgbWeight=" + ycgbWeight +
", ecgbWeight=" + ecgbWeight +
", b0='" + b0 + '\'' +
", aguid='" + aguid + '\'' +
", planNumber='" + planNumber + '\'' +
", recordCreateMode=" + recordCreateMode +
", recordFinish=" + recordFinish +
", netPriceSyncTime=" + netPriceSyncTime +
", netPriceModifyUser='" + netPriceModifyUser + '\'' +
", cTime=" + cTime +
", modifyOnnet='" + modifyOnnet + '\'' +
", modifyTime=" + modifyTime +
", modifyBy='" + modifyBy + '\'' +
", auditFlag='" + auditFlag + '\'' +
", auditTime=" + auditTime +
", auditBy='" + auditBy + '\'' +
", eUpimg='" + eUpimg + '\'' +
", reserve19='" + reserve19 + '\'' +
", reserve20='" + reserve20 + '\'' +
", reserve21='" + reserve21 + '\'' +
", reserve22='" + reserve22 + '\'' +
", reserve23='" + reserve23 + '\'' +
", reserve24='" + reserve24 + '\'' +
", reserve25='" + reserve25 + '\'' +
", reserve26='" + reserve26 + '\'' +
", reserve27='" + reserve27 + '\'' +
", reserve28='" + reserve28 + '\'' +
", driverInfo='" + driverInfo + '\'' +
", hqbUpImgG1=" + hqbUpImgG1 +
", hqbUpImgG2=" + hqbUpImgG2 +
", hqbUpImgG3=" + hqbUpImgG3 +
", hqbUpImgG4=" + hqbUpImgG4 +
", hqbUpImgT1=" + hqbUpImgT1 +
", hqbUpImgT2=" + hqbUpImgT2 +
", hqbUpImgT3=" + hqbUpImgT3 +
", hqbUpImgT4=" + hqbUpImgT4 +
", archiveStatus='" + archiveStatus + '\'' +
", minTime=" + minTime +
", invalid=" + invalid +
", finished=" + finished +
'}';
return "WeightDeviceDataEntity{"
+ "sequenceNumber="
+ sequenceNumber
+ ", flowNumber='"
+ flowNumber
+ '\''
+ ", plateNo='"
+ plateNo
+ '\''
+ ", weighType='"
+ weighType
+ '\''
+ ", sendOrganization='"
+ sendOrganization
+ '\''
+ ", receiveOrganization='"
+ receiveOrganization
+ '\''
+ ", goods='"
+ goods
+ '\''
+ ", specification='"
+ specification
+ '\''
+ ", mz="
+ mz
+ ", pz="
+ pz
+ ", jz="
+ jz
+ ", kz="
+ kz
+ ", sz="
+ sz
+ ", price="
+ price
+ ", amount="
+ amount
+ ", zfxs="
+ zfxs
+ ", fl="
+ fl
+ ", weightFee="
+ weightFee
+ ", mzUser='"
+ mzUser
+ '\''
+ ", pzUser='"
+ pzUser
+ '\''
+ ", mzbh='"
+ mzbh
+ '\''
+ ", pzbh='"
+ pzbh
+ '\''
+ ", mzTime="
+ mzTime
+ ", pzTime="
+ pzTime
+ ", ycgbTIme="
+ ycgbTIme
+ ", ecgbTime="
+ ecgbTime
+ ", updateUser='"
+ updateUser
+ '\''
+ ", dataUpdateTime="
+ dataUpdateTime
+ ", remark='"
+ remark
+ '\''
+ ", printCount="
+ printCount
+ ", upload="
+ upload
+ ", reserve1='"
+ reserve1
+ '\''
+ ", reserve2='"
+ reserve2
+ '\''
+ ", reserve3='"
+ reserve3
+ '\''
+ ", reserve4='"
+ reserve4
+ '\''
+ ", reserve5='"
+ reserve5
+ '\''
+ ", reserve6="
+ reserve6
+ ", reserve7="
+ reserve7
+ ", reserve8="
+ reserve8
+ ", reserve9="
+ reserve9
+ ", reserve10='"
+ reserve10
+ '\''
+ ", reserve11='"
+ reserve11
+ '\''
+ ", reserve12='"
+ reserve12
+ '\''
+ ", reserve13='"
+ reserve13
+ '\''
+ ", reserve14='"
+ reserve14
+ '\''
+ ", reserve15="
+ reserve15
+ ", reserve16="
+ reserve16
+ ", reserve17="
+ reserve17
+ ", reserve18="
+ reserve18
+ ", clientType="
+ clientType
+ ", ycgbWeight="
+ ycgbWeight
+ ", ecgbWeight="
+ ecgbWeight
+ ", b0='"
+ b0
+ '\''
+ ", aguid='"
+ aguid
+ '\''
+ ", planNumber='"
+ planNumber
+ '\''
+ ", recordCreateMode="
+ recordCreateMode
+ ", recordFinish="
+ recordFinish
+ ", netPriceSyncTime="
+ netPriceSyncTime
+ ", netPriceModifyUser='"
+ netPriceModifyUser
+ '\''
+ ", cTime="
+ cTime
+ ", modifyOnnet='"
+ modifyOnnet
+ '\''
+ ", modifyTime="
+ modifyTime
+ ", modifyBy='"
+ modifyBy
+ '\''
+ ", auditFlag='"
+ auditFlag
+ '\''
+ ", auditTime="
+ auditTime
+ ", auditBy='"
+ auditBy
+ '\''
+ ", eUpimg='"
+ eUpimg
+ '\''
+ ", reserve19='"
+ reserve19
+ '\''
+ ", reserve20='"
+ reserve20
+ '\''
+ ", reserve21='"
+ reserve21
+ '\''
+ ", reserve22='"
+ reserve22
+ '\''
+ ", reserve23='"
+ reserve23
+ '\''
+ ", reserve24='"
+ reserve24
+ '\''
+ ", reserve25='"
+ reserve25
+ '\''
+ ", reserve26='"
+ reserve26
+ '\''
+ ", reserve27='"
+ reserve27
+ '\''
+ ", reserve28='"
+ reserve28
+ '\''
+ ", driverInfo='"
+ driverInfo
+ '\''
+ ", hqbUpImgG1="
+ hqbUpImgG1
+ ", hqbUpImgG2="
+ hqbUpImgG2
+ ", hqbUpImgG3="
+ hqbUpImgG3
+ ", hqbUpImgG4="
+ hqbUpImgG4
+ ", hqbUpImgT1="
+ hqbUpImgT1
+ ", hqbUpImgT2="
+ hqbUpImgT2
+ ", hqbUpImgT3="
+ hqbUpImgT3
+ ", hqbUpImgT4="
+ hqbUpImgT4
+ ", archiveStatus='"
+ archiveStatus
+ '\''
+ ", minTime="
+ minTime
+ ", invalid="
+ invalid
+ ", finished="
+ finished
+ '}';
}
}