bug修改

puhanshu

2022-07-29 c4233fa836decf4168d515f1a1a0c8ba2a9c5855

bug修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java

@@ -33,6 +33,7 @@
public class LoginUserInfoVO {

    @ApiModelProperty("user_id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;

    @ApiModelProperty("微信会话密钥")
@@ -123,6 +124,7 @@
    private String tags;

    @ApiModelProperty("家庭id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long familyId;

    @ApiModelProperty(value = "分页每页数量", example = "10")
@@ -144,6 +146,7 @@
    private List<ComMngStructHouseVO> comMngStructHouseVOS;

    @ApiModelProperty("用户小区id")
    @JsonSerialize(using = ToStringSerializer.class)
    // @Min(value = 1,groups = {PutGroup.class},message = "用户小区id不能为空")
    // @NotNull(groups = {PutGroup.class},message = "用户小区id不能为空")
    private Long areaId;
@@ -212,12 +215,14 @@
    @ApiModelProperty("areaCode")
    private String areaCode;
    @ApiModelProperty("街道id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long streetId;

    @ApiModelProperty("账号类型 1街道 2社区 3社会组织")
    private Integer userType;

    @ApiModelProperty("社会组织Id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long orgId;

    @ApiModelProperty("是否是防疫工作人员 1.是 2.否")
@@ -233,6 +238,7 @@
    private Integer isCheckUnitAdmin;

    @ApiModelProperty("报道单位id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long checkUnitId;



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

@@ -60,12 +60,15 @@
    @ApiModelProperty(value = "分类类型 1服务类型分类 2技能分类 3通知公告 4项目分类")
    private Integer type;

    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;

    @ApiModelProperty(value = "父类id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long parentId;

    @ApiModelProperty("街道id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long streetId;

    private String description;

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

@@ -25,6 +25,7 @@
    private String name;

    @ApiModelProperty("建筑类型id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long typeId;

    @ApiModelProperty("面积")
@@ -52,5 +53,6 @@
    private String buileTypeName;

    @ApiModelProperty("社区id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long communityId;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/cluster/admin/PageClusterMemberAdminVo.java

@@ -1,5 +1,7 @@
package com.panzhihua.common.model.vos.community.cluster.admin;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,6 +15,7 @@
public class PageClusterMemberAdminVo {

    @ApiModelProperty("主键id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long id;

    @ApiModelProperty("群团组织成员名称")
@@ -34,6 +37,7 @@
    private String idCard;

    @ApiModelProperty("所属群团组织id")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long clusterId;

    @ApiModelProperty("所属群团组织名称")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserVO.java

@@ -4,6 +4,8 @@

import com.fasterxml.jackson.annotation.JsonFormat;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -19,6 +21,7 @@
public class SysUserVO {

    @ApiModelProperty("主键")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long userId;

    @ApiModelProperty("手机号")

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

@@ -291,7 +291,7 @@
        cmpct.label,    cmp.marriage,    cmp.culture_level,    cmp.profession,    cmp.out_or_local,
        cmp.census_register,    cmp.healthy,    cmp.birthday,    cmp.update_at,    cmp.address,
        cmp.is_rent, cmp.person_type FROM com_mng_population_community_tags as cmpct
        LEFT JOIN com_mng_population AS cmp ON cmp.id = cmpct.population_id
        INNER JOIN com_mng_population AS cmp ON cmp.id = cmpct.population_id
        <where>
            <if test='comMngPopulationVO.name != null and comMngPopulationVO.name != &quot;&quot;'>
                AND cmp.`name` LIKE concat(#{comMngPopulationVO.name},'%')    </if>