springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/UserConstants.java
@@ -16,4 +16,6 @@ public static final String NEWS_ID = "news_media_id:"; public static final String NEWS_LIST = "news_list:"; public static final String SANSHUO_INDUSTRY_CENTER_ROLE="1559112102373756911"; public static final String SANSHUO_EXPERT_ROLE="1559112102373756955"; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComSanshuoExpertVO.java
@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; import java.util.Date; @Data @@ -130,4 +131,12 @@ @ApiModelProperty("办结事项") private String solveEvents; @ApiModelProperty("调解次数") private Integer count; @ApiModelProperty("调解成功率") private BigDecimal rate; }
@@ -152,7 +152,6 @@ public R indexData(@RequestBody IndexDateDTO indexDateDTO){ return communityService.sanshuoIndexDate(indexDateDTO); } @GetMapping("/indexData/event") @ApiOperation(value = "事件统计饼图",response = EventRateVO.class) public R eventIndexData(@RequestParam("type") @ApiParam("1受理级别2专家级别3时间类型分类") Integer type){ springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java
@@ -51,6 +51,7 @@ * */ @GetMapping("/appletsList") public R appList(){ comSanShuoExpertService.selectExpertList(); return R.ok(comSanShuoExpertService.list(new QueryWrapper<ComSanshuoExpert>().eq("status",1).eq("del_flag",1))); } @@ -72,7 +73,6 @@ public R backList(@RequestParam(value = "keyWord",required = false) String keyWord, @RequestParam(value = "page",required = false)Integer page, @RequestParam(value = "size",required = false)Integer size){ //TODO 获取当前账号级别确定范围 LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); return comSanShuoExpertService.expertPage(keyWord,page,size,loginUserInfo); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSanshuoExpertDao.java
@@ -50,9 +50,11 @@ * */ List<ExpertShowVO> selectExpertCommunity(); /** * 获取范围内的 * 小程序获取专家列表 * */ List<ComSanshuoExpert> selectExpertList(); }
@@ -6,6 +6,7 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; /** @@ -117,6 +118,12 @@ private String unit; @TableField(exist = false) private Integer count; @TableField(exist = false) private BigDecimal rate; @TableField(exist = false) private static final long serialVersionUID = 1L; @Override springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSanShuoExpertService.java
@@ -35,4 +35,9 @@ * 专家级别与单位范围 * */ R expertRange(LoginUserInfoVO loginUserInfo); /** * 小程序获取专家列表 * */ R selectExpertList(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
@@ -1,7 +1,9 @@ package com.panzhihua.service_community.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.crypto.digest.MD5; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.dtos.community.sanshuo.ComSanshuoExpertDTO; @@ -14,6 +16,8 @@ import com.panzhihua.common.utlis.Snowflake; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_community.dao.*; import com.panzhihua.service_community.entity.ComEvent; import com.panzhihua.service_community.entity.ComSanshuoEvent; import com.panzhihua.service_community.entity.ComSanshuoExpert; import com.panzhihua.service_community.model.dos.ComActDO; import com.panzhihua.service_community.model.dos.ComStreetDO; @@ -24,6 +28,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -43,6 +48,8 @@ private ComStreetDAO comStreetDAO; @Resource private ComActDAO comActDAO; @Resource private ComEventMapper comEventMapper; /** @@ -219,4 +226,33 @@ } /** * 小程序获取专家列表 * */ @Override public R selectExpertList() { List<ComSanshuoExpert> comSanshuoExperts = comSanshuoExpertDao.selectList(new QueryWrapper<ComSanshuoExpert>().lambda().eq(ComSanshuoExpert::getStatus, 1).eq(ComSanshuoExpert::getDelFlag, 1)); //设置成功率 for (ComSanshuoExpert comSanshuoExpert : comSanshuoExperts) { //查询成功率 Integer count = comEventMapper.selectCount(new QueryWrapper<ComEvent>().lambda().eq(ComEvent::getSpecialistId, comSanshuoExpert.getId()).eq(ComEvent::getEventProcessStatus, 6)); Integer successCount = comEventMapper.selectCount(new QueryWrapper<ComEvent>().lambda().eq(ComEvent::getSpecialistId, comSanshuoExpert.getId()).eq(ComEvent::getEventProcessStatus, 6).eq(ComEvent::getEventResult, 2)); comSanshuoExpert.setCount(count); if (nonNull(count) && !count.equals(0)){ comSanshuoExpert.setCount(count); if (nonNull(successCount) && !count.equals(successCount)){ //计算成功率 comSanshuoExpert.setRate(NumberUtil.div(successCount, count,2)); }else { comSanshuoExpert.setRate(new BigDecimal(0)); } }else { comSanshuoExpert.setCount(0); } } return R.ok(comSanshuoExperts); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoExpertDao.xml
@@ -83,4 +83,9 @@ where t.level=4 and t.status=1 and t.del_flag=1 group by t1.name </select> <select id="selectExpertList" resultType="com.panzhihua.service_community.entity.ComSanshuoExpert"> select t.*,count (select id from com_sanshuo_event_info where specialist_id = t.id )from com_sanshuo_expert as t left join com_sanshuo_event_info t1 on t.id=t1.specialist_id where t.status=1 and t.del_flag=1 </select> </mapper> springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -3683,6 +3683,16 @@ sysUserDO.setType(administratorsUserVO.getType()); } userDao.insert(sysUserDO); //分配权限 SysUserRoleDO sysUserRole=new SysUserRoleDO(); sysUserRole.setUserId(sysUserDO.getUserId()); if (sysUserDO.getType().equals(11)){ sysUserRole.setRoleId(Long.parseLong(UserConstants.SANSHUO_EXPERT_ROLE)); }else{ sysUserRole.setRoleId(Long.parseLong(UserConstants.SANSHUO_INDUSTRY_CENTER_ROLE)); } //配置权限 sysUserRoleDAO.insert(sysUserRole); return R.ok(); } return R.fail("账户名已存在");
