Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
enterprise-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
enterprise-platform
Commits
63c8a378
Commit
63c8a378
authored
Dec 05, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加公司背景图片字段
parent
234af950
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
2693 additions
and
2498 deletions
+2693
-2498
db/add.sql
db/add.sql
+8
-1
enterprise-manager/src/main/java/com/mortals/xhx/busiz/controller/TestIdempotentController.java
...ortals/xhx/busiz/controller/TestIdempotentController.java
+3
-0
enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/CompanyEntity.java
...a/com/mortals/xhx/module/company/model/CompanyEntity.java
+111
-106
enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/CompanyQuery.java
...va/com/mortals/xhx/module/company/model/CompanyQuery.java
+1132
-1076
enterprise-manager/src/main/resources/sqlmap/module/company/CompanyMapper.xml
...rc/main/resources/sqlmap/module/company/CompanyMapper.xml
+1439
-1315
No files found.
db/add.sql
View file @
63c8a378
-- ----------------------------
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
`openId`
varchar
(
64
)
COMMENT
'微信openId'
;
...
...
@@ -108,3 +108,10 @@ CREATE TABLE mortals_xhx_news_up(
PRIMARY
KEY
(
`id`
)
,
KEY
`upName`
(
`upName`
)
USING
BTREE
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
COMMENT
=
'新闻点赞记录信息'
;
-- ----------------------------
-- 2024-12-5
-- ----------------------------
ALTER
TABLE
mortals_xhx_company
ADD
COLUMN
`background`
varchar
(
256
)
default
''
COMMENT
'背景图片'
;
enterprise-manager/src/main/java/com/mortals/xhx/busiz/controller/TestIdempotentController.java
View file @
63c8a378
package
com.mortals.xhx.busiz.controller
;
import
com.mortals.framework.annotation.UnAuth
;
import
com.mortals.framework.idempotent.helper.IdempotentHelper
;
import
com.mortals.xhx.busiz.service.TestIdempotentService
;
import
lombok.extern.slf4j.Slf4j
;
...
...
@@ -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
*/
@GetMapping
(
"/test-with-result"
)
@UnAuth
public
String
testWithResult
(
String
source
,
String
operationType
,
String
businessKey
,
...
...
@@ -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
*/
@GetMapping
(
"/test-with-no-result"
)
@UnAuth
public
String
testWithNoResult
(
String
source
,
String
operationType
,
String
businessKey
,
...
...
enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/CompanyEntity.java
View file @
63c8a378
...
...
@@ -13,150 +13,154 @@ import com.mortals.xhx.module.company.model.vo.CompanyVo;
import
com.mortals.xhx.module.company.model.CompanyLabelsEntity
;
import
lombok.Data
;
/**
* 公司实体对象
*
* @author zxfei
* @date 2023-09-18
*/
* 公司实体对象
*
* @author zxfei
* @date 2024-12-05
*/
@Data
public
class
CompanyEntity
extends
CompanyVo
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 公司名称
*/
* 公司名称
*/
@Excel
(
name
=
"公司名称"
)
private
String
companyName
;
/**
* 公司编码
*/
* 公司编码
*/
private
String
companyCode
;
/**
* 注册号
*/
* 注册号
*/
private
String
registrationNumber
;
/**
* 法定代表人
*/
* 法定代表人
*/
private
String
legalRepresentative
;
/**
* 注册资本
*/
* 注册资本
*/
private
String
registeredCapital
;
/**
* 公司类型
*/
* 公司类型
*/
private
String
companyType
;
/**
* 经营范围
*/
* 经营范围
*/
private
String
businessScope
;
/**
* 经营地址
*/
* 经营地址
*/
private
String
businessAdress
;
/**
* 所在地
*/
* 所在地
*/
private
String
location
;
/**
* 所属区域编码
*/
* 所属区域编码
*/
private
String
areaCode
;
/**
* 所属区域名称
*/
* 所属区域名称
*/
private
String
areaName
;
/**
* 联系电话
*/
* 联系电话
*/
private
String
contactPhone
;
/**
* 电子邮件地址
*/
* 电子邮件地址
*/
private
String
email
;
/**
* 公司网站
*/
* 公司网站
*/
private
String
website
;
/**
* 税务登记号
*/
* 税务登记号
*/
private
String
taxRegistrationNumber
;
/**
* 社会信用代码
*/
* 社会信用代码
*/
private
String
socialCreditCode
;
/**
* 商标信息
*/
* 商标信息
*/
private
String
trademarkInfo
;
/**
* 网站历史备案信息
*/
* 网站历史备案信息
*/
private
String
websiteRegistrationInfo
;
/**
* 员工总数
*/
* 员工总数
*/
private
Integer
totalEmployees
;
/**
* 软件著作权数量
*/
* 软件著作权数量
*/
private
Integer
softNum
;
/**
* 专利数量
*/
* 专利数量
*/
private
Integer
patentNum
;
/**
* 历史发展
*/
* 历史发展
*/
private
String
hisDevelop
;
/**
* 经度
*/
* 经度
*/
private
String
lon
;
/**
* 纬度
*/
* 纬度
*/
private
String
lati
;
/**
* 企业logo
*/
* 企业logo
*/
private
String
logoPath
;
/**
* 企业视频
*/
* 企业视频
*/
private
String
companyVideoPath
;
/**
* 企业宣传图片
*/
* 企业宣传图片
*/
private
String
companyPicPath
;
/**
* 公司介绍
*/
* 公司介绍
*/
private
String
companyIntroduction
;
/**
* 公司文化
*/
* 公司文化
*/
private
String
companyCulture
;
/**
* 排序
*/
* 排序
*/
private
Integer
sort
;
/**
* 成立日期
*/
* 成立日期
*/
private
Date
establishDate
;
/**
* 备注
*/
* 备注
*/
private
String
remark
;
/**
* 公司标注信息
*/
* 背景图片
*/
private
String
background
;
/**
* 公司标注信息
*/
private
List
<
CompanyLabelsEntity
>
companyLabelsList
=
new
ArrayList
<>();;
public
List
<
CompanyLabelsEntity
>
getCompanyLabelsList
(){
return
companyLabelsList
;
return
companyLabelsList
;
}
public
void
setCompanyLabelsList
(
List
<
CompanyLabelsEntity
>
companyLabelsList
){
...
...
@@ -164,7 +168,7 @@ public class CompanyEntity extends CompanyVo {
}
@Override
public
int
hashCode
()
{
return
this
.
getId
().
hashCode
();
return
this
.
getId
().
hashCode
();
}
@Override
public
boolean
equals
(
Object
obj
)
{
...
...
@@ -172,44 +176,45 @@ public class CompanyEntity extends CompanyVo {
if
(
obj
instanceof
CompanyEntity
)
{
CompanyEntity
tmp
=
(
CompanyEntity
)
obj
;
if
(
this
.
getId
()
==
tmp
.
getId
())
{
return
true
;
return
true
;
}
}
return
false
;
}
public
void
initAttrValue
(){
this
.
companyName
=
""
;
this
.
companyCode
=
""
;
this
.
registrationNumber
=
""
;
this
.
legalRepresentative
=
""
;
this
.
registeredCapital
=
""
;
this
.
companyType
=
""
;
this
.
businessScope
=
""
;
this
.
businessAdress
=
""
;
this
.
location
=
""
;
this
.
areaCode
=
""
;
this
.
areaName
=
""
;
this
.
contactPhone
=
""
;
this
.
email
=
""
;
this
.
website
=
""
;
this
.
taxRegistrationNumber
=
""
;
this
.
socialCreditCode
=
""
;
this
.
trademarkInfo
=
""
;
this
.
websiteRegistrationInfo
=
""
;
this
.
totalEmployees
=
0
;
this
.
softNum
=
0
;
this
.
patentNum
=
0
;
this
.
hisDevelop
=
""
;
this
.
lon
=
""
;
this
.
lati
=
""
;
this
.
logoPath
=
""
;
this
.
companyVideoPath
=
""
;
this
.
companyPicPath
=
""
;
this
.
companyIntroduction
=
""
;
this
.
companyCulture
=
""
;
this
.
sort
=
0
;
this
.
establishDate
=
new
Date
();
this
.
remark
=
""
;
this
.
companyName
=
""
;
this
.
companyCode
=
""
;
this
.
registrationNumber
=
""
;
this
.
legalRepresentative
=
""
;
this
.
registeredCapital
=
""
;
this
.
companyType
=
""
;
this
.
businessScope
=
""
;
this
.
businessAdress
=
""
;
this
.
location
=
""
;
this
.
areaCode
=
""
;
this
.
areaName
=
""
;
this
.
contactPhone
=
""
;
this
.
email
=
""
;
this
.
website
=
""
;
this
.
taxRegistrationNumber
=
""
;
this
.
socialCreditCode
=
""
;
this
.
trademarkInfo
=
""
;
this
.
websiteRegistrationInfo
=
""
;
this
.
totalEmployees
=
0
;
this
.
softNum
=
0
;
this
.
patentNum
=
0
;
this
.
hisDevelop
=
""
;
this
.
lon
=
""
;
this
.
lati
=
""
;
this
.
logoPath
=
""
;
this
.
companyVideoPath
=
""
;
this
.
companyPicPath
=
""
;
this
.
companyIntroduction
=
""
;
this
.
companyCulture
=
""
;
this
.
sort
=
0
;
this
.
establishDate
=
null
;
this
.
remark
=
""
;
this
.
background
=
""
;
}
}
\ No newline at end of file
enterprise-manager/src/main/java/com/mortals/xhx/module/company/model/CompanyQuery.java
View file @
63c8a378
This diff is collapsed.
Click to expand it.
enterprise-manager/src/main/resources/sqlmap/module/company/CompanyMapper.xml
View file @
63c8a378
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment