springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventPageRequestVO.java
@@ -49,8 +49,16 @@ private Long createBy; private Long pageNo; private Long pageSize; @ApiModelProperty("搜索关键字") private String keyword; @ApiModelProperty(value = "查看类型1用户查看自己的调解事件申请2专家查看自己受理的调解事件") private Integer userType; @ApiModelProperty("appId") private String appId; @ApiModelProperty("开始时间") private String startTime; @ApiModelProperty("结束时间") private String endTime; private Integer level; private Long searchId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/sanshuo/ComEventVO.java
@@ -155,6 +155,44 @@ private Integer userType; private Integer usertype; private String appId; @ApiModelProperty("开始时间") private String startTime; @ApiModelProperty("结束时间") private String endTime; private Integer level; private Long searchId; public String getStartTime() { return startTime; } public void setStartTime(String startTime) { this.startTime = startTime; } public String getEndTime() { return endTime; } public void setEndTime(String endTime) { this.endTime = endTime; } public Integer getLevel() { return level; } public void setLevel(Integer level) { this.level = level; } public Long getSearchId() { return searchId; } public void setSearchId(Long searchId) { this.searchId = searchId; } public String getAppId() { return appId; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunitySanShuoService.java
@@ -182,4 +182,10 @@ */ @GetMapping("/status/calculate") R calculate(); /** * 事件范围筛选列表 * */ @GetMapping("/rangeList") R eventRangeList(); } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSanShuoEventController.java
@@ -246,4 +246,11 @@ } @ApiOperation("时间筛选范围列表") @GetMapping("/rangeList") public R rangeList(){ return comEventService.eventRangeList(); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java
@@ -14,6 +14,7 @@ import com.panzhihua.common.utlis.CopyUtil; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_community.entity.ComEvent; import com.panzhihua.service_community.service.ComSanShuoExpertService; import com.panzhihua.service_community.service.IComEventService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -50,6 +51,8 @@ private IComEventService comEventService; @Resource private UserService userService; @Resource private ComSanShuoExpertService comSanShuoExpertService; /** @@ -368,4 +371,12 @@ return comEventService.listCommunityScreen(); } /** * 获取事件范围筛选列表 * */ @GetMapping("/rangeList") public R rangeList(){ return comSanShuoExpertService.rangeList(); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEvent.java
@@ -215,5 +215,15 @@ @TableField(exist = false) private Integer changeExpert; private String appId; @TableField(exist = false) @ApiModelProperty("开始时间") private String startTime; @TableField(exist = false) @ApiModelProperty("结束时间") private String endTime; @TableField(exist = false) private Integer level; @TableField(exist = false) private Long searchId; } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSanShuoExpertService.java
@@ -55,4 +55,9 @@ * 新增专家后台列表 * */ R backstageList(Integer level,LoginUserInfoVO loginUserInfoVO,Integer page,Integer size,String keyWord); /** * 事件范围筛选列表 * */ R rangeList(); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
@@ -450,5 +450,33 @@ return null; } @Override public R rangeList() { List<ExpertRangeVO> list=new ArrayList<>(); for (int i = 1; i < 5; i++) { ExpertRangeVO vo=new ExpertRangeVO(); vo.setLevel(i); if (i==2){ //设置行业分中心为childList vo.setId(2L); vo.setChildList(comSanshuoIndustryCenterDao.indstryList()); vo.setName("行业分中心"); }else if (i==3){ vo.setId(3L); vo.setChildList(comSanshuoIndustryCenterDao.streetList()); vo.setName("街道调解站"); }else if (i==4){ vo.setId(4L); vo.setChildList(comSanshuoIndustryCenterDao.communityList()); vo.setName("社区调解站"); }else if(i==1){ vo.setId(1L); vo.setName("三说会堂"); } list.add(vo); } return R.ok(list); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml
@@ -59,7 +59,10 @@ 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}) AND ( order_sn like concat ('%',#{comEvent.keyword},'%') or request_user_tel like concat ('%',#{comEvent.keyword},'%') or current_org_name like concat ('%',#{comEvent.keyword},'%')) </if> <if test="comEvent.startTime != null and comEvent.startTime != ''"> AND create_at between DATA_FORMAT(#{comEvent.startTime},'%Y-%m-%d 00:00:00') and DATA_FORMAT(#{comEvent.endTime},'%Y-%m-%d 00:00:00') </if> <if test="comEvent.createBy != null and comEvent.createBy!=''" > AND create_by = #{comEvent.createBy} @@ -97,6 +100,22 @@ #{id} </foreach> </if> <if test="comEvent.level != null and comEvent.level != ''"> <if test="comEvent.searchId != null and comEvent.searchId != ''"> <if test="comEvent.level == 1"> AND type=4 </if> <if test="comEvent.level == 2"> AND type=1 AND center_id=#{comEvent.searchId} </if> <if test="comEvent.level == 3"> AND type=3 AND request_user_community in (select community_id from com_act where street_id=#{comEvent.searchId}) </if> <if test="comEvent.level == 4"> AND type=2 AND request_user_community=#{comEvent.searchId} </if> </if> </if> </where> order by create_at desc </select>
