Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r29776 -r29789
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 29776)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 29789)
@@ -4810,9 +4810,14 @@
 				record.setOperator(rs.getString("operator"));
 				record.setRecyclingApplicationType(rs.getString("recyclingApplicationType"));
 				record.setRemark(StringTools.getDefaultString(rs.getString("remark")));
-				record.setApplySubmintDateTime(rs.getTimestamp("submitTime"));
 				record.setRecycleAmountNeedConfirm(rs.getString("recycleAmountNeedConfirm"));
-				record.setRecyclingTimes(ConvertNumber.getNumberIntValue(rs.getObject("recyclingTimes"), null));
+				Integer recyclingTimes = ConvertNumber.getNumberIntValue(rs.getObject("recyclingTimes"),0);
+				record.setRecyclingTimes(recyclingTimes);
+				if(InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION.equals(rs.getString("type")) && recyclingTimes.intValue() != 2){
+					record.setApplySubmintDateTime(rs.getTimestamp("applicationTime"));
+				}else{
+					record.setApplySubmintDateTime(rs.getTimestamp("submitTime"));
+				}
 				if(enableUrgentFunction){
 					int includingUrgent = rs.getInt("includingUrgent");
 					if(includingUrgent == 1){
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r29784 -r29789
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 29784)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 29789)
@@ -1410,7 +1410,7 @@
 		obj.put("depart", StringTools.getDefaultString((ip.getDepart())));
 		obj.put("settleAccountsDepart",StringTools.getDefaultString(ip.getSettleAccountsDepart()));
 		obj.put("applicationTime", ip.getApplicationTime());
-		obj.put("submitTime", ip.getSubmitTimeStr());
+		obj.put("submitTime", ip.getSubmitTime());
 		obj.put("applicant", StringTools.getDefaultString(ip.getApplicant()));
 		obj.put("type", StringTools.getDefaultString(ip.getType()));
 		obj.put("operationRoom", StringTools.getDefaultString(ip.getOperationRoom()));
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
===================================================================
diff -u -r29763 -r29789
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java	(.../RecyclingRecordListSqlGenerator.java)	(revision 29763)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java	(.../RecyclingRecordListSqlGenerator.java)	(revision 29789)
@@ -153,7 +153,7 @@
 		String groupBySql = "";
 		if(this.enableUrgentFunction){
 			joinSqlOfUrgent = " left join UrgentLevel ul on p.urgentLevel_id=ul.id left join RecyclingItem ri on ri.recyclingRecord_id=r.id ";
-			groupBySql = " group by r.id,r.communicationUserCode,r.communicationUserName,r.depart,r.departCode,r.departmentSender,r.operator,r.orgUnitCoding,r.packingTaskSerialNumber,r.recycleAmountNeedConfirm,r.recyclingApplicationType,r.recyclingTime,r.recyclingUser,r.status,r.recyclingApplication_id,p.type,p.remark,p.submitTime,p.recyclingStatus ,ul.id ,ul.name ,ul.colorCode,ul.colorName,ul.grade,p.operationRoom,r.recyclingTimes ";
+			groupBySql = " group by r.id,r.communicationUserCode,r.communicationUserName,r.depart,r.departCode,r.departmentSender,r.operator,r.orgUnitCoding,r.packingTaskSerialNumber,r.recycleAmountNeedConfirm,r.recyclingApplicationType,r.recyclingTime,r.recyclingUser,r.status,r.recyclingApplication_id,p.applicationTime,p.type,p.remark,p.submitTime,p.recyclingStatus ,ul.id ,ul.name ,ul.colorCode,ul.colorName,ul.grade,p.operationRoom,r.recyclingTimes ";
 		}
 		String recyclingAmountNeedConfirmOrder = "";
 		if(CssdUtils.getSystemSetConfigByNameBool("confirmRecyclingAmount",false)){
@@ -163,7 +163,7 @@
 		if (dbConnection.isSqlServer()) {
 			String tempSql = "(SELECT TOP "
 					+ end
-					+ " r.*,p.type,p.remark,p.submitTime,p.recyclingStatus,p.operationRoom "+ extraQuery +" FROM " + RecyclingRecord.class.getSimpleName() + " r left join " + InvoicePlan.class.getSimpleName() 
+					+ " r.*,p.applicationTime, p.type,p.remark,p.submitTime,p.recyclingStatus,p.operationRoom "+ extraQuery +" FROM " + RecyclingRecord.class.getSimpleName() + " r left join " + InvoicePlan.class.getSimpleName() 
 					+ " p on r.recyclingApplication_id = p.id " + joinSqlOfUrgent
 					+ "where r.orgUnitCoding = '"
 					+ orgUnitCodingFromSupplyRoomConfig