1.修改部门管理人员获取条件 2.新增删除评论功能

fengjin

2022-11-15 e41ec4ec32db3c3476489dd39cd7a972280aa636

1.修改部门管理人员获取条件 2.新增删除评论功能

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

@@ -56,7 +56,7 @@
        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);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids,null);

        int num=IUserService.selectNum("2",keyword,ids);
        return getDataTable(list,num);

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

@@ -195,7 +195,7 @@
        Assert.notNull(pageNum, "pageNum can not be empty");
        Assert.notNull(pageSize, "pageSize can not be empty");
        Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword,null);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"3",keyword,null,"1");

        int num=IUserService.selectNum("3",keyword,null);
        return getDataTable(list,num);

 flower_city/src/main/java/com/dg/core/db/gen/entity/GuideEvolveEntity.java

@@ -54,9 +54,9 @@
    private String fromUserId;

    /**
     * state", value = "状态（1待分配  2 待办结 3 已办结 4 待评价 5 已取消 6未解决  7已解决  8 系统自动分配 9 回复 10转派 11手动分配12默认好评13评价）
     * state", value = "状态（1待分配  2 待办结 3 已办结 4 待评价 5 已取消 6未解决  7已解决  8 系统自动分配 9 回复 10转派 11手动分配12默认好评13评价14.删除评论）
     */
    @ApiModelProperty(name = "state", value = "状态（1待分配  2 待办结 3 已办结 4 待评价 5 已取消 6未解决  7已解决  8 系统自动分配 9 回复 10转派 11手动分配 12默认好评 13用户评价）")
    @ApiModelProperty(name = "state", value = "状态（1待分配  2 待办结 3 已办结 4 待评价 5 已取消 6未解决  7已解决  8 系统自动分配 9 回复 10转派 11手动分配 12默认好评 13用户评价14.删除评论）")
    private String state;



 flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java

@@ -194,6 +194,12 @@
    @ApiModelProperty("是否推送过（1 是 2 否）")
    private Integer isPush;

    /**
     * 是否隐藏评论（1 是 2 否）
     */
    @ApiModelProperty("是否隐藏评论（1 是 2 否）")
    private Integer isHideComments;

    @TableField(exist = false)
    @ApiModelProperty(name = "sumClassifyName", value = "完整分类名称")
    private String sumClassifyName;

 flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java

@@ -29,7 +29,8 @@
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,
                                          @Param("userType") String userType,
                                          @Param("userName") String userName,
                                          @Param("ids") List<String> ids);
                                          @Param("ids") List<String> ids,
                                          @Param("String") String  isDivisionHead);




 flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java

@@ -133,4 +133,11 @@
     */
    int updateEvaluate();


    /**
     * 删除评论
     * @return
     */
    int deleteComment(Integer id);

}

 flower_city/src/main/java/com/dg/core/service/ISysUserService.java

@@ -15,7 +15,7 @@
     * @return 参数配置信息
     */
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,
                                          String userName,List<String> ids);
                                          String userName,List<String> ids,String isDivisionHead);


    SysUser selectData(String userId,String phonenumber,String loginName);

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

@@ -437,5 +437,21 @@
        return 0;
    }

    @Override
    public int deleteComment(Integer id) {
        GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda().eq(GuideRepairOrder::getId, id));
        guideRepairOrder.setIsHideComments(1);
        baseMapper.updateById(guideRepairOrder);
        //新增删除评论进展
        GuideEvolveEntity entity = new GuideEvolveEntity();
        entity.setCreateTime(LocalDateTime.now());
        entity.setUpdateTime(LocalDateTime.now());
        entity.setState("14");
        entity.setFromUserId(guideRepairOrder.getSubmitUserId() + "");
        entity.setGuideId(guideRepairOrder.getId().toString());
        guideEvolveMapper.insertConfig(entity);
        return  baseMapper.updateById(guideRepairOrder);
    }


}

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

@@ -254,8 +254,8 @@
    }

    @Override
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName,List<String> ids) {
        return baseMapper.selectConfigList(page, state,userType,userName,ids);
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName,List<String> ids,String isDivisionHead) {
        return baseMapper.selectConfigList(page, state,userType,userName,ids,isDivisionHead);
    }

    @Override

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

@@ -119,6 +119,9 @@
                    #{param}
                </foreach>
            </if>
            <if test="isDivisionHead != null and != ''">
                AND is_division_head=#{isDivisionHead}
            </if>
            <if test="userName != null and userName != ''">
                AND (user_name like concat('%', #{userName}, '%') or
                (department_id in (SELECT id FROM automessage_organization_chart
@@ -152,6 +155,9 @@
                    #{param}
                </foreach>
            </if>
            <if test="isDivisionHead != null and != ''">
                AND is_division_head=#{isDivisionHead}
            </if>
            <if test="userName != null and userName != ''">
                AND (user_name like concat('%', #{userName}, '%') or
                (department_id in (SELECT id FROM automessage_organization_chart