From c7a1a16c8d22b64f9025e800ebaf89b19b530228 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 13:14:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComSanshuoExpert.java | 117 ++++++++++------------------------------------------------
1 files changed, 21 insertions(+), 96 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComSanshuoExpert.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComSanshuoExpert.java
index efe99cc..666c170 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComSanshuoExpert.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComSanshuoExpert.java
@@ -1,11 +1,15 @@
package com.panzhihua.service_community.entity;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -19,31 +23,37 @@
* id
*/
@TableId
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
/**
* 专家级别(1三说会堂2行业分中心3街道4社区)
*/
+ @ExcelProperty("level")
private Integer level;
/**
* 所属社区id
*/
+ @ExcelProperty("communityId")
private Long communityId;
/**
* 工作时间
*/
+ @ExcelProperty("workTime")
private String workTime;
/**
* 擅长解决时间类型
*/
+ @ExcelProperty("goodAt")
private String goodAt;
/**
* 姓名
*/
+ @ExcelProperty("name")
private String name;
/**
@@ -54,6 +64,7 @@
/**
* 手机号
*/
+ @ExcelProperty("phone")
private String phone;
/**
@@ -104,110 +115,24 @@
/**
* 行业分中心id
*/
- private String industryCenterId;
-
- /**
- * 备用字段1
- */
- private String param1;
+ private Long industryCenterId;
/**
* 所属单位
*/
private String unit;
+ private String unitId;
+
+ @TableField(exist = false)
+ private Integer count;
+ @TableField(exist = false)
+ private BigDecimal rate;
+ private Integer added;
+
+
@TableField(exist = false)
private static final long serialVersionUID = 1L;
- @Override
- public boolean equals(Object that) {
- if (this == that) {
- return true;
- }
- if (that == null) {
- return false;
- }
- if (getClass() != that.getClass()) {
- return false;
- }
- ComSanshuoExpert other = (ComSanshuoExpert) that;
- return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
- && (this.getLevel() == null ? other.getLevel() == null : this.getLevel().equals(other.getLevel()))
- && (this.getCommunityId() == null ? other.getCommunityId() == null : this.getCommunityId().equals(other.getCommunityId()))
- && (this.getWorkTime() == null ? other.getWorkTime() == null : this.getWorkTime().equals(other.getWorkTime()))
- && (this.getGoodAt() == null ? other.getGoodAt() == null : this.getGoodAt().equals(other.getGoodAt()))
- && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
- && (this.getAvatar() == null ? other.getAvatar() == null : this.getAvatar().equals(other.getAvatar()))
- && (this.getPhone() == null ? other.getPhone() == null : this.getPhone().equals(other.getPhone()))
- && (this.getAccount() == null ? other.getAccount() == null : this.getAccount().equals(other.getAccount()))
- && (this.getPassword() == null ? other.getPassword() == null : this.getPassword().equals(other.getPassword()))
- && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
- && (this.getDelFlag() == null ? other.getDelFlag() == null : this.getDelFlag().equals(other.getDelFlag()))
- && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
- && (this.getCreateBy() == null ? other.getCreateBy() == null : this.getCreateBy().equals(other.getCreateBy()))
- && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
- && (this.getIntroduction() == null ? other.getIntroduction() == null : this.getIntroduction().equals(other.getIntroduction()))
- && (this.getStreetId() == null ? other.getStreetId() == null : this.getStreetId().equals(other.getStreetId()))
- && (this.getIndustryCenterId() == null ? other.getIndustryCenterId() == null : this.getIndustryCenterId().equals(other.getIndustryCenterId()))
- && (this.getParam1() == null ? other.getParam1() == null : this.getParam1().equals(other.getParam1()))
- && (this.getUnit() == null ? other.getUnit() == null : this.getUnit().equals(other.getUnit()));
- }
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
- result = prime * result + ((getLevel() == null) ? 0 : getLevel().hashCode());
- result = prime * result + ((getCommunityId() == null) ? 0 : getCommunityId().hashCode());
- result = prime * result + ((getWorkTime() == null) ? 0 : getWorkTime().hashCode());
- result = prime * result + ((getGoodAt() == null) ? 0 : getGoodAt().hashCode());
- result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
- result = prime * result + ((getAvatar() == null) ? 0 : getAvatar().hashCode());
- result = prime * result + ((getPhone() == null) ? 0 : getPhone().hashCode());
- result = prime * result + ((getAccount() == null) ? 0 : getAccount().hashCode());
- result = prime * result + ((getPassword() == null) ? 0 : getPassword().hashCode());
- result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
- result = prime * result + ((getDelFlag() == null) ? 0 : getDelFlag().hashCode());
- result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
- result = prime * result + ((getCreateBy() == null) ? 0 : getCreateBy().hashCode());
- result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
- result = prime * result + ((getIntroduction() == null) ? 0 : getIntroduction().hashCode());
- result = prime * result + ((getStreetId() == null) ? 0 : getStreetId().hashCode());
- result = prime * result + ((getIndustryCenterId() == null) ? 0 : getIndustryCenterId().hashCode());
- result = prime * result + ((getParam1() == null) ? 0 : getParam1().hashCode());
- result = prime * result + ((getUnit() == null) ? 0 : getUnit().hashCode());
- return result;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName());
- sb.append(" [");
- sb.append("Hash = ").append(hashCode());
- sb.append(", id=").append(id);
- sb.append(", level=").append(level);
- sb.append(", communityId=").append(communityId);
- sb.append(", workTime=").append(workTime);
- sb.append(", goodAt=").append(goodAt);
- sb.append(", name=").append(name);
- sb.append(", avatar=").append(avatar);
- sb.append(", phone=").append(phone);
- sb.append(", account=").append(account);
- sb.append(", password=").append(password);
- sb.append(", status=").append(status);
- sb.append(", delFlag=").append(delFlag);
- sb.append(", createTime=").append(createTime);
- sb.append(", createBy=").append(createBy);
- sb.append(", updateTime=").append(updateTime);
- sb.append(", introduction=").append(introduction);
- sb.append(", streetId=").append(streetId);
- sb.append(", industryCenterId=").append(industryCenterId);
- sb.append(", param1=").append(param1);
- sb.append(", unit=").append(unit);
- sb.append(", serialVersionUID=").append(serialVersionUID);
- sb.append("]");
- return sb.toString();
- }
}
\ No newline at end of file
--
Gitblit v1.7.1