| 
					
				 | 
			
			
				@@ -84,6 +84,8 @@ public class InstallBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     OrderAppealService orderAppealService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Resource 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     ItfGreeToFaDownloadTaskListService itfGreeToFaDownloadTaskListService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @Resource 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    OrderApplyDispatchService orderApplyDispatchService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -182,13 +184,14 @@ public class InstallBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<FaGreeSms> faGreeSms = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<OrderAppeal> orderAppeal = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<ItfGreeToFaDownloadTaskList> its = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        List<OrderApplyDispatch> oads = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 提取本地订单 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         OrderBase old = orderBaseService.lambdaQuery() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .eq(OrderBase::getPgguid, item.getPgguid()).one(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 获取安装工单主表 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        OrderBase newLCLS = getAddOrderBaseUp(item, brand); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        OrderBase newLCLS = getAddOrderBaseUp(item, brand,oads, its); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 这里一定不能少 已生成了工单号,不能再次生成 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         newLCLS.setId(old.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         newLCLS.setDispatchStatus(old.getDispatchStatus()); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -234,7 +237,7 @@ public class InstallBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 安装工单数据修改落本地表 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         addOrUpdateOrderData(item, upInfo, own, mxsynreqids, orderProductsUpdate, synreqids, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 addoiolList, fyqd, orderInstall, synReqYfYyIds, addoalists, getpjSynReqId, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                addoalist, faGreeSms,orderAppeal, its); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                addoalist, faGreeSms,orderAppeal, its,oads); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public void addOrUpdateOrderData(ItfTblAzAssignLcLsDownload item, OrderBase upInfo, OrderWorker own, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -242,7 +245,8 @@ public class InstallBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                      List<ItfTblAzAssignFkmxDownload> synreqids, List<OrderInstallOperatingLog> addoiolList, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                      List<ItfTblAzAssignFeeDownload> fyqd, OrderInstall orderInstall, List<Long> synReqYfYyIds, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                      List<OrderReAppointment> addoalists, List<Long> getpjSynReqId, List<OrderAppraise> addoalist, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                                     List<FaGreeSms> faGreeSms,List<OrderAppeal> orderAppeal,List<ItfGreeToFaDownloadTaskList> its) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                     List<FaGreeSms> faGreeSms,List<OrderAppeal> orderAppeal,List<ItfGreeToFaDownloadTaskList> its, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                     List<OrderApplyDispatch> oads) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 同步修改订单基础表 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (upInfo !=null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             orderBaseService.updateById(upInfo); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -315,6 +319,12 @@ public class InstallBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             its.clear(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        // 改派申请单 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (oads.size()>0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            orderApplyDispatchService.saveOrUpdateBatch(oads); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            oads.clear(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (getpjSynReqId.size()>0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             upItfTblAzAssignSatisfactionDownload(getpjSynReqId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             getpjSynReqId.clear(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -875,6 +885,7 @@ public class InstallBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<FaGreeSms> faGreeSms = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<OrderAppeal> orderAppeal = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<ItfGreeToFaDownloadTaskList> its = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        List<OrderApplyDispatch> oads = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<ItfTblAzAssignMxDownload> orderMx = itfTblAzAssignMxDownloadService.lambdaQuery() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .eq(ItfTblAzAssignMxDownload::getDownloadTaskNo, item.getDownloadTaskNo()) 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -901,7 +912,7 @@ public class InstallBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 获取安装工单主表 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        OrderBase orderBase = getAddOrderBase(item, brand); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        OrderBase orderBase = getAddOrderBase(item, brand,oads,its); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 以旧换新数据下载同步表 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         getOldForNewProduct(item, orderBase,its); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -936,7 +947,7 @@ public class InstallBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 安装工单数据落本地表 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         addOrderData(orderBase, orderWorker, orderInstall, orderProducts, oiolList, oa, oanew, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 item.getSynReqId(), synReqIds, synReqFkMxIds, synReqYfYyIds, fyqd, getpjSynReqId, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                faGreeSms,orderAppeal, its); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                faGreeSms,orderAppeal, its, oads); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private void getOldForNewProduct(ItfTblAzAssignLcLsDownload item, OrderBase orderBase,List<ItfGreeToFaDownloadTaskList> its) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1001,7 +1012,7 @@ public class InstallBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                              Long synReqId, List<Long> synReqIds,  List<Long> synReqFkMxIds, List<Long> synReqYfYyIds, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                              List<ItfTblAzAssignFeeDownload> fyqd, List<Long> getpjSynReqId, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                              List<FaGreeSms> faGreeSms,List<OrderAppeal> orderAppeal, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                             List<ItfGreeToFaDownloadTaskList> its) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                             List<ItfGreeToFaDownloadTaskList> its, List<OrderApplyDispatch> oads) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 工单基础表 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (orderBase != null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             orderBaseService.save(orderBase); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1080,6 +1091,12 @@ public class InstallBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             getpjSynReqId.clear(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        // 改派申请单 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (oads.size()>0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            orderApplyDispatchService.saveOrUpdateBatch(oads); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            oads.clear(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 修改同步状态 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         upItfTblAzAssignLcLsDownload(synReqId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1549,7 +1566,8 @@ public class InstallBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return null; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    private OrderBase getAddOrderBase(ItfTblAzAssignLcLsDownload item, Brand brand) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    private OrderBase getAddOrderBase(ItfTblAzAssignLcLsDownload item, Brand brand,List<OrderApplyDispatch> oads, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                      List<ItfGreeToFaDownloadTaskList> its) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         OrderBase orderBase = new OrderBase(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         OrderPar orderPar = new OrderPar(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         orderPar.setSynReqId(item.getSynReqId()); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1568,12 +1586,13 @@ public class InstallBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             orderBase.setIsReservation(1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 重置部分数据 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        orderService.setPar(item, orderBase); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        orderService.setPar(item, orderBase,oads,its); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return orderBase; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    private OrderBase getAddOrderBaseUp(ItfTblAzAssignLcLsDownload item, Brand brand) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    private OrderBase getAddOrderBaseUp(ItfTblAzAssignLcLsDownload item, Brand brand, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                        List<OrderApplyDispatch> oads, List<ItfGreeToFaDownloadTaskList> its) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         OrderBase orderBase = new OrderBase(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         OrderPar orderPar = new OrderPar(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         orderPar.setSynReqId(item.getSynReqId()); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1581,7 +1600,7 @@ public class InstallBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 生成工单基础表 对象 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         orderBase = azGDLcLsDownloadMapper.getOrderBase(orderPar); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 重置部分数据 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        orderService.setParUp(item, orderBase); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        orderService.setParUp(item, orderBase,oads,its); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return orderBase; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 |