java/zhihuishenqu.git

			@@ -41,6 +41,7 @@
			import org.springframework.web.bind.annotation.RequestParam;

			import javax.annotation.Resource;
			import java.math.BigDecimal;
			import java.util.*;

			import static java.util.Objects.isNull;
			@@ -96,6 +97,7 @@
			Boolean isExpertCheck=false;
			Long expertId=null;
			Boolean isStretAccount = isStreetAccount(loginUserInfoVO);
			// comEvent.setAppId(loginUserInfoVO.getAppId());
			if (nonNull(comEvent.getUserType())){
			if (comEvent.getUserType().equals(1)){
			//个人账号权限
			@@ -256,6 +258,7 @@
			comEvent.setArchive(0);
			comEvent.setConciliation(0);
			comEvent.setChangeExpert(0);
			comEvent.setDistribution(0);
			} else if(comEvent.getEventProcessStatus().equals(2)){
			//待分配和待验证状态，可以受理，分配专家
			//关闭调解和归档
			@@ -655,6 +658,9 @@
			}

			public void sendMessage(Long expertId,ComEvent comEvent){
			if (nonNull(comEvent.getRequestUserCommunity()) && comEvent.getRequestUserCommunity().equals(10172)){
			return;
			}
			//获取专家的openId
			ComSanshuoExpert expert = comSanShuoExpertService.getById(expertId);
			SysUser sysUser = sysUserDao.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhone, expert.getPhone()).eq(SysUser::getType, 1).eq(SysUser::getAppId,"wx0cef797390444b75" ));
			@@ -916,6 +922,8 @@
			}
			}



			@Override
			@Transactional(rollbackFor = Exception.class)
			public R acceptRequest(Long id, Long specterId) {
			@@ -1001,6 +1009,12 @@
			}
			}
			log.info("当前userType===="+comEvent.getUserType());
			//comEvent.setAppId(loginUserInfoVO.getAppId());
			R<LoginUserInfoVO> r = userService.detailUser(loginUserInfoVO.getUserId());
			LoginUserInfoVO user = r.getData();
			if (nonNull(user.getAppId())){
			comEvent.setAppId(user.getAppId());
			}
			List<ComEventCalculateVO> calculateList = baseMapper.calculate(comEvent);
			ComEventCalculateVO comEventCalculateVO =new ComEventCalculateVO();
			comEventCalculateVO.setStatus("0");
			@@ -1057,7 +1071,12 @@
			if (nonNull(vo.getSuccess()) && !vo.getSuccess().equals(0)){
			if (nonNull(vo.getAccepted()) && !vo.getAccepted().equals(0)){
			//计算成功率
			vo.setSuccessRate(NumberUtil.div(vo.getSuccess(),vo.getAccepted(),2));
			try {
			vo.setSuccessRate(NumberUtil.div(vo.getSuccess(),vo.getAccepted(),2));
			}catch (NullPointerException e){
			vo.setSuccessRate(new BigDecimal(0));
			}

			}
			}
			vo.setExpert(comSanshuoExpertDao.selectExpertCount(indexDataDTO));