Merge remote-tracking branch 'origin/master' into master

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

@@ -264,10 +264,10 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
             oneQueryWrapper.eq(BilletOriginalProductRecord::getShift, billetHotsendChangeShift.getShift());
             oneQueryWrapper.eq(BilletOriginalProductRecord::getShiftGroup, billetHotsendChangeShift.getShiftGroup());
             Date endChnageTime = oConvertUtils.isNotEmpty(billetHotsendChangeShift.getChangeShiftTime()) ? billetHotsendChangeShift.getChangeShiftTime() : new Date();
-            oneQueryWrapper.between(BilletOriginalProductRecord::getCreateTime, startChnageTime, endChnageTime);
+            oneQueryWrapper.between(BilletOriginalProductRecord::getRollClubOneTime, startChnageTime, endChnageTime);
             search = false;
         }else if(oConvertUtils.isNotEmpty(queryDTO.getStartTime()) && oConvertUtils.isNotEmpty(queryDTO.getEndTime())){ // 时间范围
-            oneQueryWrapper.between(BilletOriginalProductRecord::getCreateTime,queryDTO.getStartTime(), queryDTO.getEndTime());
+            oneQueryWrapper.between(BilletOriginalProductRecord::getRollClubOneTime,queryDTO.getStartTime(), queryDTO.getEndTime());
             search = false;
         }
 
@@ -282,14 +282,14 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
                 changeQueryWrapper.eq(BilletHotsendChangeShift::getCcmNo, queryDTO.getCcmNo()).orderByDesc(BilletHotsendChangeShift::getCreateTime).last("limit 1");
                 BilletHotsendChangeShift billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(changeQueryWrapper);
                 // 查询确认时间为 null 或者  班次记录
-                oneQueryWrapper.ge(BilletOriginalProductRecord::getCreateTime, oConvertUtils.isNotEmpty(billetHotsendChangeShift.getCreateTime()) ? billetHotsendChangeShift.getCreateTime() : startOneTime);
+                oneQueryWrapper.ge(BilletOriginalProductRecord::getRollClubOneTime, oConvertUtils.isNotEmpty(billetHotsendChangeShift.getCreateTime()) ? billetHotsendChangeShift.getCreateTime() : startOneTime);
             } else {
                 // 获取当前年月日
                 Date queryDate = oConvertUtils.isNotEmpty(queryDTO.getQueryDate()) ? queryDTO.getQueryDate() : DateUtils.getDate() ;
                 Date startTime = DateUtils.getStartOfDayByDate(DateUtils.getStartOfDay(queryDate));
                 // 结束时间
                 Date endTime = DateUtils.getEndOfDayByDate(startTime);
-                oneQueryWrapper.between(BilletOriginalProductRecord::getCreateTime, startTime, endTime);
+                oneQueryWrapper.between(BilletOriginalProductRecord::getRollClubOneTime, startTime, endTime);
             }
         }
         // 炉号查询
@@ -306,7 +306,7 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
         if (oConvertUtils.isNotEmpty(queryDTO.getBrandNum())) {
             oneQueryWrapper.eq(BilletOriginalProductRecord::getGrade, queryDTO.getBrandNum());
         }
-        oneQueryWrapper.orderByAsc(BilletOriginalProductRecord::getCreateTime);
+        oneQueryWrapper.orderByAsc(BilletOriginalProductRecord::getRollClubOneTime);
 
         List<BilletOriginalProductRecord> list = billetOriginalProductRecordService.list(oneQueryWrapper);