| 
					
				 | 
			
			
				@@ -303,7 +303,7 @@ public class RepairBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 oldOrder.getOrderStatus().equals(GDOrderStatusEnum.REPAIR_STATUS_G4.getCode())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // 大类存在,且相同 非商用 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (StringUtils.isNotEmpty(oldOrder.getMainId()) && StringUtils.isNotEmpty(String.valueOf(item.getSpid())) && 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    !oldOrder.getMainId().equals(sysDictRefDLMap.get(String.valueOf(item.getSpid())).get(0).getDictCode()) && 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    !oldOrder.getMainId().equals(item.getSpid()) && 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     (!item.getSpid().equals(DictTypeEnum.DICT_TYPE_SY_102.getCode())) && 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     (!item.getSpid().equals(DictTypeEnum.DICT_TYPE_SY_109.getCode())) ){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 List<OrderRepairOperatingLog> orlog = orderRepairOperatingLogService.lambdaQuery() 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -518,7 +518,7 @@ public class RepairBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // op.setMainId(sysDictRefDLMap.get(String.valueOf(rec.getSpid())).get(0).getDictCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (StringUtils.isNotEmpty(oldOrder.getMainId()) && StringUtils.isNotEmpty(String.valueOf(item.getSpid())) && 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                !oldOrder.getMainId().equals(sysDictRefDLMap.get(String.valueOf(item.getSpid())).get(0).getDictCode())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                !oldOrder.getMainId().equals(item.getSpid())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             flag = Boolean.TRUE; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return flag; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1257,22 +1257,22 @@ public class RepairBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         or.setYhif(item.getYhif()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         or.setTsdengji(item.getTsdengji()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 需求大类 未找到放原有的值 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if (StringUtils.isNotEmpty(sysDictRefXLMapXq.get(String.valueOf(item.getSpid())).get(0).getDictCode())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        or.setDemandTypeId(String.valueOf(item.getSpid())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        or.setDemandTypeName(item.getSpmc()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (sysDictRefXLMapXq.containsKey(String.valueOf(item.getSpid()))){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             or.setDemandTypeId(sysDictRefXLMapXq.get(String.valueOf(item.getSpid())).get(0).getDictCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             or.setDemandTypeName(sysDictRefXLMapXq.get(String.valueOf(item.getSpid())).get(0).getDictValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            or.setDemandTypeId(String.valueOf(item.getSpid())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            or.setDemandTypeName(item.getSpmc()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 需求小类 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if (!item.getXqxiaolei().equals(0L)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            or.setDemandSmallTypeId(sysDictRefXLMapXq.get(String.valueOf(item.getXqxiaolei())).get(0).getDictCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            or.setDemandSmallTypeName(sysDictRefXLMapXq.get(String.valueOf(item.getXqxiaolei())).get(0).getDictValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        or.setDemandSmallTypeId(""); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        or.setDemandSmallTypeName(""); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (!item.getXqxiaolei().equals(0L) && sysDictRefXLMapXq.containsKey(item.getXqxiaolei())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            or.setDemandSmallTypeId(sysDictRefXLMapXq.get(item.getXqxiaolei()).get(0).getDictCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            or.setDemandSmallTypeName(sysDictRefXLMapXq.get(item.getXqxiaolei()).get(0).getDictValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            or.setDemandSmallTypeId(""); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            or.setDemandSmallTypeName(""); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         or.setExtendField1(item.getExtjson1()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         or.setExtendField2(item.getExtjson2()); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1321,14 +1321,17 @@ public class RepairBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             op.setPgguid(item.getPgguid()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             op.setMainId(order.getMainId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             op.setMainName(order.getMainName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            op.setMainId(sysDictRefDLMap.get(String.valueOf(rec.getSpid())).get(0).getDictCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            op.setMainName(sysDictRefDLMap.get(String.valueOf(rec.getSpid())).get(0).getDictValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (!rec.getXlid().equals(0L)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                op.setSmallId(sysDictRefXLMap.get(String.valueOf(rec.getXlid())).get(0).getDictCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                op.setSmallName(sysDictRefXLMap.get(String.valueOf(rec.getXlid())).get(0).getDictValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                op.setSmallId(String.valueOf(rec.getXlid())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                op.setSmallName(rec.getXlmc()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (sysDictRefDLMap.containsKey(rec.getSpid())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                op.setMainId(sysDictRefDLMap.get(rec.getSpid()).get(0).getDictCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                op.setMainName(sysDictRefDLMap.get(rec.getSpid()).get(0).getDictValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            op.setSmallId(rec.getXlid()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            op.setSmallName(rec.getXlmc()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (!rec.getXlid().equals(0L) && sysDictRefXLMap.containsKey(rec.getXlid())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                op.setSmallId(sysDictRefXLMap.get(rec.getXlid()).get(0).getDictCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                op.setSmallName(sysDictRefXLMap.get(rec.getXlid()).get(0).getDictValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (!rec.getXiid().equals("0") && sysDictRefXiLieMap.containsKey(rec.getXiid())){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1435,7 +1438,11 @@ public class RepairBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @NotNull 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    private OrderProduct getOrderProduct(ItfTblAssignDownload item, OrderBase order, Map<String, List<SysDictRef>> sysDictRefDLMap, Map<String, List<SysDictRef>> sysDictRefXLMap, Map<String, List<SysDictRef>> sysDictRefXiLieMap, ItfTblAssignMxDownload rec, OrderPar mxreq) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    private OrderProduct getOrderProduct(ItfTblAssignDownload item, OrderBase order, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                         Map<String, List<SysDictRef>> sysDictRefDLMap, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                         Map<String, List<SysDictRef>> sysDictRefXLMap, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                         Map<String, List<SysDictRef>> sysDictRefXiLieMap, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                         ItfTblAssignMxDownload rec, OrderPar mxreq) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         WebsitFWS websitFWS = new WebsitFWS(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         OrderProduct op = repairMxDownloadMapper.getMx(mxreq); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1448,24 +1455,29 @@ public class RepairBusiness { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         op.setServiceWebsit(websitFWS.getWebsitId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         op.setOrderBaseId(order.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         op.setPgguid(item.getPgguid()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        op.setMainId(sysDictRefDLMap.get(String.valueOf(rec.getSpid())).get(0).getDictCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        op.setMainName(sysDictRefDLMap.get(String.valueOf(rec.getSpid())).get(0).getDictValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if (!rec.getXlid().equals(0L)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            op.setSmallId(sysDictRefXLMap.get(String.valueOf(rec.getXlid())).get(0).getDictCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            op.setSmallName(sysDictRefXLMap.get(String.valueOf(rec.getXlid())).get(0).getDictValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            op.setSmallId(String.valueOf(rec.getXlid())); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            op.setSmallName(rec.getXlmc()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        op.setMainId(rec.getSpid()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        op.setMainName(rec.getSpmc()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (sysDictRefDLMap.containsKey(rec.getSpid())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            op.setMainId(sysDictRefDLMap.get(rec.getSpid()).get(0).getDictCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            op.setMainName(sysDictRefDLMap.get(rec.getSpid()).get(0).getDictValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        op.setSmallId(rec.getXlid()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        op.setSmallName(rec.getXlmc()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (!rec.getXlid().equals(0L) && sysDictRefXLMap.containsKey(rec.getXlid())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            op.setSmallId(sysDictRefXLMap.get(rec.getXlid()).get(0).getDictCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            op.setSmallName(sysDictRefXLMap.get(rec.getXlid()).get(0).getDictValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        op.setSeriesId(rec.getXiid()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        op.setSeriesName(rec.getXimc()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (!rec.getXiid().equals("0") && sysDictRefXiLieMap.containsKey(rec.getXiid())){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             op.setSeriesId(sysDictRefXiLieMap.get(rec.getXiid()).get(0).getDictCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             op.setSeriesName(sysDictRefXiLieMap.get(rec.getXiid()).get(0).getDictValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            op.setSeriesId(rec.getXiid()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            op.setSeriesName(rec.getXimc()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return op; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |