| 
						
						
							
								
							
						
						
					 | 
					@ -725,7 +725,8 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        //3.3 项目机关历时关系 project_org_relation 更新原来的
 | 
					 | 
					 | 
					        //3.3 项目机关历时关系 project_org_relation 更新原来的
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        ProjectOrgRelationEntity orientRelation = relationDao.selectByProjectStaffId(staffEntity.getId()); | 
					 | 
					 | 
					        ProjectOrgRelationEntity orientRelation = relationDao.selectByProjectStaffId(staffEntity.getId()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        if(null == orientRelation){ | 
					 | 
					 | 
					        if(null == orientRelation){ | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					            log.error("com.epmet.service.impl.ProjectProcessServiceImpl.transfer,找不到项目节点机关历时记录,参数:{}",JSON.toJSONString(formDTO)); | 
					 | 
					 | 
					            log.error("com.epmet.service.impl.ProjectProcessServiceImpl.transfer,project_org_relation.PROJECT_STAFF_ID:{},找不到项目节点机关历时记录,参数:{}", staffEntity.getId(), JSON.toJSONString(formDTO)); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getMsg()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        Date current = new Date(); | 
					 | 
					 | 
					        Date current = new Date(); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        WorkMinuteFormDTO timeParam = new WorkMinuteFormDTO(); | 
					 | 
					 | 
					        WorkMinuteFormDTO timeParam = new WorkMinuteFormDTO(); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -772,7 +773,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        //5:调用epmet-message服务,给项目流转过程中的工作人员发送订阅的微信消息
 | 
					 | 
					 | 
					        //5:调用epmet-message服务,给项目流转过程中的工作人员发送订阅的微信消息
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        if (!transferWxmpMessage(formDTO).success()) { | 
					 | 
					 | 
					        if (!transferWxmpMessage(formDTO).success()) { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					            logger.error("项目流转,推送微信订阅消息失败"); | 
					 | 
					 | 
					            logger.warn("项目流转,推送微信订阅消息失败"); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					            //throw new RenException(ProjectConstant.SAVE_WXMP_MSG_EXCEPTION);
 | 
					 | 
					 | 
					            //throw new RenException(ProjectConstant.SAVE_WXMP_MSG_EXCEPTION);
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -793,7 +794,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        }); | 
					 | 
					 | 
					        }); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        Result result = epmetMessageOpenFeignClient.projectSendMsg(smsList); | 
					 | 
					 | 
					        Result result = epmetMessageOpenFeignClient.projectSendMsg(smsList); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        if (!result.success()) { | 
					 | 
					 | 
					        if (!result.success()) { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					            logger.error("项目流转,发送手机短信失败" + JSON.toJSONString(result)); | 
					 | 
					 | 
					            logger.warn("项目流转,发送手机短信失败" + JSON.toJSONString(result)); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        //项目实时统计消息
 | 
					 | 
					 | 
					        //项目实时统计消息
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -809,7 +810,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                loginUserUtil.getLoginUserClient()); | 
					 | 
					 | 
					                loginUserUtil.getLoginUserClient()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        boolean msgResult = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendProjectChangedMqMsg(msg); | 
					 | 
					 | 
					        boolean msgResult = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendProjectChangedMqMsg(msg); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        if (!msgResult) { | 
					 | 
					 | 
					        if (!msgResult) { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					            log.error("项目实时统计消息发送失败"); | 
					 | 
					 | 
					            log.warn("项目实时统计消息发送失败"); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        // 数据上链
 | 
					 | 
					 | 
					        // 数据上链
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -817,7 +818,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            blockChainUploadService.send2BlockChain(null, processEntity, entityList, formDTO.getProjectStaffId()); | 
					 | 
					 | 
					            blockChainUploadService.send2BlockChain(null, processEntity, entityList, formDTO.getProjectStaffId()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					        } catch (Exception e) { | 
					 | 
					 | 
					        } catch (Exception e) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e); | 
					 | 
					 | 
					            String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e); | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					            log.error("【项目流转】上链失败,错误信息:{}", errorMsg); | 
					 | 
					 | 
					            log.warn("【项目流转】上链失败,错误信息:{}", errorMsg); | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					        } | 
					 | 
					 | 
					        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					    } | 
					 | 
					 | 
					    } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |