Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
c536570c
Commit
c536570c
authored
Jun 20, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
项目档案无岗位更新岗位fxj 2024-04-17
parent
b349c5f8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
EmployeeConstants.java
...ud/plus/v1/yifu/archives/constants/EmployeeConstants.java
+1
-1
TEmployeeContractInfoMapper.xml
...src/main/resources/mapper/TEmployeeContractInfoMapper.xml
+5
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeConstants.java
View file @
c536570c
...
...
@@ -34,7 +34,7 @@ public class EmployeeConstants {
public
static
final
String
CHECK_ERROR
=
"校验服务错误,请联系管理员!"
;
public
static
final
String
CHECK_NO_RESPONSE
=
"校验服务器未返回,请联系管理员!"
;
public
static
final
String
MARRY_STATUS_NOT_NULL
=
"婚姻状况不可为空"
;
public
static
final
String
POLITICAL_STATUS_NOT_NULL
=
"
婚姻状况
不可为空"
;
public
static
final
String
POLITICAL_STATUS_NOT_NULL
=
"
政治面貌
不可为空"
;
// 拦截合同使用
public
static
final
String
SITUATION_ONE
=
"正常签订"
;
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml
View file @
c536570c
...
...
@@ -143,6 +143,7 @@
<result
property=
"post"
column=
"POST"
/>
<result
property=
"remark"
column=
"REMARK"
/>
<result
property=
"memo"
column=
"MEMO"
/>
<result
property=
"tryPeriod"
column=
"TRY_PERIOD"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
...
...
@@ -515,7 +516,8 @@
ELSE a.type END as "type",
b.REMARK,
a.REMARK as memo,
a.CREATE_TIME
a.CREATE_TIME,
a.TRY_PERIOD
FROM t_employee_contract_info a
LEFT JOIN sys_area a1 on a1.id=a.FILE_PROVINCE
LEFT JOIN sys_area a2 on a2.id=a.FILE_CITY
...
...
@@ -593,7 +595,8 @@
count(1) CREATE_NUM,
min(a.CONTRACT_START) START_DATE,
max(a.CONTRACT_END) END_DATE,
GROUP_CONCAT(concat(a.CONTRACT_START,'~',ifnull(a.CONTRACT_END,'')) ORDER BY a.CONTRACT_START asc) HISTORY
GROUP_CONCAT(concat(a.CONTRACT_START,'~',ifnull(a.CONTRACT_END,'')) ORDER BY a.CONTRACT_START asc) HISTORY,
a.TRY_PERIOD
FROM t_employee_contract_info a
LEFT JOIN sys_area a1 on a1.id=a.FILE_PROVINCE
LEFT JOIN sys_area a2 on a2.id=a.FILE_CITY
...
...
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