Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.3.9_4.4.0_sqlserver.sql =================================================================== diff -u -r15411 -r15425 --- ssts-web/src/main/webapp/dataUpdater/sqls/4.3.9_4.4.0_sqlserver.sql (.../4.3.9_4.4.0_sqlserver.sql) (revision 15411) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.3.9_4.4.0_sqlserver.sql (.../4.3.9_4.4.0_sqlserver.sql) (revision 15425) @@ -1 +1 @@ -ALTER TABLE dbo.invoicePlan ALTER COLUMN lendGoodsBrief text COLLATE Chinese_PRC_CI_AS +ALTER TABLE dbo.invoicePlan ALTER COLUMN lendGoodsBrief nvarchar(4000); Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r15415 -r15425 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 15415) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 15425) @@ -937,26 +937,8 @@ buildSqlForGetInvoicePlanByOrgUnitCodingsAndTousseType(orgUnitCodings, applyDate, tousseType); // sql += " ORDER BY sequence, applicationTime"; // return objectDao.findBySql(InvoicePlan.class.getSimpleName(), sql); - String hql = String.format("select po from %s po inner join fetch po.applicationItems %s ORDER BY sequence, applicationTime", InvoicePlan.class.getSimpleName(),sql); - ///InvoicePlan的字段lendGoodsBrief,加了Clob,使得不能使用distinct,需要过滤重复项 - List list = objectDao.findByHql(hql); - List ret = new ArrayList(); - if(CollectionUtils.isNotEmpty(list)){ - for(InvoicePlan plan : list){ - List find = ret.stream().filter(new java.util.function.Predicate(){ - @Override - public boolean test(InvoicePlan t) { - if(t.getId().equals(plan.getId())){ - return true; - } - return false; - }}).collect(Collectors.toList()); - if(CollectionUtils.isEmpty(find)){ - ret.add(plan); - } - } - } - return ret; + String hql = String.format("select distinct po from %s po inner join fetch po.applicationItems %s ORDER BY sequence, applicationTime", InvoicePlan.class.getSimpleName(),sql); + return objectDao.findByHql(hql); } /** Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.3.9_4.4.0_oracle.sql =================================================================== diff -u -r15411 -r15425 --- ssts-web/src/main/webapp/dataUpdater/sqls/4.3.9_4.4.0_oracle.sql (.../4.3.9_4.4.0_oracle.sql) (revision 15411) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.3.9_4.4.0_oracle.sql (.../4.3.9_4.4.0_oracle.sql) (revision 15425) @@ -1,5 +1 @@ -execute immediate 'alter table invoiceplan add lendgoodsbrief1 CLOB'; -execute immediate 'update invoiceplan set lendgoodsbrief1 = TO_CLOB(lendgoodsbrief)'; -execute immediate 'commit'; -execute immediate 'alter table invoiceplan drop column lendgoodsbrief'; -execute immediate 'alter table invoiceplan rename column lendgoodsbrief1 to lendgoodsbrief'; +execute immediate 'alter table invoiceplan modify lendgoodsbrief varchar2(4000)'; Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java =================================================================== diff -u -r15411 -r15425 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 15411) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 15425) @@ -757,7 +757,7 @@ return null; } - @Lob + @Column(length=4000) public String getLendGoodsBrief() { return lendGoodsBrief; }