Index: ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanManagerInvoicePlanStatusTests.java =================================================================== diff -u -r12331 -r21809 --- ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanManagerInvoicePlanStatusTests.java (.../InvoicePlanManagerInvoicePlanStatusTests.java) (revision 12331) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/application/service/InvoicePlanManagerInvoicePlanStatusTests.java (.../InvoicePlanManagerInvoicePlanStatusTests.java) (revision 21809) @@ -1,5 +1,5 @@ package test.forgon.disinfectsystem.application.service; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import java.util.List; Index: ssts-web/src/test/java/test/forgon/disinfectsystem/application/dwr/table/RecyclingApplicationTableManagerInvoker.java =================================================================== diff -u -r12335 -r21809 --- ssts-web/src/test/java/test/forgon/disinfectsystem/application/dwr/table/RecyclingApplicationTableManagerInvoker.java (.../RecyclingApplicationTableManagerInvoker.java) (revision 12335) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/application/dwr/table/RecyclingApplicationTableManagerInvoker.java (.../RecyclingApplicationTableManagerInvoker.java) (revision 21809) @@ -3,8 +3,6 @@ import org.hibernate.Session; import org.hibernate.Transaction; import org.springframework.transaction.PlatformTransactionManager; -import org.springframework.transaction.TransactionStatus; -import org.springframework.transaction.support.DefaultTransactionDefinition; import com.forgon.disinfectsystem.recyclingapplication.dwr.table.RecyclingApplicationTableManager; import com.forgon.tools.hibernate.ObjectDao; Index: ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestForeignTousseGoodRecyclingApplication.java =================================================================== diff -u -r19934 -r21809 --- ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestForeignTousseGoodRecyclingApplication.java (.../TestForeignTousseGoodRecyclingApplication.java) (revision 19934) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestForeignTousseGoodRecyclingApplication.java (.../TestForeignTousseGoodRecyclingApplication.java) (revision 21809) @@ -1,29 +1,30 @@ package test.forgon.disinfectsystem.application; -import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; -import com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication; -import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertNull; + +import java.util.HashMap; +import java.util.Map; + import net.sf.json.JSONArray; import net.sf.json.JSONObject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import org.springframework.orm.hibernate4.HibernateTemplate; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; + import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; import test.forgon.disinfectsystem.application.assertThat.RecyclingApplicationAssert; import test.forgon.disinfectsystem.constants.ForeignTousseConstant; import test.forgon.disinfectsystem.dataProvider.application.ForeignTousseAppDataProvider; import test.forgon.disinfectsystem.dataProvider.tousseDefinition.MaterialDataProvider; -import java.util.HashMap; -import java.util.Map; +import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; +import com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication; +import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; - /** * @author zhonghaowen * @apiNote 外来器械申请单 Index: ssts-web/src/test/java/test/forgon/disinfectsystem/application/dwr/table/RecyclingApplicationTableManagerTests.java =================================================================== diff -u -r14103 -r21809 --- ssts-web/src/test/java/test/forgon/disinfectsystem/application/dwr/table/RecyclingApplicationTableManagerTests.java (.../RecyclingApplicationTableManagerTests.java) (revision 14103) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/application/dwr/table/RecyclingApplicationTableManagerTests.java (.../RecyclingApplicationTableManagerTests.java) (revision 21809) @@ -15,8 +15,6 @@ import net.sf.json.JSONArray; import org.apache.log4j.Logger; -import org.hibernate.Session; -import org.hibernate.Transaction; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionStatus; @@ -25,11 +23,8 @@ import test.forgon.constant.Constants; import test.forgon.disinfectsystem.AbstractCSSDTest; -import test.forgon.disinfectsystem.InitCssdDataTask; -import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; -import com.forgon.disinfectsystem.entity.packing.PackingTask; import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication; import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; import com.forgon.disinfectsystem.recyclingapplication.dwr.table.RecyclingApplicationTableManager; Index: ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestDressingRecyclingApplication.java =================================================================== diff -u -r17726 -r21809 --- ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestDressingRecyclingApplication.java (.../TestDressingRecyclingApplication.java) (revision 17726) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/application/TestDressingRecyclingApplication.java (.../TestDressingRecyclingApplication.java) (revision 21809) @@ -1,29 +1,29 @@ package test.forgon.disinfectsystem.application; -import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; -import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; -import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication; -import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; -import com.forgon.disinfectsystem.vo.TousseItemVo; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertNull; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; + import test.forgon.disinfectsystem.AbstractCSSDTest; import test.forgon.disinfectsystem.application.assertThat.RecyclingApplicationAssert; import test.forgon.disinfectsystem.dataProvider.application.ApplicationDataProvider; import test.forgon.disinfectsystem.dataProvider.tousseDefinition.TousseDefinitionDataProvider; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.stream.Collectors; +import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; +import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; +import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication; +import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; +import com.forgon.disinfectsystem.vo.TousseItemVo; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertNull; -import static org.testng.Assert.assertTrue; - /** * @author zhonghaowen * @apiNote 敷料包申请单 Index: ssts-web/src/test/java/test/forgon/directory/service/OrgUnitManagerTest.java =================================================================== diff -u -r18461 -r21809 --- ssts-web/src/test/java/test/forgon/directory/service/OrgUnitManagerTest.java (.../OrgUnitManagerTest.java) (revision 18461) +++ ssts-web/src/test/java/test/forgon/directory/service/OrgUnitManagerTest.java (.../OrgUnitManagerTest.java) (revision 21809) @@ -1,5 +1,8 @@ package test.forgon.directory.service; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + import java.sql.ResultSet; import java.util.ArrayList; import java.util.LinkedList; @@ -12,6 +15,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.testng.annotations.Test; +import test.forgon.constant.Constants; +import test.forgon.disinfectsystem.AbstractCSSDTest; + import com.forgon.directory.model.BarcodeDevice; import com.forgon.directory.model.CssdHandleTousses; import com.forgon.directory.model.CssdServiceDepts; @@ -53,10 +59,6 @@ import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.json.JSONUtil; import com.forgon.tools.string.StringTools; - -import test.forgon.constant.Constants; -import test.forgon.disinfectsystem.AbstractCSSDTest; -import static org.testng.Assert.*; /** * 此类主要测试科室的一些业务方法 * @author Chenjiaru