change:随手拍、一起议、微心愿 添加昵称字段

CeDo

2021-05-24 2dbd65c087d193db8f084be2dabe5e91f54ad7a1

change:随手拍、一起议、微心愿 添加昵称字段

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussCommentVO.java

@@ -45,9 +45,13 @@
    @ApiModelProperty("评论人名字")
    private String userName;

    @ApiModelProperty("评论人昵称")
    private String userNickName;

    @ApiModelProperty("回复人名字")
    private String userNameBack;


    @ApiModelProperty("评论人手机号")
    private String phone;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDiscussVO.java

@@ -61,6 +61,9 @@
    @ApiModelProperty("发布人名字")
    private String userName;

    @ApiModelProperty("发布人昵称")
    private String userNickName;

    @ApiModelProperty("发布人头像")
    private String imageUrl;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoVO.java

@@ -31,6 +31,9 @@
    @ApiModelProperty("发起人名字")
    private String sponsorName;

    @ApiModelProperty("发布人昵称")
    private String userNickName;

    @ApiModelProperty("发生地址")
    @NotBlank(groups = {AddGroup.class},message = "发生地址不能为空")
    private String happenAddr;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActMicroWishVO.java

@@ -32,6 +32,9 @@
    @ApiModelProperty("发起人名字")
    private String sponsorName;

    @ApiModelProperty("发布人昵称")
    private String userNickName;

    @ApiModelProperty("发起人头像")
    private String imageUrl;


 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussDAO.java

@@ -32,7 +32,7 @@
//            " </if> " +
//            " </where>" +
//            "</script>")
    @Select("select type,name,phone,image_url from sys_user where user_id=#{userId}")
    @Select("select type,name,phone,image_url,nick_name from sys_user where user_id=#{userId}")
    LoginUserInfoVO selectUserByUserId(Long userId);
    @Select("<script> " +
            "select t.* from ("+
@@ -42,6 +42,7 @@
            "d.type,\n" +
            "COUNT( DISTINCT c.id ) commentNum,\n" +
            "u.name userName,\n" +
            "u.nick_name userNickName,\n" +
            "d.create_at \n" +
            "FROM\n" +
            "com_act_discuss d\n" +
@@ -65,6 +66,7 @@
            "select * from ("+
            "SELECT\n" +
            "u.`name` userName,\n" +
            "u.nick_name userNickName,\n" +
            "u.phone,\n" +
            "c.`comment`,\n" +
            "c.`parent_id`,\n" +
@@ -103,6 +105,7 @@
            "COUNT( DISTINCT c.id ) commentNum,\n" +
            "COUNT( DISTINCT du.id ) signNum,\n" +
            "if(u.type=1,u.name,a.name) userName,\n" +
            "if(u.type=1,u.nick_name,a.name) userNickName,\n" +
            "if(du.id is not null,1,0) haveSign,\n" +
            "if(ou.id is not null,1,0) haveVote,\n" +
            "u.image_url,\n" +
@@ -135,6 +138,7 @@
            "select * from ("+
            "SELECT\n" +
            "u.`name` userName,\n" +
            "u.nick_name userNickName,\n" +
            "u.`image_url`,\n" +
            "u.phone,\n" +
            "c.`comment`,\n" +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActEasyPhotoDAO.java

@@ -142,6 +142,7 @@
            "p.examine_at,\n" +
            "p.create_at,\n" +
            "u.`name` sponsorName,\n" +
            "u.nick_name userNickName,\n" +
            "su.`name` handlerName,\n" +
            "u.`image_url`,\n" +
            "u.phone,\n" +
@@ -189,6 +190,7 @@
            "SELECT\n" +
            "p.id,\n" +
            "u.`name` sponsor_name,\n" +
            "u.nick_name userNickName,\n" +
            "u.phone sponsor_phone,\n" +
            "count(DISTINCT pu.id)giveThumbsUpNum,\n" +
            "count(DISTINCT c.id)commentNum,\n" +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java

@@ -26,6 +26,7 @@
            "SELECT\n" +
            "w.id,\n" +
            "u.name sponsor_name,\n" +
            "u.nick_name userNickName,\n" +
            "u.image_url ,\n" +
            "w.sponsor_phone,\n" +
            "w.wish_name,\n" +
@@ -99,6 +100,7 @@
    @Select("SELECT\n" +
            "w.id,\n" +
            "u.name sponsor_name,\n" +
            "u.nick_name userNickName,\n" +
            "w.create_at,\n" +
            "u.image_url,\n" +
            "w.sponsor_phone,\n" +

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

@@ -481,6 +481,7 @@
        LoginUserInfoVO loginUserInfoVO=comActDiscussDAO.selectUserByUserId(userId);
        comActDiscussVO.setUserName(loginUserInfoVO.getName());
        comActDiscussVO.setImageUrl(loginUserInfoVO.getImageUrl());
        comActDiscussVO.setUserNickName(loginUserInfoVO.getNickName());
        Long communityId = comActDiscussDO.getCommunityId();
        Integer type1 = loginUserInfoVO.getType();
        if (type1.intValue()>1) {