|
@@ -1324,7 +1324,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
if(oConvertUtils.isEmpty(changeShiftId)){
|
|
|
queryWrapper2.between(BilletBasicInfo::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
|
|
|
}else {
|
|
|
- queryWrapper2.between(BilletBasicInfo::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
|
|
|
+ queryWrapper2.between(BilletBasicInfo::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
|
|
|
}
|
|
|
|
|
|
List<BilletBasicInfo> billetBasicInfoList2 = billetBasicInfoService.list(queryWrapper2);
|
|
@@ -1392,7 +1392,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
queryWrapper2.eq(BilletLiftingBill::getCcmNo, ccmNo)
|
|
|
.eq(BilletLiftingBill::getShift, shift)
|
|
|
.eq(BilletLiftingBill::getShiftGroup, shiftGroup)
|
|
|
- .between(BilletLiftingBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime())
|
|
|
+ .between(BilletLiftingBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime())
|
|
|
.groupBy(BilletLiftingBill::getVehicleNumber);
|
|
|
}
|
|
|
List<BilletLiftingBill> billetLiftingBillList = billetLiftingBillService.list(queryWrapper2);
|
|
@@ -1434,7 +1434,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
if(oConvertUtils.isEmpty(changeShiftId)){
|
|
|
queryWrapper.between(BilletLiftingBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
|
|
|
}else {
|
|
|
- queryWrapper.between(BilletLiftingBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
|
|
|
+ queryWrapper.between(BilletLiftingBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
|
|
|
}
|
|
|
List<BilletLiftingBill> billList = billetLiftingBillService.list(queryWrapper);
|
|
|
int amount;
|
|
@@ -1511,7 +1511,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
queryWrapper2.between(StorageBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
|
|
|
} else {
|
|
|
// 当 changeShiftId 不为空时,时间范围从 createTime 到 updateTime
|
|
|
- queryWrapper2.between(StorageBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
|
|
|
+ queryWrapper2.between(StorageBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
|
|
|
}
|
|
|
List<StorageBill> storageBillList = baseMapper.selectList(queryWrapper2);
|
|
|
if (oConvertUtils.listIsEmpty(storageBillList)){
|
|
@@ -1629,7 +1629,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
queryWrapper2.between(StorageBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
|
|
|
} else {
|
|
|
// 当 changeShiftId 不为空时,时间范围从 createTime 到 updateTime
|
|
|
- queryWrapper2.between(StorageBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
|
|
|
+ queryWrapper2.between(StorageBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
|
|
|
}
|
|
|
List<StorageBill> storageBillList = baseMapper.selectList(queryWrapper2);
|
|
|
if (oConvertUtils.listIsEmpty(storageBillList)){
|
|
@@ -1815,7 +1815,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
queryWrapper1.between(RollClubOneDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
|
|
|
} else {
|
|
|
// 当 changeShiftId 不为空时,时间范围从 createTime 到 updateTime
|
|
|
- queryWrapper1.between(RollClubOneDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
|
|
|
+ queryWrapper1.between(RollClubOneDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
|
|
|
}
|
|
|
List<RollClubOneDetails> rollClubOneDetailsList = rollClubOneDetailsService.list(queryWrapper1);
|
|
|
if (oConvertUtils.listIsNotEmpty(rollClubOneDetailsList)){
|
|
@@ -1844,7 +1844,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
queryWrapper2.between(RollClubTwoDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
|
|
|
} else {
|
|
|
// 当 changeShiftId 不为空时,时间范围从 createTime 到 updateTime
|
|
|
- queryWrapper2.between(RollClubTwoDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
|
|
|
+ queryWrapper2.between(RollClubTwoDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
|
|
|
}
|
|
|
|
|
|
List<RollClubTwoDetails> rollClubTwoDetailsList = rollClubTwoDetailsService.list(queryWrapper2);
|
|
@@ -1898,7 +1898,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
queryWrapper3.between(RollClubThreeDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
|
|
|
} else {
|
|
|
// 当 changeShiftId 不为空时,时间范围从 createTime 到 updateTime
|
|
|
- queryWrapper3.between(RollClubThreeDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
|
|
|
+ queryWrapper3.between(RollClubThreeDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
|
|
|
}
|
|
|
List<RollClubThreeDetails> rollClubThreeDetailsList = rollClubThreeDetailsService.list(queryWrapper3);
|
|
|
if (oConvertUtils.listIsNotEmpty(rollClubThreeDetailsList)){
|
|
@@ -1950,7 +1950,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
queryWrapper4.between(RollHeightDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
|
|
|
} else {
|
|
|
// 当 changeShiftId 不为空时,时间范围从 createTime 到 updateTime
|
|
|
- queryWrapper4.between(RollHeightDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
|
|
|
+ queryWrapper4.between(RollHeightDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
|
|
|
}
|
|
|
List<RollHeightDetails> rollHeightDetailsList = rollHeightDetailsService.list(queryWrapper4);
|
|
|
if (oConvertUtils.listIsNotEmpty(rollClubTwoDetailsList)){
|
|
@@ -1986,7 +1986,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
queryWrapper5.between(RollOutShippDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
|
|
|
} else {
|
|
|
// 当 changeShiftId 不为空时,时间范围从 createTime 到 updateTime
|
|
|
- queryWrapper5.between(RollOutShippDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
|
|
|
+ queryWrapper5.between(RollOutShippDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
|
|
|
}
|
|
|
List<RollOutShippDetails> rollOutShippDetailsList = rollOutShippDetailsService.list(queryWrapper5);
|
|
|
if (oConvertUtils.listIsNotEmpty(rollOutShippDetailsList)){
|
|
@@ -2121,7 +2121,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
queryWrapper1.between(RollClubOneDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
|
|
|
} else {
|
|
|
// 当 changeShiftId 不为空时,时间范围从 createTime 到 updateTime
|
|
|
- queryWrapper1.between(RollClubOneDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
|
|
|
+ queryWrapper1.between(RollClubOneDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
|
|
|
}
|
|
|
List<RollClubOneDetails> list1 = rollClubOneDetailsService.list(queryWrapper1);
|
|
|
|
|
@@ -2160,7 +2160,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
queryWrapper2.between(RollClubTwoDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
|
|
|
} else {
|
|
|
// 当 changeShiftId 不为空时,时间范围从 createTime 到 updateTime
|
|
|
- queryWrapper2.between(RollClubTwoDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
|
|
|
+ queryWrapper2.between(RollClubTwoDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
|
|
|
}
|
|
|
List<RollClubTwoDetails> list2 = rollClubTwoDetailsService.list(queryWrapper2);
|
|
|
|
|
@@ -2201,7 +2201,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
queryWrapper3.between(RollClubThreeDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
|
|
|
} else {
|
|
|
// 当 changeShiftId 不为空时,时间范围从 createTime 到 updateTime
|
|
|
- queryWrapper3.between(RollClubThreeDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
|
|
|
+ queryWrapper3.between(RollClubThreeDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
|
|
|
}
|
|
|
List<RollClubThreeDetails> list3 = rollClubThreeDetailsService.list(queryWrapper3);
|
|
|
|
|
@@ -2242,7 +2242,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
queryWrapper4.between(RollHeightDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
|
|
|
} else {
|
|
|
// 当 changeShiftId 不为空时,时间范围从 createTime 到 updateTime
|
|
|
- queryWrapper4.between(RollHeightDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
|
|
|
+ queryWrapper4.between(RollHeightDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
|
|
|
}
|
|
|
List<RollHeightDetails> list4 = rollHeightDetailsService.list(queryWrapper4);
|
|
|
|
|
@@ -2283,7 +2283,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
queryWrapper5.between(RollOutShippDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
|
|
|
} else {
|
|
|
// 当 changeShiftId 不为空时,时间范围从 createTime 到 updateTime
|
|
|
- queryWrapper5.between(RollOutShippDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
|
|
|
+ queryWrapper5.between(RollOutShippDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
|
|
|
}
|
|
|
List<RollOutShippDetails> list5 = rollOutShippDetailsService.list(queryWrapper5);
|
|
|
|