Index: ssts-web/src/test/java/test/forgon/disinfectsystem/qualitymonitoring/definition/QualityControlItemParameterManagerTest.java =================================================================== diff -u -r40973 -r41280 --- ssts-web/src/test/java/test/forgon/disinfectsystem/qualitymonitoring/definition/QualityControlItemParameterManagerTest.java (.../QualityControlItemParameterManagerTest.java) (revision 40973) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/qualitymonitoring/definition/QualityControlItemParameterManagerTest.java (.../QualityControlItemParameterManagerTest.java) (revision 41280) @@ -143,6 +143,7 @@ FormDefinitionItemOption formDefinitionItemOption = new FormDefinitionItemOption(); formDefinitionItemOption.setQualityControlItemParameter(qualityControlItemParameterList.get(0)); objectDao.save(formDefinitionItemOption); + objectDao.getHibernateSession().flush(); //这里需要flush,让事物先提交一下,否则oracle会有问题 try { qualityControlItemParameterManager.batchDeleteQualityControlItemParameter(StringTools.join(idList, ";")); } catch (Exception e) {} Index: ssts-web/src/test/java/test/forgon/disinfectsystem/equipmentinspection/definition/service/EquipmentInspectionDefManagerTest.java =================================================================== diff -u -r41041 -r41280 --- ssts-web/src/test/java/test/forgon/disinfectsystem/equipmentinspection/definition/service/EquipmentInspectionDefManagerTest.java (.../EquipmentInspectionDefManagerTest.java) (revision 41041) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/equipmentinspection/definition/service/EquipmentInspectionDefManagerTest.java (.../EquipmentInspectionDefManagerTest.java) (revision 41280) @@ -143,6 +143,8 @@ applicableEquipmentSterilizer.setType(ApplicableEquipment.TYPE_STERILIZER); applicableEquipmentSterilizer.setEquipmentInspectionDefId(equipmentInspectionDef.getId()); objectDao.saveOrUpdate(applicableEquipmentSterilizer); + + objectDao.getHibernateSession().flush(); //这里需要flush,让事物先提交一下,否则oracle会有问题 Map> userNameEquipmentMap = equipmentInspectionDefManager.equipmentInspectionRemind(); if(userNameEquipmentMap != null){ @@ -158,6 +160,7 @@ objectDao.saveOrUpdate(washRecord); equipmentInspectionDef.setLastRemindDate(null); objectDao.saveOrUpdate(equipmentInspectionDef); + objectDao.getHibernateSession().flush(); //这里需要flush,让事物先提交一下,否则oracle会有问题 userNameEquipmentMap = equipmentInspectionDefManager.equipmentInspectionRemind(); AssertJUnit.assertNotNull(userNameEquipmentMap); List equipmentList = userNameEquipmentMap.get(EquipmentInspectionDef.REMIND_ALL_USERS); @@ -176,6 +179,7 @@ washRecord = (WashAndDisinfectRecord) objectDao.getById(WashAndDisinfectRecord.class.getSimpleName(), washRecord.getId()); equipmentInspectionDef.setLastRemindDate(null); objectDao.saveOrUpdate(equipmentInspectionDef); + objectDao.getHibernateSession().flush(); //这里需要flush,让事物先提交一下,否则oracle会有问题 userNameEquipmentMap = equipmentInspectionDefManager.equipmentInspectionRemind(); if(userNameEquipmentMap != null){ AssertJUnit.assertEquals(MapUtils.isEmpty(userNameEquipmentMap), true); @@ -191,6 +195,7 @@ objectDao.saveOrUpdate(sterilizationRecord); equipmentInspectionDef.setLastRemindDate(null); objectDao.saveOrUpdate(equipmentInspectionDef); + objectDao.getHibernateSession().flush(); //这里需要flush,让事物先提交一下,否则oracle会有问题 userNameEquipmentMap = equipmentInspectionDefManager.equipmentInspectionRemind(); AssertJUnit.assertNotNull(userNameEquipmentMap); equipmentList = userNameEquipmentMap.get(EquipmentInspectionDef.REMIND_ALL_USERS); @@ -202,6 +207,7 @@ sterilizationRecord = (SterilizationRecord) objectDao.getById(SterilizationRecord.class.getSimpleName(), sterilizationRecord.getId()); equipmentInspectionDef.setLastRemindDate(null); objectDao.saveOrUpdate(equipmentInspectionDef); + objectDao.getHibernateSession().flush(); //这里需要flush,让事物先提交一下,否则oracle会有问题 userNameEquipmentMap = equipmentInspectionDefManager.equipmentInspectionRemind(); if(userNameEquipmentMap != null){ AssertJUnit.assertEquals(MapUtils.isEmpty(userNameEquipmentMap), true); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/qualitymonitoring/definition/QualityControlIndicatorTypeManagerTest.java =================================================================== diff -u -r40973 -r41280 --- ssts-web/src/test/java/test/forgon/disinfectsystem/qualitymonitoring/definition/QualityControlIndicatorTypeManagerTest.java (.../QualityControlIndicatorTypeManagerTest.java) (revision 40973) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/qualitymonitoring/definition/QualityControlIndicatorTypeManagerTest.java (.../QualityControlIndicatorTypeManagerTest.java) (revision 41280) @@ -124,9 +124,11 @@ qualityControlItemParameterDto.setName("质控项目参数"); qualityControlItemParameterDto.setQcIndicatorType_id(idList.get(0)); qualityControlItemParameterManager.saveQualityControlItemParameter(qualityControlItemParameterDto ); + objectDao.getHibernateSession().flush(); //这里需要flush,让事物先提交一下,否则oracle会有问题 try { qualityControlIndicatorTypeManager.batchDeleteQualityControlIndicatorType(StringTools.join(idList, ";")); } catch (Exception e) {} + objectDao.getHibernateSession().flush(); //这里需要flush,让事物先提交一下,否则oracle会有问题 qualityControlIndicatorTypeList = qualityControlIndicatorTypeManager.getAll("sequence"); AssertJUnit.assertEquals(qualityControlIndicatorTypeList.size(), 2);