Commit 63c8a378 authored by 赵啸非's avatar 赵啸非

添加公司背景图片字段

parent 234af950
-- ---------------------------- -- ----------------------------
2023-9-11 -- 2023-9-11
-- ---------------------------- -- ----------------------------
ALTER TABLE mortals_xhx_user ADD COLUMN `staffId` varchar(64) COMMENT '员工Id,关联用户员工表'; ALTER TABLE mortals_xhx_user ADD COLUMN `staffId` varchar(64) COMMENT '员工Id,关联用户员工表';
ALTER TABLE mortals_xhx_user ADD COLUMN `openId` varchar(64) COMMENT '微信openId'; ALTER TABLE mortals_xhx_user ADD COLUMN `openId` varchar(64) COMMENT '微信openId';
...@@ -108,3 +108,10 @@ CREATE TABLE mortals_xhx_news_up( ...@@ -108,3 +108,10 @@ CREATE TABLE mortals_xhx_news_up(
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
,KEY `upName` (`upName`) USING BTREE ,KEY `upName` (`upName`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='新闻点赞记录信息'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='新闻点赞记录信息';
-- ----------------------------
-- 2024-12-5
-- ----------------------------
ALTER TABLE mortals_xhx_company ADD COLUMN `background` varchar(256) default '' COMMENT '背景图片';
package com.mortals.xhx.busiz.controller; package com.mortals.xhx.busiz.controller;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.idempotent.helper.IdempotentHelper; import com.mortals.framework.idempotent.helper.IdempotentHelper;
import com.mortals.xhx.busiz.service.TestIdempotentService; import com.mortals.xhx.busiz.service.TestIdempotentService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -28,6 +29,7 @@ public class TestIdempotentController { ...@@ -28,6 +29,7 @@ public class TestIdempotentController {
* url: localhost:12345/v1/idempotent/test-with-result?source=taobao&operationType=publish_product&businessKey=pd_20230105007&name=lisi * url: localhost:12345/v1/idempotent/test-with-result?source=taobao&operationType=publish_product&businessKey=pd_20230105007&name=lisi
*/ */
@GetMapping("/test-with-result") @GetMapping("/test-with-result")
@UnAuth
public String testWithResult(String source, public String testWithResult(String source,
String operationType, String operationType,
String businessKey, String businessKey,
...@@ -44,6 +46,7 @@ public class TestIdempotentController { ...@@ -44,6 +46,7 @@ public class TestIdempotentController {
* url : localhost:12345/v1/idempotent/test-with-no-result?source=taobao&operationType=publish_product&businessKey=pd_20230105008&name=zhangsan * url : localhost:12345/v1/idempotent/test-with-no-result?source=taobao&operationType=publish_product&businessKey=pd_20230105008&name=zhangsan
*/ */
@GetMapping("/test-with-no-result") @GetMapping("/test-with-no-result")
@UnAuth
public String testWithNoResult(String source, public String testWithNoResult(String source,
String operationType, String operationType,
String businessKey, String businessKey,
......
...@@ -13,150 +13,154 @@ import com.mortals.xhx.module.company.model.vo.CompanyVo; ...@@ -13,150 +13,154 @@ import com.mortals.xhx.module.company.model.vo.CompanyVo;
import com.mortals.xhx.module.company.model.CompanyLabelsEntity; import com.mortals.xhx.module.company.model.CompanyLabelsEntity;
import lombok.Data; import lombok.Data;
/** /**
* 公司实体对象 * 公司实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-09-18 * @date 2024-12-05
*/ */
@Data @Data
public class CompanyEntity extends CompanyVo { public class CompanyEntity extends CompanyVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 公司名称 * 公司名称
*/ */
@Excel(name = "公司名称") @Excel(name = "公司名称")
private String companyName; private String companyName;
/** /**
* 公司编码 * 公司编码
*/ */
private String companyCode; private String companyCode;
/** /**
* 注册号 * 注册号
*/ */
private String registrationNumber; private String registrationNumber;
/** /**
* 法定代表人 * 法定代表人
*/ */
private String legalRepresentative; private String legalRepresentative;
/** /**
* 注册资本 * 注册资本
*/ */
private String registeredCapital; private String registeredCapital;
/** /**
* 公司类型 * 公司类型
*/ */
private String companyType; private String companyType;
/** /**
* 经营范围 * 经营范围
*/ */
private String businessScope; private String businessScope;
/** /**
* 经营地址 * 经营地址
*/ */
private String businessAdress; private String businessAdress;
/** /**
* 所在地 * 所在地
*/ */
private String location; private String location;
/** /**
* 所属区域编码 * 所属区域编码
*/ */
private String areaCode; private String areaCode;
/** /**
* 所属区域名称 * 所属区域名称
*/ */
private String areaName; private String areaName;
/** /**
* 联系电话 * 联系电话
*/ */
private String contactPhone; private String contactPhone;
/** /**
* 电子邮件地址 * 电子邮件地址
*/ */
private String email; private String email;
/** /**
* 公司网站 * 公司网站
*/ */
private String website; private String website;
/** /**
* 税务登记号 * 税务登记号
*/ */
private String taxRegistrationNumber; private String taxRegistrationNumber;
/** /**
* 社会信用代码 * 社会信用代码
*/ */
private String socialCreditCode; private String socialCreditCode;
/** /**
* 商标信息 * 商标信息
*/ */
private String trademarkInfo; private String trademarkInfo;
/** /**
* 网站历史备案信息 * 网站历史备案信息
*/ */
private String websiteRegistrationInfo; private String websiteRegistrationInfo;
/** /**
* 员工总数 * 员工总数
*/ */
private Integer totalEmployees; private Integer totalEmployees;
/** /**
* 软件著作权数量 * 软件著作权数量
*/ */
private Integer softNum; private Integer softNum;
/** /**
* 专利数量 * 专利数量
*/ */
private Integer patentNum; private Integer patentNum;
/** /**
* 历史发展 * 历史发展
*/ */
private String hisDevelop; private String hisDevelop;
/** /**
* 经度 * 经度
*/ */
private String lon; private String lon;
/** /**
* 纬度 * 纬度
*/ */
private String lati; private String lati;
/** /**
* 企业logo * 企业logo
*/ */
private String logoPath; private String logoPath;
/** /**
* 企业视频 * 企业视频
*/ */
private String companyVideoPath; private String companyVideoPath;
/** /**
* 企业宣传图片 * 企业宣传图片
*/ */
private String companyPicPath; private String companyPicPath;
/** /**
* 公司介绍 * 公司介绍
*/ */
private String companyIntroduction; private String companyIntroduction;
/** /**
* 公司文化 * 公司文化
*/ */
private String companyCulture; private String companyCulture;
/** /**
* 排序 * 排序
*/ */
private Integer sort; private Integer sort;
/** /**
* 成立日期 * 成立日期
*/ */
private Date establishDate; private Date establishDate;
/** /**
* 备注 * 备注
*/ */
private String remark; private String remark;
/** /**
* 公司标注信息 * 背景图片
*/ */
private String background;
/**
* 公司标注信息
*/
private List<CompanyLabelsEntity> companyLabelsList=new ArrayList<>();; private List<CompanyLabelsEntity> companyLabelsList=new ArrayList<>();;
public List<CompanyLabelsEntity> getCompanyLabelsList(){ public List<CompanyLabelsEntity> getCompanyLabelsList(){
return companyLabelsList; return companyLabelsList;
} }
public void setCompanyLabelsList(List<CompanyLabelsEntity> companyLabelsList){ public void setCompanyLabelsList(List<CompanyLabelsEntity> companyLabelsList){
...@@ -164,7 +168,7 @@ public class CompanyEntity extends CompanyVo { ...@@ -164,7 +168,7 @@ public class CompanyEntity extends CompanyVo {
} }
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -172,44 +176,45 @@ public class CompanyEntity extends CompanyVo { ...@@ -172,44 +176,45 @@ public class CompanyEntity extends CompanyVo {
if (obj instanceof CompanyEntity) { if (obj instanceof CompanyEntity) {
CompanyEntity tmp = (CompanyEntity) obj; CompanyEntity tmp = (CompanyEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
} }
public void initAttrValue(){ public void initAttrValue(){
this.companyName = ""; this.companyName = "";
this.companyCode = ""; this.companyCode = "";
this.registrationNumber = ""; this.registrationNumber = "";
this.legalRepresentative = ""; this.legalRepresentative = "";
this.registeredCapital = ""; this.registeredCapital = "";
this.companyType = ""; this.companyType = "";
this.businessScope = ""; this.businessScope = "";
this.businessAdress = ""; this.businessAdress = "";
this.location = ""; this.location = "";
this.areaCode = ""; this.areaCode = "";
this.areaName = ""; this.areaName = "";
this.contactPhone = ""; this.contactPhone = "";
this.email = ""; this.email = "";
this.website = ""; this.website = "";
this.taxRegistrationNumber = ""; this.taxRegistrationNumber = "";
this.socialCreditCode = ""; this.socialCreditCode = "";
this.trademarkInfo = ""; this.trademarkInfo = "";
this.websiteRegistrationInfo = ""; this.websiteRegistrationInfo = "";
this.totalEmployees = 0; this.totalEmployees = 0;
this.softNum = 0; this.softNum = 0;
this.patentNum = 0; this.patentNum = 0;
this.hisDevelop = ""; this.hisDevelop = "";
this.lon = ""; this.lon = "";
this.lati = ""; this.lati = "";
this.logoPath = ""; this.logoPath = "";
this.companyVideoPath = ""; this.companyVideoPath = "";
this.companyPicPath = ""; this.companyPicPath = "";
this.companyIntroduction = ""; this.companyIntroduction = "";
this.companyCulture = ""; this.companyCulture = "";
this.sort = 0; this.sort = 0;
this.establishDate = new Date(); this.establishDate = null;
this.remark = ""; this.remark = "";
this.background = "";
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment