Index: forgon-tools/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r35751 -r35772 --- forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 35751) +++ forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 35772) @@ -28,7 +28,7 @@ "4.9.45","4.9.46","4.9.47","4.9.48","4.9.49","4.9.50","4.9.51","4.9.52","4.9.53","4.9.54","4.9.55","4.9.56","4.9.57","4.9.58","4.9.59","4.9.60","4.9.61","4.9.62", "4.9.63","4.9.64","4.9.65","4.9.66","4.9.67","4.9.68","4.9.69","4.9.70","4.9.71","4.9.72","4.9.73","4.9.74","4.9.75","4.9.76","4.9.77","4.9.78","4.9.79","4.9.80","4.9.81","4.9.82","4.9.83","4.9.84","4.9.85", "4.9.86","4.9.87","4.9.88","4.9.89","4.9.90","4.9.91","4.9.92","4.9.93","4.9.94","4.9.95","4.9.96","4.9.97","4.9.98","4.9.99","5.0.0","5.0.1","5.0.2","5.0.3","5.0.4","5.0.5","5.0.6","5.0.7", - "5.0.8","5.0.9"}; + "5.0.8","5.0.9","5.0.10"}; // 版本列表(4.0版本升级4.1版需要分两步:先从4.0升到4.1.0、然后从4.1.0升级4.1最新版本) /*public final static String[] SOFTWARE_VERSION_ARRAY = new String[] { Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r35749 -r35772 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 35749) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 35772) @@ -4675,6 +4675,14 @@ setForeignTousseProperty(record, application, recyclingContext); } tousseTransitionPlanManager.recycled(application); + if(StringUtils.equals(application.getType(), InvoicePlan.TYPE_APPLYING_FOR_RETURN_FORM) && application instanceof RecyclingApplication){ + //回收申请还物单时,更新最后实际归还时间NFYY-75 + RecyclingApplication ra = (RecyclingApplication) application; + RecyclingApplication parent = ra.getParent(); + if(parent != null && StringUtils.equals(parent.getType(), InvoicePlan.TYPE_BORROWINGSINGLE)){ + parent.setLastReturnDateTime(record.getRecyclingTime()); + } + } }else{ record.setRecyclingApplicationType(InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION); String deptCode = record.getDepartCode(); Index: ssts-web/src/main/webapp/dataUpdater/sqls/5.0.9_5.0.10.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/5.0.9_5.0.10.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/5.0.9_5.0.10.sql (revision 35772) @@ -0,0 +1,2 @@ +update RecyclingApplication set lastReturnDateTime = null where lastReturnDateTime is not null; +update RecyclingApplication set lastReturnDateTime = (select lastRecyclingTime from (select ra.recyclingApplication_id, max(rr.recyclingTime) lastRecyclingTime from RecyclingApplication ra join invoicePlan ip on ip.id = ra.id join RecyclingRecord rr on rr.recyclingApplication_id = ra.id where ip.type = '申请还物单' group by ra.recyclingApplication_id) rs where rs.recyclingApplication_id = RecyclingApplication.id) where id in (select id from InvoicePlan ip where ip.type = '借物单'); \ No newline at end of file