| 
						
						
							
								
							
						
						
					 | 
					 | 
					@ -36,7 +36,6 @@ import lombok.extern.slf4j.Slf4j; | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					import org.apache.commons.lang3.math.NumberUtils; | 
					 | 
					 | 
					 | 
					import org.apache.commons.lang3.math.NumberUtils; | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					import org.springblade.core.log.exception.ServiceException; | 
					 | 
					 | 
					 | 
					import org.springblade.core.log.exception.ServiceException; | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					import org.springblade.core.mp.base.BaseServiceImpl; | 
					 | 
					 | 
					 | 
					import org.springblade.core.mp.base.BaseServiceImpl; | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					import org.springblade.core.mp.support.Condition; | 
					 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					import org.springblade.core.secure.utils.AuthUtil; | 
					 | 
					 | 
					 | 
					import org.springblade.core.secure.utils.AuthUtil; | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					import org.springblade.core.tool.api.R; | 
					 | 
					 | 
					 | 
					import org.springblade.core.tool.api.R; | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					import org.springblade.core.tool.support.Kv; | 
					 | 
					 | 
					 | 
					import org.springblade.core.tool.support.Kv; | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					 | 
					@ -116,7 +115,10 @@ public class DefectCheckServiceImpl extends BaseServiceImpl<OperPhenomenonMapper | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					            throw new ServiceException("保存现象失败!"); | 
					 | 
					 | 
					 | 
					            throw new ServiceException("保存现象失败!"); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        } | 
					 | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        // 步骤2.开启缺陷流程
 | 
					 | 
					 | 
					 | 
					        // 步骤2.开启缺陷流程
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        OperPhenomenonEntity operPhenomenon = this.getOne(Condition.getQueryWrapper(entity)); | 
					 | 
					 | 
					 | 
					        OperPhenomenonEntity operPhenomenon = this.getOne(new LambdaQueryWrapper<OperPhenomenonEntity>(){{ | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					            eq(OperPhenomenonEntity::getDefectCode,entity.getDefectCode()); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					            last("limit 1"); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					        }}); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        this.startDefectCheckV2(operPhenomenon); | 
					 | 
					 | 
					 | 
					        this.startDefectCheckV2(operPhenomenon); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        return entity; | 
					 | 
					 | 
					 | 
					        return entity; | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					    } | 
					 | 
					 | 
					 | 
					    } | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					 | 
					@ -162,14 +164,8 @@ public class DefectCheckServiceImpl extends BaseServiceImpl<OperPhenomenonMapper | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					//        if (CollectionUtil.isEmpty(list)) {
 | 
					 | 
					 | 
					 | 
					//        if (CollectionUtil.isEmpty(list)) {
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					//            throw new ServiceException("请先添加甄别缺陷角色用户,再发起现象!");
 | 
					 | 
					 | 
					 | 
					//            throw new ServiceException("请先添加甄别缺陷角色用户,再发起现象!");
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					//        }
 | 
					 | 
					 | 
					 | 
					//        }
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        String userName; | 
					 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        // 现象发起人名字
 | 
					 | 
					 | 
					 | 
					        // 现象发起人名字
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        R<User> userR = userClient.userInfoById(entity.getFinder()); | 
					 | 
					 | 
					 | 
					        String userName = Optional.ofNullable(UserCache.getUser(entity.getFinder()).getName()).orElse(""); | 
				
			
			
				
				
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        if (userR.isSuccess()){ | 
					 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					            userName = userR.getData().getName(); | 
					 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        }else { | 
					 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					            userName=""; | 
					 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        } | 
					 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        // 现象发起来源
 | 
					 | 
					 | 
					 | 
					        // 现象发起来源
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        String sourceName = DictCache.getValue(TreatMethodConstant.SOURCE_CODE_PREFIX, entity.getSourceCode()); | 
					 | 
					 | 
					 | 
					        String sourceName = DictCache.getValue(TreatMethodConstant.SOURCE_CODE_PREFIX, entity.getSourceCode()); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        // 流程名称
 | 
					 | 
					 | 
					 | 
					        // 流程名称
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					 | 
					
  |