springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/sanshuo/ComSanshuoExpertDTO.java
@@ -134,6 +134,9 @@ private String unit; private String unitId; @ApiModelProperty("appId，区分西区或花城") private String appId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComSanRequestVO.java
@@ -43,4 +43,5 @@ /**调解上传图片地址列表，逗号进行分割*/ @ApiModelProperty(name = "images", value = "调解上传图片地址列表，逗号进行分割") private List<ComEventRequestImageVO> images; private String appId; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
@@ -66,6 +66,7 @@ comEvent.setRequestUserId(loginUser.getUserId()); comEvent.setRequestUserName(loginUser.getName()); comEvent.setRequestUserTel(loginUser.getPhone()); comEvent.setAppId(loginUser.getAppId()); return comEventService.insertComEvent(comEvent); }
@@ -51,6 +51,7 @@ @PostMapping public R add(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO){ comSanshuoExpertDTO.setCreateBy(this.getLoginUserInfo().getName()); comSanshuoExpertDTO.setAppId(getLoginUserInfo().getAppId()); return comSanShuoExpertService.addOrUpdateExpert(comSanshuoExpertDTO); }
@@ -29,7 +29,7 @@ * @param id 社区或街道或业务中心id * @return 处理结果 * */ IPage<ComSanshuoExpertVO> expertPage(Page page, @Param("keyWord")String keyWord, @Param("range") Integer range, @Param("id")Long id,@Param("level")Integer level); IPage<ComSanshuoExpertVO> expertPage(Page page, @Param("keyWord")String keyWord, @Param("range") Integer range, @Param("id")Long id,@Param("level")Integer level,@Param("appId")String appId); /** * 专家风采列表 @@ -70,7 +70,7 @@ Integer selectExpertVoList(); IPage<ComSanshuoExpertVO> expertList(Page page, @Param("level") Integer level, @Param("id") Long id); IPage<ComSanshuoExpertVO> expertList(Page page, @Param("level") Integer level, @Param("id") Long id,@Param("appId")String appId); }
@@ -214,5 +214,6 @@ //更换专家 @TableField(exist = false) private Integer changeExpert; private String appId; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComSanshuoExpert.java
@@ -129,8 +129,7 @@ @TableField(exist = false) private BigDecimal rate; private Integer added; private String appId; @TableField(exist = false) private static final long serialVersionUID = 1L;
@@ -97,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)){ //个人账号权限 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java
@@ -60,6 +60,9 @@ if (isNotBlank(comPropertyVO.getAccount())) { AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO(); administratorsUserVO.setType(3); if (comPropertyVO.getCommunityId().equals(10172)){ administratorsUserVO.setType(20); } administratorsUserVO.setAccount(comPropertyVO.getAccount()); administratorsUserVO.setPassword(comPropertyVO.getPassword()); administratorsUserVO.setRoleId(comPropertyVO.getRoleId()); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
@@ -196,7 +196,7 @@ range=1; } log.info(""); IPage<ComSanshuoExpertVO> comSanshuoExpertVOIPage = comSanshuoExpertDao.expertPage(new Page(page, size), keyWord, range, id, level); IPage<ComSanshuoExpertVO> comSanshuoExpertVOIPage = comSanshuoExpertDao.expertPage(new Page(page, size), keyWord, range, id, level,loginUserInfo.getAppId()); for (ComSanshuoExpertVO record : comSanshuoExpertVOIPage.getRecords()) { //获取调解次数和成功率 record.setCount(comEventMapper.selectCount(new QueryWrapper<ComEvent>().lambda().eq(ComEvent::getSpecialistId, record.getId()))); springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml
@@ -57,6 +57,7 @@ FROM com_sanshuo_event_info <where> event_process_status !=9 AND app_id=#{comEvent.appId} <if test="comEvent.keyword != null and comEvent.keyword!=''" > AND ( order_sn = #{comEvent.keyword} or request_user_tel =#{comEvent.keyword} or current_org_name=#{comEvent.keyword}) </if> @@ -104,6 +105,7 @@ FROM com_sanshuo_event_info <where> event_process_status !=9 AND app_id=#{comEvent.appId} <if test="eventIds != null"> AND id in <foreach collection="eventIds" item="id" separator="," open="(" close=")"> @@ -224,6 +226,7 @@ (SELECT count(id) FROM com_sanshuo_event_info where event_process_status in (2,3,5,6) AND user_event_status not in(3,4) AND app_id='wx0cef797390444b75' <if test="dto.type == 2"> AND current_process_type=1 <if test="dto.id != null"> @@ -249,6 +252,7 @@ (SELECT count(id) FROM com_sanshuo_event_info where event_process_status = 5 AND user_event_status not in(3,4) AND app_id='wx0cef797390444b75' <if test="dto.type == 2"> AND current_process_type=1 <if test="dto.id != null"> @@ -273,6 +277,7 @@ (SELECT count(id) FROM com_sanshuo_event_info where event_process_status = 6 AND user_event_status not in(3) AND app_id='wx0cef797390444b75' <if test="dto.type == 2"> AND current_process_type=1 <if test="dto.id != null"> @@ -300,6 +305,7 @@ where t.event_process_status in (6,7) AND t.user_event_status not in(3,4) AND t1.event_status=7 AND app_id='wx0cef797390444b75' <if test="dto.type == 2"> AND t.current_process_type=1 <if test="dto.id != null"> @@ -324,6 +330,7 @@ (select count(id) FROM com_sanshuo_event_info where event_result=2 AND user_event_status not in(3,4) AND app_id='wx0cef797390444b75' <if test="dto.type == 2"> AND current_process_type=1 <if test="dto.id != null"> @@ -348,6 +355,7 @@ (select count(id) FROM com_sanshuo_event_info where event_result=1 AND user_event_status not in(3,4) AND app_id='wx0cef797390444b75' <if test="dto.type == 2"> AND current_process_type=1 <if test="dto.id != null"> @@ -372,6 +380,7 @@ (select count(id) from com_sanshuo_event_info WHERE create_at BETWEEN DATE_FORMAT(#{beginDate}, '%Y-%m-%d 00:00:00') AND DATE_FORMAT(#{endDate}, '%Y-%m-%d 23:59:59') AND event_process_status not in (8) AND app_id='wx0cef797390444b75' <if test="dto.type == 2"> AND current_process_type=1 <if test="dto.id != null"> @@ -397,6 +406,7 @@ create_at BETWEEN DATE_FORMAT(#{beginDate}, '%Y-%m-%d 00:00:00') AND DATE_FORMAT(#{endDate}, '%Y-%m-%d 23:59:59') AND event_process_status not in (8) AND event_process_status = 6 AND app_id='wx0cef797390444b75' <if test="dto.type == 2"> AND current_process_type=1 <if test="dto.id != null"> @@ -424,6 +434,7 @@ SELECT COUNT(id) FROM com_sanshuo_event_info WHERE create_at BETWEEN DATE_FORMAT(#{beginDate}, '%Y-%m-%d 00:00:00') AND DATE_FORMAT(#{endDate}, '%Y-%m-%d 23:59:59') AND event_process_status not in (9) AND app_id='wx0cef797390444b75' <if test="dto.type == 2"> AND current_process_type=1 <if test="dto.id != null"> @@ -450,6 +461,7 @@ SELECT COUNT(id) FROM com_sanshuo_event_info WHERE create_at BETWEEN DATE_FORMAT(#{beginDate}, '%Y-%m-%d 00:00:00') AND DATE_FORMAT(#{endDate}, '%Y-%m-%d 23:59:59') AND event_process_status=6 AND app_id='wx0cef797390444b75' <if test="dto.type == 2"> AND current_process_type=1 <if test="dto.id != null"> @@ -475,17 +487,19 @@ <select id="eventRate" resultType="com.panzhihua.common.model.vos.sanshuo.EventRateVO"> select count(id) as count,current_process_type from com_sanshuo_event_info where event_process_status not in(7,8,9) AND app_id='wx0cef797390444b75' group by current_process_type having current_process_type <>5 </select> <select id="expertRate" resultType="com.panzhihua.common.model.vos.sanshuo.EventRateVO"> select count(id) as count,level as type from com_sanshuo_expert select count(id) as count,level as type from com_sanshuo_expert where app_id='wx0cef797390444b75' group by level </select> <select id="mediateTypeRate" resultType="com.panzhihua.common.model.vos.sanshuo.EventRateVO"> select count(t.id) as count,t1.name from com_sanshuo_event_info t left join com_mediate_type t1 on t.event_category=t1.id where t.event_process_status not in(7,8,9) AND t.app_id='wx0cef797390444b75' group by t.event_category </select>
@@ -48,6 +48,7 @@ introduction,street_id,industry_center_id, unit_id,unit from com_sanshuo_expert where del_flag=1 AND app_id=#{appId} <if test="keyWord != null and keyWord != ''"> AND unit like concat('%',#{keyWord},'%') OR name like concat('%',#{keyWord},'%') @@ -157,6 +158,7 @@ introduction,street_id,industry_center_id, unit_id,unit from com_sanshuo_expert where del_flag=1 AND app_id=#{appId} <if test="level != null"> <if test="level == 2"> AND level = 2 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -1354,6 +1354,9 @@ this.putMenuRole(menuRoleVO); } } if (administratorsUserVO.getType().equals(20)){ roleId=1559112102373756548L; } SysRoleDO roleDO = roleDAO.selectById(roleId); if (ObjectUtils.isEmpty(roleDO)) { return R.fail("角色不存在");
