| 
					
				 | 
			
			
				@@ -334,19 +334,25 @@ public class TCntrnoServiceImpl implements ITCntrnoService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public List<String> getTCntrnoChange(TCntrno tCntrno) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<String> key = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         key.add("地点"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        List<String> list = tCntrMapper.selectTCntrFNo(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        /*List<String> list = tCntrMapper.selectTCntrFNo(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         List<String> mapList = new ArrayList<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (CollectionUtils.isNotEmpty(list)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             for (String s : list) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                mapList.add(s); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 mapList.add(s+"空"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 mapList.add(s+"重"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-               /* mapList.add(s+"好"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                mapList.add(s+"坏");*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+               *//* mapList.add(s+"好"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                mapList.add(s+"坏");*//* 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         list.addAll(mapList); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        Collections.sort(list); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        key.addAll(list); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        Collections.sort(list);*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        key.add("20GP"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        key.add("20HC"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        key.add("20GP空"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        key.add("20GP重"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        key.add("20HC空"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        key.add("20HC重"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return key; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |