Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/urgent/UrgentLevel.java =================================================================== diff -u -r29031 -r30137 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/urgent/UrgentLevel.java (.../UrgentLevel.java) (revision 29031) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/urgent/UrgentLevel.java (.../UrgentLevel.java) (revision 30137) @@ -1,11 +1,14 @@ package com.forgon.disinfectsystem.entity.urgent; import javax.persistence.Entity; + import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; + import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.persistence.Index; import javax.persistence.Table; import org.hibernate.annotations.Cache; @@ -21,7 +24,7 @@ @Entity @DynamicInsert(false) @DynamicUpdate(true) -@Table(name = "UrgentLevel") +@Table(name = "UrgentLevel",indexes={@Index(columnList="grade",name="ul_grade_index")}) @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) public class UrgentLevel { private Long id; Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java =================================================================== diff -u -r29763 -r30137 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 29763) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 30137) @@ -217,7 +217,7 @@ // foreignTousseAppFilterSql = " or (po.type <> '"+ InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION +"' or " // + "(po.type='"+ InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION +"' and po.id in (select id from "+ ForeignTousseApplication.class.getSimpleName() +" where "+ SqlUtils.getStringFieldInLargeCollectionsPredicate("supplierName", supplierNameList) +")))"; foreignTousseAppFilterSql = " or (po.departCoding = '" + currentOrgUnitCode +"' and po.type='"+ InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION - +"' and po.id in (select ftp.id from "+ ForeignTousseApplication.class.getSimpleName() +" ftp, " + TousseItem.class.getSimpleName() + " ti, " + TousseDefinition.class.getSimpleName() + " td where "+ SqlUtils.getStringFieldInLargeCollectionsPredicate("td.supplierName", supplierNameList) +"))"; + +"' and po.id in (select ftp.id from "+ ForeignTousseApplication.class.getSimpleName() +" ftp, " + TousseItem.class.getSimpleName() + " ti, " + TousseDefinition.class.getSimpleName() + " td where td.id=ti.tousseDefinitionId and "+ SqlUtils.getStringFieldInLargeCollectionsPredicate("td.supplierName", supplierNameList) +"))"; } String loginUserSql = String.format(" and ((po.handleDepartCoding = '%s' and po.committedStatus = 1) or po.applicantCode='%s' or (po.departCoding = '%s' and po.type<>'%s') %s) ", Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java =================================================================== diff -u -r30091 -r30137 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 30091) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 30137) @@ -55,7 +55,8 @@ @Table(name = "invoicePlan",indexes={@Index(columnList="applicationTime",name="applicationTime_index"),@Index(columnList="departCoding",name="departCoding_index"),@Index(columnList="handleDepartCoding",name="handleDepartCoding_index") ,@Index(columnList="returnStatus",name="returnStatus_index"),@Index(columnList="deliverStatus",name="deliverStatus_index"),@Index(columnList="recyclingStatus",name="recyclingStatus_index") ,@Index(columnList="committedStatus",name="committedStatus_index"),@Index(columnList="type",name="type_index"),@Index(columnList="lastInvoiceTime",name="lastInvoiceTime_index") -,@Index(columnList="applicant",name="applicant_index"),@Index(columnList="endStatus",name="endStatus_index"),@Index(columnList="sequence",name="InvoicePlan_sequence_index"),@Index(columnList="includeInvoiceItems",name="includeInvoiceItems_index") +,@Index(columnList="applicant",name="applicant_index"),@Index(columnList="endStatus",name="endStatus_index"),@Index(columnList="sequence",name="InvoicePlan_sequence_index") +,@Index(columnList="includeInvoiceItems",name="includeInvoiceItems_index"),@Index(columnList="urgentLevel_id",name="ip_urgentLevel_id_index") }) @Inheritance(strategy = InheritanceType.JOINED) @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)