Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-11-23 8f9845717f6989792e2a6003adf5fe12ff0a9540

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

 flower_city/src/main/java/com/dg/core/controller/CommonController.java

@@ -106,6 +106,7 @@
    }



    /**
     * 通用上传请求（单个）
     */

 flower_city/src/main/java/com/dg/core/controller/GuideDoController.java

@@ -50,15 +50,23 @@
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "keyword",required = false) String keyword,
                                          @RequestParam(value = "isDivisionHead",required = false) String isDivisionHead,
                                          @CurrentUser SysUser sysUser)
    {
        Assert.notNull(pageNum, "pageNum can not be empty");
        Assert.notNull(pageSize, "pageSize can not be empty");
        Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,null);

        int num=IUserService.selectNum("2",keyword,ids,null);
        List<SysUser> list ;
        int num;
        if (isDivisionHead!=null&&!isDivisionHead.equals("")){
            list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,isDivisionHead);
            num=IUserService.selectNum("2",keyword,ids,isDivisionHead);
        }
        else{
            list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,null);
            num=IUserService.selectNum("2",keyword,ids,null);
        }
        return getDataTable(list,num);
    }

@@ -72,7 +80,7 @@
    @ApiOperation("新增导办用户接口")
    @PostMapping("/add")
    @Authorization
    public ResultData insertConfig(@RequestBody SysUser config)
    public ResultData insertConfig(@RequestBody SysUser config,@CurrentUser SysUser sysUser)
    {
        Assert.notNull(config, "parameter can not be empty");

@@ -131,6 +139,8 @@
            user.setMattersIds(config.getMattersIds());
            user.setMasterNames(config.getMasterNames());
            user.setMattersNames(config.getMattersNames());
            if (config.getMoreDepartmentIds()!=null&&config.getMoreDepartmentIds().indexOf(",")>0)
                user.setDataPermission(config.getMoreDepartmentIds().substring(config.getMoreDepartmentIds().indexOf(",")+1));
            //提示用户名或密码错误
            return toAjax(IUserService.updateConfig(user));
        }
@@ -143,9 +153,12 @@
        {
            config.setRoleIds("2");
        }
        config.setCreateBy(sysUser.getUserId());
        config.setCreateTime(LocalDateTime.now());
        config.setUpdateTime(LocalDateTime.now());
        config.setUserId(Snowflake.getId()+"");
        if (config.getMoreDepartmentIds()!=null&&config.getMoreDepartmentIds().indexOf(",")>0)
            config.setDataPermission(config.getMoreDepartmentIds().substring(config.getMoreDepartmentIds().indexOf(",")+1));
        config.setIsDivisionHead(config.getIsDivisionHead());
        return toAjax(IUserService.insertConfig(config));
    }
@@ -182,7 +195,11 @@
        //是否是部门领导（1是  2不是）
        if(StringUtils.equals("1",config.getIsDivisionHead()))
        {
            config.setRoleIds("13");
            if (config.getMoreDepartmentIds()!=null&&config.getMoreDepartmentIds().indexOf(",")>0)
                config.setDataPermission(config.getMoreDepartmentIds().substring(config.getMoreDepartmentIds().indexOf(",")+1));
            else
                config.setDataPermission("0");
             config.setRoleIds("13");
        }
        else
        {

 flower_city/src/main/java/com/dg/core/controller/SysSettingsController.java

@@ -44,9 +44,12 @@
    @ApiOperation(value = "修改设置信息",response = AutomessageSysSettings.class)
    @PostMapping("/update")
    @Authorization
    ResultData update(@RequestBody AutomessageSysSettings automessageSysSettings,@CurrentUser SysUser sysUser){
    public  ResultData update(@RequestBody AutomessageSysSettings automessageSysSettings,@CurrentUser SysUser sysUser){
        automessageSysSettings.setUpdateUserId(sysUser.getUserId());
        automessageSysSettings.setUpdateTime(LocalDateTime.now());
        if (automessageSysSettings.getTimeoutRemindNum()>(automessageSysSettings.getTimeoutNotificationNum()*60)){
               return  ResultData.error("系统提醒时间不能大于系统通知时间*60");
        }
        return  sysSettingsService.update(automessageSysSettings);
    }


 flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java

@@ -401,6 +401,7 @@
            throw new RuntimeException(e);
        }
        for (GuideRepairOrder guideRepairOrder : guideRepairOrders) {
            transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getId, guideRepairOrder.getMatterId()));
            SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrder.getGuideUserId()));
            if (sysUser != null) {
                smsUtil.sendSmsOvertime(sysUser.getPhonenumber(), sysUser.getUserName());
@@ -454,12 +455,12 @@
                baseMapper.updateById(guideRepairOrder);
                return ResultData.success("删除评论成功");
            } else {
                ResultData.error("已办结的单据才能进行删除评论操作");
             return   ResultData.error("已办结的单据才能进行删除评论操作");
            }
        } else {
            ResultData.error("只能部门领导和超级管理员才能删除评论");
            return ResultData.error("只能部门领导和超级管理员才能删除评论");
        }
        return  ResultData.error();

    }



 flower_city/src/main/resources/mapper/TransactionEventMapper.xml

@@ -378,7 +378,7 @@


    <select id="queryMatterNameList"  resultMap="TransactionEventEntityResult">
        <include refid="selectTransactionEventEntityVo"/>
       select id,matter_name from  automessage_transaction_event
        <where>
            <if test="matterName != null and matterName != ''">
                AND (matter_name like concat('%', #{matterName}, '%') )
@@ -392,7 +392,7 @@
    </select>

    <select id="queryAssociateNamesList"  resultMap="TransactionEventEntityResult">
        <include refid="selectTransactionEventEntityVo"/>
        select id,matter_name from  automessage_transaction_event
        <where>
            <if test="associateNames != null and associateNames != ''">
                AND (associate_names like concat('%', #{associateNames}, '%') )
@@ -465,7 +465,7 @@
    </select>

    <select id="selectSearchList" resultType="com.dg.core.db.manual.pojo.Search">
        select  id, title, content,classify_id, type,parentClassifyId  from   ( select  id,matter_name title,concat((select classify_name from  automessage_classify_administration
        select   distinct classify_id,  content,type,parentClassifyId  from   ( select  id,matter_name title,concat((select classify_name from  automessage_classify_administration
                                                                                                    where id=(select parent_id from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)),
                                                                                                   '/',(select classify_name from  automessage_classify_administration  where id=automessage_transaction_event.classify_id)) content,
                                                                   classify_id,(select parent_id from automessage_classify_administration  where id=automessage_transaction_event.classify_id) parentClassifyId,

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComSanShuoApi.java

@@ -63,4 +63,11 @@
                            @RequestParam(value = "id",required = false) @ApiParam("id，level=1不传2行业分中心id 3街道id 4社区id")Long id){
        return communityService.expertShowList(level,id);
    }


    @ApiOperation("专家详情展示")
    @GetMapping("/expert/detail")
    public R expertInfo(@RequestParam("id")Long id){
        return communityService.expertShowList(7,id );
    }
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunitySanShuoService.java

@@ -181,7 +181,7 @@
     * @date 2022-09-07 11:23:51
     */
    @GetMapping("/status/calculate")
    R calculate();
    R calculate(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "id",required = false)Long  id);

    /**
     * 事件范围筛选列表

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComSanShuoEventController.java

@@ -241,8 +241,8 @@
     */
    @ApiOperation("事件各种状态(处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消8 已删除)数据统计")
    @GetMapping("/status/calculate")
    public R calculate() {
        return comEventService.calculate();
    public R calculate(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "id",required = false)Long  id) {
        return comEventService.calculate(level, id);
    }



 springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/ComSanShuoEventController.java

@@ -242,8 +242,8 @@
     */
    @ApiOperation("事件各种状态(处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消8 已删除)数据统计")
    @GetMapping("/status/calculate")
    public R calculate() {
        return comEventService.calculate();
    public R calculate(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "id",required = false)Long  id) {
        return comEventService.calculate(level, id);
    }



 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoEventController.java

@@ -332,8 +332,8 @@
     */
    @ApiOperation("事件各种状态(处理状态1待处理2待验证3专家已受理4专家未受理，拒绝5调解中6已结案归档7调解取消8 已删除)数据统计")
    @GetMapping("/status/calculate")
    public R calculate() {
        return comEventService.calculate(getLoginUserInfo());
    public R calculate(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "id",required = false)Long  id) {
        return comEventService.calculate(getLoginUserInfo(),level,id);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/IComEventService.java

@@ -83,7 +83,7 @@

    R reappoint(Long id, Long specialistId);

    R calculate(LoginUserInfoVO loginUserInfo);
    R calculate(LoginUserInfoVO loginUserInfo,Integer level,Long id);

    R archiveRequest(ComEventArchiveVO comEventArchiveVO, LoginUserInfoVO sysUser);


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEventServiceImpl.java

@@ -967,7 +967,7 @@
    }

    @Override
    public R calculate(LoginUserInfoVO loginUserInfoVO) {
    public R calculate(LoginUserInfoVO loginUserInfoVO,Integer level,Long id) {
        ComEvent comEvent=new ComEvent();
        Boolean isExpertCheck=false;
        Long expertId=null;
@@ -1025,6 +1025,11 @@
        if (nonNull(user.getAppId())){
            comEvent.setAppId(user.getAppId());
        }
        if (nonNull(level) && nonNull(id)){
            comEvent.setLevel(level);
            comEvent.setSearchId(id);
            comEvent.setUserType(null);
        }
        List<ComEventCalculateVO> calculateList = baseMapper.calculate(comEvent);
        ComEventCalculateVO comEventCalculateVO =new ComEventCalculateVO();
        comEventCalculateVO.setStatus("0");

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java

@@ -266,7 +266,7 @@
                    }else if (i==4){
                        vo.setId(4L);
                        vo.setChildList(comSanshuoIndustryCenterDao.communityList());
                        vo.setName("社区调解站");
                        vo.setName("社区调解室");
                    }else if(i==1){
                        vo.setId(1L);
                        vo.setName("三说会堂");
@@ -297,7 +297,7 @@
                List<ExpertRangeVO> list = new ArrayList<>();
                ExpertRangeVO vo = new ExpertRangeVO();
                vo.setLevel(4);
                vo.setName(comStreetDO.getName() + "调解站");
                vo.setName(comStreetDO.getName() + "调解室");
                vo.setId(loginUserInfo.getCommunityId());
                list.add(vo);
                return R.ok(list);
@@ -351,16 +351,24 @@
    @Override
    public R expertShowList(Integer level, Long id,String appId) {
        QueryWrapper<ComSanshuoExpert> wrapper=new QueryWrapper<>();
        wrapper.eq("level",level);
        wrapper.eq("app_id",appId);
        wrapper.eq("status",1 );
        wrapper.eq("del_flag",1 );
        if (level.equals(2)){
            wrapper.eq("industry_center_id", id);
        }else if (level.equals(3)){
            wrapper.eq("street_id",id );
        }else if (level.equals(4)){
            wrapper.eq("community_id",id );
        if (level==0){
            wrapper.eq("app_id",appId );
        }else {
            if (level!=7){
                wrapper.eq("level",level);
                wrapper.eq("app_id",appId);
                wrapper.eq("status",1 );
                wrapper.eq("del_flag",1 );
                if (level.equals(2)){
                    wrapper.eq("industry_center_id", id);
                }else if (level.equals(3)){
                    wrapper.eq("street_id",id );
                }else if (level.equals(4)){
                    wrapper.eq("community_id",id );
                }
            }else {
                wrapper.eq("id",id );
            }
        }
        List<ComSanshuoExpert> comSanshuoExperts = comSanshuoExpertDao.selectList(wrapper);
        for (ComSanshuoExpert comSanshuoExpert : comSanshuoExperts) {

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComEventMapper.xml

@@ -207,6 +207,17 @@
                #{id}
            </foreach>
        </if>
        <if test="comEvent.level != null and level != ''">
            <if test="comEvent.level == 2">
                AND center_id=#{comEvent.searchId}
            </if>
            <if test="comEvent.level == 3">
                AND request_user_community in(select community_id from com_act where street_id = #{comEvent.searchId})
            </if>
            <if test="comEvent.level == 4">
                AND request_user_community=#{comEvent.searchId}
            </if>
        </if>
    </where>
        group by event_process_status
    </select>

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComSanshuoIndustryCenterDao.xml

@@ -39,10 +39,11 @@
    </select>
    <select id="streetList" resultType="com.panzhihua.common.model.vos.sanshuo.ExpertRangeVO">
        select street_id as id,name from com_street where app_id='wx0cef797390444b75'
        and street_id in (1552661132500668416,1552661143879815168,1552661135428292608,1552661138704044032,1552661136451702784,1552661139563876352)
    </select>
    <select id="communityList" resultType="com.panzhihua.common.model.vos.sanshuo.ExpertRangeVO">
        select community_id as id,name from com_act
        where app_id='wx0cef797390444b75'
        where app_id='wx0cef797390444b75' and street_id in (1552661132500668416,1552661143879815168,1552661135428292608,1552661138704044032,1552661136451702784,1552661139563876352)
    </select>

</mapper>