Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.7.8_4.7.9_oracle.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.7.8_4.7.9_oracle.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.7.8_4.7.9_oracle.sql (revision 17647) @@ -0,0 +1,4 @@ +insert into UseRecordToRecycleApplication(id,convertUserCode,convertUserName,invoicePlanId,useRecordId) +select hibernate_sequence.nextval,su.name,ip.applicant,ra.id,ra.userecord_id from RecyclingApplication ra join invoicePlan ip on ra.id=ip.id +left join SS_USERS su on ip.applicant=su.fullName where ra.userecord_id is not null +and ra.userecord_id not in (select userecord_id from UseRecordToRecycleApplication); \ No newline at end of file Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.7.8_4.7.9_sqlserver.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.7.8_4.7.9_sqlserver.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.7.8_4.7.9_sqlserver.sql (revision 17647) @@ -0,0 +1,4 @@ +insert into UseRecordToRecycleApplication(convertUserCode,convertUserName,invoicePlanId,useRecordId) +select su.name,ip.applicant,ra.id,ra.userecord_id from RecyclingApplication ra join invoicePlan ip on ra.id=ip.id +left join SS_USERS su on ip.applicant=su.fullName where ra.userecord_id is not null +and ra.userecord_id not in (select userecord_id from UseRecordToRecycleApplication); \ No newline at end of file Index: forgon-core/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r17643 -r17647 --- forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 17643) +++ forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 17647) @@ -21,7 +21,7 @@ "4.2.3","4.2.4","4.2.5","4.2.6","4.2.7","4.2.8","4.2.9","4.3.0","4.3.1","4.3.2","4.3.3","4.3.4","4.3.5","4.3.6","4.3.7","4.3.8","4.3.9", "4.4.0","4.4.1","4.4.2","4.4.3","4.4.4","4.4.5","4.4.6","4.4.7","4.4.8","4.4.9","4.5.0","4.5.1","4.5.2","4.5.3","4.5.4","4.5.5","4.5.6","4.5.7","4.5.8", "4.5.9","4.6.0","4.6.1","4.6.2","4.6.3","4.6.4","4.6.5","4.6.6","4.6.7","4.6.8","4.6.9","4.7.0","4.7.1","4.7.2","4.7.3","4.7.4","4.7.5","4.7.6","4.7.7", - "4.7.8"};// 版本列表 + "4.7.8","4.7.9"};// 版本列表 public final static List SOFTWARE_VERSION_LIST = Arrays .asList(SOFTWARE_VERSION_ARRAY); public final static String SOFTWARE_VERSION = SOFTWARE_VERSION_ARRAY[SOFTWARE_VERSION_ARRAY.length - 1];// 软件最新版本