From d541a7bf066fb9f629432959d89a7369ad58a35e Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 03 八月 2022 14:12:58 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoActivityVO.java | 3 +++
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActFourMember.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActCommiteeVO.java | 4 ++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java | 4 ++--
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseDonatesVO.java | 3 +++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java | 8 +++++++-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActFourMemberVO.java | 3 +++
8 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActCommiteeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActCommiteeVO.java
index 0e971bb..5e556db 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActCommiteeVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActCommiteeVO.java
@@ -16,6 +16,7 @@
* 主键
*/
@ApiModelProperty(value = "主键")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
@@ -47,11 +48,13 @@
* 用户id
*/
@ApiModelProperty(value = "用户id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**
* 社区id
*/
+ @JsonSerialize(using = ToStringSerializer.class)
private Long communityId;
@ApiModelProperty("账号")
@@ -61,6 +64,7 @@
private String password;
@ApiModelProperty("权限id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long roleId;
@ApiModelProperty("小区名称")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoActivityVO.java
index 71ae7e5..d9f9590 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoActivityVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActEasyPhotoActivityVO.java
@@ -5,6 +5,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;
@@ -14,6 +16,7 @@
public class ComActEasyPhotoActivityVO {
@ApiModelProperty("活动id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("活动状态（1.待开始 2.进行中 3.已结束 4.已取消）")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActFourMemberVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActFourMemberVO.java
index b2050f5..f6e63c9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActFourMemberVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActFourMemberVO.java
@@ -28,6 +28,7 @@
* 用户id
*/
@ApiModelProperty(value = "用户id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long userId;
/**
@@ -46,6 +47,7 @@
* 社区id
*/
@ApiModelProperty(value = "社区id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long communityId;
/**
@@ -69,6 +71,7 @@
@ApiModelProperty("角色")
@Min(value = 1, groups = {AddGroup.class}, message = "角色不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long roleId;
@ApiModelProperty("手机号")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java
index 9ec4222..95c045c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActSocialOrgVO.java
@@ -1,6 +1,8 @@
package com.panzhihua.common.model.vos.community;
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;
@@ -17,6 +19,7 @@
* ID
*/
@ApiModelProperty(value = "ID")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
@@ -225,13 +228,14 @@
@ApiModelProperty(value = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date updateAt;
-
+ @JsonSerialize(using = ToStringSerializer.class)
private Long communityId;
/**
* 登录用户id
*/
@ApiModelProperty(value = "登录用户id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@ApiModelProperty("账号")
@@ -241,6 +245,7 @@
private String password;
@ApiModelProperty("权限id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long roleId;
@ApiModelProperty("状态")
@@ -259,6 +264,7 @@
private String serviceType;
@ApiModelProperty("街道id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long streetId;
@ApiModelProperty("服务类型名称")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
index ff66d05..ff6a28f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
@@ -40,12 +40,12 @@
* 街道id
*/
@ApiModelProperty("街道id")
- private Integer streetId;
+ private Long streetId;
/**
* 社区id
*/
@ApiModelProperty("社区id")
- private Integer actId;
+ private Long actId;
/**
* 小区id（实有房屋id）
*/
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseDonatesVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseDonatesVO.java
index 0b0b900..4b42121 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseDonatesVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ComActWarehouseDonatesVO.java
@@ -6,6 +6,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
+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;
@@ -22,6 +24,7 @@
public class ComActWarehouseDonatesVO {
@ApiModelProperty("捐赠物品id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("捐赠人")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
index 1c68f45..422d32a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
@@ -158,7 +158,7 @@
public R addPartyOrganization(@RequestBody PartyOrganizationVO partyOrganizationVO) {
Long communityId = this.getCommunityId();
partyOrganizationVO.setCommunityId(communityId);
- R r = partyBuildingService.addPartyOrganization(partyOrganizationVO);
+ R r = partyBuildingWestService.addPartyOrganization(partyOrganizationVO);
return r;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActFourMember.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActFourMember.java
index 9a2dd9d..1f9d72c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActFourMember.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActFourMember.java
@@ -31,7 +31,7 @@
private static final long serialVersionUID = 905771115750112478L;
@TableId(type = IdType.ASSIGN_ID)
- private Integer id;
+ private Long id;
/**
* 用户id
--
Gitblit v1.7.1