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
Show 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,11 +13,11 @@ 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
;
...
...
@@ -151,6 +151,10 @@ public class CompanyEntity extends CompanyVo {
* 备注
*/
private
String
remark
;
/**
* 背景图片
*/
private
String
background
;
/**
* 公司标注信息
*/
...
...
@@ -209,7 +213,8 @@ public class CompanyEntity extends CompanyVo {
this
.
companyIntroduction
=
""
;
this
.
companyCulture
=
""
;
this
.
sort
=
0
;
this
.
establishDate
=
new
Date
()
;
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
...
...
@@ -5,11 +5,11 @@ import java.util.Date;
import
java.util.List
;
import
com.mortals.xhx.module.company.model.CompanyEntity
;
/**
* 公司查询对象
*
* @author zxfei
* @date 2023-09-18
*/
* 公司查询对象
*
* @author zxfei
* @date 2024-12-05
*/
public
class
CompanyQuery
extends
CompanyEntity
{
/** 开始 主键ID,主键,自增长 */
private
Long
idStart
;
...
...
@@ -269,6 +269,11 @@ public class CompanyQuery extends CompanyEntity {
/** 结束 更新时间 */
private
String
updateTimeEnd
;
/** 背景图片 */
private
List
<
String
>
backgroundList
;
/** 背景图片排除列表 */
private
List
<
String
>
backgroundNotList
;
/** OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private
List
<
CompanyQuery
>
orConditionList
;
...
...
@@ -1804,6 +1809,38 @@ public class CompanyQuery extends CompanyEntity {
this
.
updateTimeEnd
=
updateTimeEnd
;
}
/**
* 获取 背景图片
* @return backgroundList
*/
public
List
<
String
>
getBackgroundList
(){
return
this
.
backgroundList
;
}
/**
* 设置 背景图片
* @param backgroundList
*/
public
void
setBackgroundList
(
List
<
String
>
backgroundList
){
this
.
backgroundList
=
backgroundList
;
}
/**
* 获取 背景图片
* @return backgroundNotList
*/
public
List
<
String
>
getBackgroundNotList
(){
return
this
.
backgroundNotList
;
}
/**
* 设置 背景图片
* @param backgroundNotList
*/
public
void
setBackgroundNotList
(
List
<
String
>
backgroundNotList
){
this
.
backgroundNotList
=
backgroundNotList
;
}
/**
* 设置 主键ID,主键,自增长
* @param id
...
...
@@ -2698,6 +2735,25 @@ public class CompanyQuery extends CompanyEntity {
}
/**
* 设置 背景图片
* @param background
*/
public
CompanyQuery
background
(
String
background
){
setBackground
(
background
);
return
this
;
}
/**
* 设置 背景图片
* @param backgroundList
*/
public
CompanyQuery
backgroundList
(
List
<
String
>
backgroundList
){
this
.
backgroundList
=
backgroundList
;
return
this
;
}
/**
* 获取 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
...
...
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