Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/operationreservation/RepeatSyncOperationSerialNumberInfo.java =================================================================== diff -u -r25257 -r25315 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/operationreservation/RepeatSyncOperationSerialNumberInfo.java (.../RepeatSyncOperationSerialNumberInfo.java) (revision 25257) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/operationreservation/RepeatSyncOperationSerialNumberInfo.java (.../RepeatSyncOperationNumber.java) (revision 25315) @@ -32,7 +32,7 @@ @DynamicInsert(false) @DynamicUpdate(true) @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) -public class RepeatSyncOperationSerialNumberInfo { +public class RepeatSyncOperationNumber { /** * */ Fisheye: Tag 25315 refers to a dead (removed) revision in file `ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/operationreservation/RepeatSyncOperationSerialNumberInfo.java'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java =================================================================== diff -u -r25257 -r25315 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java (.../OperationReservationManagerImpl.java) (revision 25257) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/service/OperationReservationManagerImpl.java (.../OperationReservationManagerImpl.java) (revision 25315) @@ -39,7 +39,7 @@ import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; import com.forgon.disinfectsystem.entity.operationreservation.OperationReservation; -import com.forgon.disinfectsystem.entity.operationreservation.RepeatSyncOperationSerialNumberInfo; +import com.forgon.disinfectsystem.entity.operationreservation.RepeatSyncOperationNumber; import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; import com.forgon.disinfectsystem.inventorymanagement.dao.InvoicePlanDao; import com.forgon.disinfectsystem.inventorymanagement.model.HrpInvoicePlan; @@ -826,10 +826,10 @@ * @param onoperationReservation */ private void saveOrUpdateRepeatSyncSerialNumberInfo(String serialNumber,OperationReservation onoperationReservation){ - RepeatSyncOperationSerialNumberInfo repeatSerialNumberpo = (RepeatSyncOperationSerialNumberInfo) - objectDao.getByProperty(RepeatSyncOperationSerialNumberInfo.class .getSimpleName(), "serialNumber", serialNumber); + RepeatSyncOperationNumber repeatSerialNumberpo = (RepeatSyncOperationNumber) + objectDao.getByProperty(RepeatSyncOperationNumber.class .getSimpleName(), "serialNumber", serialNumber); if(null == repeatSerialNumberpo){ - repeatSerialNumberpo = new RepeatSyncOperationSerialNumberInfo(); + repeatSerialNumberpo = new RepeatSyncOperationNumber(); } repeatSerialNumberpo.setOperationTime(onoperationReservation.getOperationTime());//原同步申请单号 repeatSerialNumberpo.setSerialNumber(serialNumber);//手术时间 @@ -1139,10 +1139,10 @@ dateQueryAdapter.dateAreaSql("po.operationTime",strStartime,strEndTime), SqlUtils.getStringFieldInLargeCollectionsPredicate("po.serialNumber",syncSerialNumberList)); @SuppressWarnings("unchecked") - List repeatSyncOperationSerialNumberInfo = objectDao.findBySql(RepeatSyncOperationSerialNumberInfo.class.getSimpleName(), sqlStr2); + List repeatSyncOperationSerialNumberInfo = objectDao.findBySql(RepeatSyncOperationNumber.class.getSimpleName(), sqlStr2); //3-2、过滤掉时间段内已重复同步的申请单 if(CollectionUtils.isNotEmpty(repeatSyncOperationSerialNumberInfo)){ - ListrepeatSyncSerialNumber = repeatSyncOperationSerialNumberInfo.stream().map(RepeatSyncOperationSerialNumberInfo::getSerialNumber).collect(Collectors.toList()); + ListrepeatSyncSerialNumber = repeatSyncOperationSerialNumberInfo.stream().map(RepeatSyncOperationNumber::getSerialNumber).collect(Collectors.toList()); // Iterator hrpIterator = syncInvoicePlanList.iterator(); while(hrpIterator.hasNext()){