交班表字段新增，历史记录查询

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsendChangeShift/entity/BilletHotsendChangeShift.java

@@ -108,4 +108,7 @@ public class BilletHotsendChangeShift implements Serializable {
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private String remark;
+    @Excel(name = "交班时间", width = 15)
+    @ApiModelProperty(value = "交班时间")
+    private Date changeShiftTime;
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsendChangeShift/service/impl/BilletHotsendChangeShiftServiceImpl.java

@@ -57,8 +57,8 @@ public class BilletHotsendChangeShiftServiceImpl extends ServiceImpl<BilletHotse
                 result.put("fail", "当班信息查询为空，交班操作失败！");
                 return result;
             }
-            // 更新当前班次的更新时间，相当于上一个班交班的结束时间
-            billetHotsendChangeShift.setUpdateTime(new Date());
+            // 更新当前班次的交班时间，相当于上一个班交班的结束时间
+            billetHotsendChangeShift.setChangeShiftTime(new Date());
             baseMapper.updateById(billetHotsendChangeShift);
             // 获取当前最新炉号
             BilletBasicInfo billetBasicInfo = Optional.ofNullable(billetBasicInfoService.list(new LambdaQueryWrapper<BilletBasicInfo>()

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubOne/service/impl/RollClubOneServiceImpl.java

@@ -147,7 +147,7 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
             queryWrapper.between(RollClubOne::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
         } else {
             // 当 changeShiftId 不为空时，时间范围从 createTime 到 updateTime
-            queryWrapper.between(RollClubOne::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
+            queryWrapper.between(RollClubOne::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
         }
         List<RollClubOne> rollClubOneList = baseMapper.selectList(queryWrapper);
         if (oConvertUtils.listIsEmpty(rollClubOneList)){
@@ -173,7 +173,7 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
             queryWrapperDetails.between(RollClubOneDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
         } else {
             // 当 changeShiftId 不为空时，时间范围从 createTime 到 updateTime
-            queryWrapperDetails.between(RollClubOneDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
+            queryWrapperDetails.between(RollClubOneDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
         }
         List<RollClubOneDetails> rollClubOneDetailsList = rollClubOneDetailsService.list(queryWrapperDetails);
         if (oConvertUtils.listIsEmpty(rollClubOneDetailsList)){

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubThree/service/impl/RollClubThreeServiceImpl.java

@@ -165,7 +165,7 @@ public class RollClubThreeServiceImpl extends ServiceImpl<RollClubThreeMapper, R
             queryWrapper.between(RollClubThree::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
         } else {
             // 当 changeShiftId 不为空时，时间范围从 createTime 到 updateTime
-            queryWrapper.between(RollClubThree::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
+            queryWrapper.between(RollClubThree::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
         }
         List<RollClubThree> rollClubThreeList = baseMapper.selectList(queryWrapper);
         if (oConvertUtils.listIsEmpty(rollClubThreeList)){
@@ -188,7 +188,7 @@ public class RollClubThreeServiceImpl extends ServiceImpl<RollClubThreeMapper, R
             queryWrapperDetails.between(RollClubThreeDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
         } else {
             // 当 changeShiftId 不为空时，时间范围从 createTime 到 updateTime
-            queryWrapperDetails.between(RollClubThreeDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
+            queryWrapperDetails.between(RollClubThreeDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
         }
         List<RollClubThreeDetails> rollClubThreeDetailsList = rollClubThreeDetailsService.list(queryWrapperDetails);
         if (oConvertUtils.listIsEmpty(rollClubThreeDetailsList)){

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubTwo/service/impl/RollClubTwoServiceImpl.java

@@ -161,7 +161,7 @@ public class RollClubTwoServiceImpl extends ServiceImpl<RollClubTwoMapper, RollC
             queryWrapper.between(RollClubTwo::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
         } else {
             // 当 changeShiftId 不为空时，时间范围从 createTime 到 updateTime
-            queryWrapper.between(RollClubTwo::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
+            queryWrapper.between(RollClubTwo::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
         }
 
         List<RollClubTwo> rollClubTwoList = baseMapper.selectList(queryWrapper);
@@ -185,7 +185,7 @@ public class RollClubTwoServiceImpl extends ServiceImpl<RollClubTwoMapper, RollC
             queryWrapperDetails.between(RollClubTwoDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
         } else {
             // 当 changeShiftId 不为空时，时间范围从 createTime 到 updateTime
-            queryWrapperDetails.between(RollClubTwoDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
+            queryWrapperDetails.between(RollClubTwoDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
         }
         List<RollClubTwoDetails> rollClubTwoDetailsList = rollClubTwoDetailsService.list(queryWrapperDetails);
         if (oConvertUtils.listIsEmpty(rollClubTwoDetailsList)){

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollHeight/service/impl/RollHeightServiceImpl.java

@@ -152,7 +152,7 @@ public class RollHeightServiceImpl extends ServiceImpl<RollHeightMapper, RollHei
             queryWrapper.between(RollHeight::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
         } else {
             // 当 changeShiftId 不为空时，时间范围从 createTime 到 updateTime
-            queryWrapper.between(RollHeight::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
+            queryWrapper.between(RollHeight::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
         }
         List<RollHeight> rollHeightList = baseMapper.selectList(queryWrapper);
         if (oConvertUtils.listIsEmpty(rollHeightList)){
@@ -180,7 +180,7 @@ public class RollHeightServiceImpl extends ServiceImpl<RollHeightMapper, RollHei
             queryWrapperDetails.between(RollHeightDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
         } else {
             // 当 changeShiftId 不为空时，时间范围从 createTime 到 updateTime
-            queryWrapperDetails.between(RollHeightDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
+            queryWrapperDetails.between(RollHeightDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
         }
         List<RollHeightDetails> rollHeightDetailsList = rollHeightDetailsService.list(queryWrapperDetails);
         if (oConvertUtils.listIsEmpty(rollHeightList)){

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollOutShipp/service/impl/RollOutShippServiceImpl.java

@@ -162,7 +162,7 @@ public class RollOutShippServiceImpl extends ServiceImpl<RollOutShippMapper, Rol
             queryWrapper.between(RollOutShipp::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
         } else {
             // 当 changeShiftId 不为空时，时间范围从 createTime 到 updateTime
-            queryWrapper.between(RollOutShipp::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
+            queryWrapper.between(RollOutShipp::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
         }
         List<RollOutShipp> rollOutShippsList = baseMapper.selectList(queryWrapper);
         if (oConvertUtils.listIsEmpty(rollOutShippsList)){
@@ -185,7 +185,7 @@ public class RollOutShippServiceImpl extends ServiceImpl<RollOutShippMapper, Rol
             queryWrapperDetails.between(RollOutShippDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
         } else {
             // 当 changeShiftId 不为空时，时间范围从 createTime 到 updateTime
-            queryWrapperDetails.between(RollOutShippDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getUpdateTime());
+            queryWrapperDetails.between(RollOutShippDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
         }
         List<RollOutShippDetails> rollOutShippDetailsList = rollOutShippDetailsService.list(queryWrapperDetails);
         if (oConvertUtils.listIsEmpty(rollOutShippDetailsList)){

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/service/impl/StorageBillServiceImpl.java

@@ -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);