~liucheng/OlyMEBG.git

			@@ -57,6 +57,7 @@
			// 2022/4/6 zhangyuheng update start
			public String RepairFinishDate; //修理品处理完成日
			public String ApplicanterPhone; //处理人电话
			public String CancelDate; //受理人取消报修日
			// 2022/4/6 zhangyuheng update end

			// 上线前报修子单与修理上的相关字段都删除
			@@ -135,6 +136,7 @@
			List < String > managementCodeList = new List < String > (); //存放科室编码
			List < String > rpersonList = new List < String > (); //存放报修人用户编码
			List < String > canIdList = new List < String > (); //存放取消人用户编号
			List < String > repairNoList = new List < String > (); //存放报修子单号
			for (GeData ged: itemMasterList) {
			String dataComplete = verify(ged);
			if (!String.isBlank(dataComplete)) {
			@@ -249,17 +251,18 @@
			repair.Ownerid = canidMap.get(ged.repairOderInfo.repairOrderNo2FSEID).Id; //报修子单所属FSE的ID
			repair.AssetModel__c = ged.applyRepairInfo.equipmentModel; //设备型号
			repair.AirframeCodeEngineer__c = ged.applyRepairInfo.equipmentCd; //机身编码(工程师)
			repair.ResponseResultDesc__c = ged.applyRepairInfo.responseResultDesc; //应对描述
			repair.ResponseResultDesc__c = ged.applyRepairInfo.responseResultDesc; //应对描述--->问题描述（工程师）
			repair.ProcessResult__c = ged.applyRepairInfo.processResult; //处理结果

			// 2022/4/6 zhangyuheng update start
			repair.RepairFinishDate__c = NFMUtil.parseStr2Date(ged.repairOderInfo.RepairFinishDate) ; //修理品处理完成日
			repair.ApplicanterPhone__c = ged.repairOderInfo.ApplicanterPhone; //处理人电话

			repair.CancelleRepairTime__c = NFMUtil.parseStr2Date(ged.repairOderInfo.CancelDate); //受理人取消报修日
			// 2022/4/6 zhangyuheng update end

			if ('问题已解决'.equals(ged.applyRepairInfo.processResult)) {
			repair.Status__c = '关闭';
			// repair.Status__c = '关闭';
			repair.Status__c = '已完成'; // 2022/4/6 zhangyuheng
			} else {
			repair.Status__c = '待处理';

			@@ -279,10 +282,16 @@
			repair.AttachmentName__c = attachmentName;
			repairOrderNo2Str += repairOrderNo2 + '\n';
			repairList.add(repair);
			repairNoList.add(ged.repairOderInfo.repairOrderNo2);
			}

			if (repairList.size() > 0) {

			// 2022/4/6 zhangyuheng update start
			List<RepairSubOrder__c> repairList1 = [SELECT Id FROM RepairSubOrder__c WHERE RepairSubOrderNo__c in: repairNoList];
			if (repairList1.size() > 0) {
			logstr += repairOrderNo2Str + ']-已存在';
			}
			// if (repairList.size() > 0) {==== 2022/4/6 zhangyuheng注释掉
			else {
			// 2022/4/6 zhangyuheng update end
			insert repairList;
			repairOrderNo2Str += ' ]\n';
			logstr += repairOrderNo2Str + '新增完成, 新增总数数为：' + repairList.size() + '\n';