张天森
2022-10-18 baa1e7c2a139cebc395b819360f7cbc2b14a1771
三说会堂事件操作权限处理
7个文件已修改
22 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSanshuoExpertDao.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEventTransferRecord.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSanShuoExpertService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoExpertDao.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java
@@ -82,9 +82,10 @@
    @GetMapping("/backstageList")
    public R backList(@RequestParam(value = "keyWord",required = false) String keyWord,
                      @RequestParam(value = "page",required = false)Integer page,
                      @RequestParam(value = "size",required = false)Integer size){
                      @RequestParam(value = "size",required = false)Integer size,
                      @RequestParam(value = "level",required = false)Integer level){
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        return comSanShuoExpertService.expertPage(keyWord,page,size,loginUserInfo);
        return comSanShuoExpertService.expertPage(keyWord,page,size,loginUserInfo,level);
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComSanshuoExpertDao.java
@@ -28,7 +28,7 @@
     * @param id 社区或街道或业务中心id
     * @return 处理结果
     * */
    IPage<ComSanshuoExpertVO> expertPage(Page page, @Param("keyWord")String keyWord, @Param("range") Integer range, @Param("id")Long id);
    IPage<ComSanshuoExpertVO> expertPage(Page page, @Param("keyWord")String keyWord, @Param("range") Integer range, @Param("id")Long id,@Param("level")Integer level);
    /**
     * 专家风采列表
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComEventTransferRecord.java
@@ -65,7 +65,7 @@
    private String processResultData;
    /**处理时间*/
    @ApiModelProperty(name = "processDate", value = "处理时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    private Date processDate;
    /**(1、行业分中心2、社区3、是街道4、区)下的处理人ID*/
    @ApiModelProperty(name = "processBy", value = "(1、行业分中心2、社区3、是街道4、区)下的处理人ID")
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComSanShuoExpertService.java
@@ -23,7 +23,7 @@
     * @param size
     * @return 处理结果
     * */
    R expertPage(String keyWord, Integer page, Integer size, LoginUserInfoVO loginUserInfo);
    R expertPage(String keyWord, Integer page, Integer size, LoginUserInfoVO loginUserInfo,Integer level);
    /**
     * 专家风采列表
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java
@@ -794,15 +794,17 @@
        comEventDetailVO.setImages(comEventRequestImageVO);
        map.put("specter", specter);
        map.put("eventDetail", comEventDetailVO);
        List<ComEventTransferRecord> archiveLog=new ArrayList<>();
        List<ComEventTransferRecord> transferRecord = comEventTransferRecordService.list(new QueryWrapper<ComEventTransferRecord>().lambda().eq(ComEventTransferRecord::getEventId, id).orderByDesc(ComEventTransferRecord::getCreateAt));
        transferRecord.forEach(comEventTransferRecord -> {
            List<ComEventResource> list = comEventResourceService.list(new QueryWrapper<ComEventResource>().lambda().eq(ComEventResource::getRefId, comEvent.getId()).notIn(ComEventResource::getStatus,(1)).eq(ComEventResource::getTransferId, comEventTransferRecord.getId()));
            List<ComEventRequestImageVO> ImageVO = CopyUtil.deepCopyListObject(list, ComEventRequestImageVO.class);
            comEventTransferRecord.setImages(ImageVO);
            if (comEventTransferRecord.getEventStatus().equals(7)){
                map.put("archiveLog", comEventTransferRecord);
                archiveLog.add(comEventTransferRecord);
            }
        });
        map.put("archiveLog", archiveLog);
        //迭代器迭代删除归档记录
        Iterator<ComEventTransferRecord> iterator = transferRecord.iterator();
        while (iterator.hasNext()){
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java
@@ -148,7 +148,7 @@
     * @return 处理结果
     * */
    @Override
    public R expertPage(String keyWord, Integer page, Integer size, LoginUserInfoVO loginUserInfo) {
    public R expertPage(String keyWord, Integer page, Integer size, LoginUserInfoVO loginUserInfo,Integer level) {
        //range:1.三说会堂下属,2业务中心下属,3街道下属,4社区下属
        //id:社区或街道或业务中心id
        //账号级别
@@ -174,7 +174,7 @@
            id=null;
            range=null;
        }
        return R.ok(comSanshuoExpertDao.expertPage(new Page(page,size),keyWord,range,id));
        return R.ok(comSanshuoExpertDao.expertPage(new Page(page,size),keyWord,range,id,level));
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoExpertDao.xml
@@ -64,6 +64,9 @@
                  AND industry_center_id=#{id}
                </if>
            </if>
            <if test="level != null ">
                AND level=#{level}
            </if>
    </select>
    <select id="selectExpertIndustry" resultType="com.panzhihua.common.model.vos.sanshuo.ExpertShowVO">
        select  count(t.id) as 'count',t1.name,t1.id from com_sanshuo_expert t