| 
						
						
							
								
							
						
						
					 | 
					 | 
					@ -697,10 +697,7 @@ public class IdentifyBookServiceImpl extends ServiceImpl<IdentifyBookMapper, Ide | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					    @Override | 
					 | 
					 | 
					 | 
					    @Override | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					    public String mergeWord(String entrustId) throws Exception { | 
					 | 
					 | 
					 | 
					    public String mergeWord(String entrustId) throws Exception { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        String reportPath = "document/appraisalReport/" + entrustId + "/" + "鉴定报告.pdf"; | 
					 | 
					 | 
					 | 
					        String reportPath = "document/appraisalReport/" + entrustId + "/" + "鉴定报告.pdf"; | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        boolean ret = ossFile.objectExist(reportPath); | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        if (ret) { | 
					 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					            return reportPath; | 
					 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        } | 
					 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        Entrustment entrustment = entrustmentService.getById(entrustId); | 
					 | 
					 | 
					 | 
					        Entrustment entrustment = entrustmentService.getById(entrustId); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        String synEntrustId = entrustment.getSynEntrustId(); | 
					 | 
					 | 
					 | 
					        String synEntrustId = entrustment.getSynEntrustId(); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					 | 
					
  |