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
0efa9b10
Commit
0efa9b10
authored
Apr 02, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.9-学校
parent
15550728
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
0 deletions
+9
-0
DispatchEmpVo.java
...om/yifu/cloud/plus/v1/yifu/archives/vo/DispatchEmpVo.java
+3
-0
TEmployeeInfoMapper.xml
...ves-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
+3
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+3
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/DispatchEmpVo.java
View file @
0efa9b10
...
...
@@ -211,4 +211,7 @@ public class DispatchEmpVo implements Serializable {
@ExcelProperty
(
value
=
"试用期"
)
private
String
tryPeriod
;
@ExcelProperty
(
value
=
"学校"
)
private
String
school
;
}
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @
0efa9b10
...
...
@@ -198,6 +198,7 @@
<result
property=
"post"
column=
"POST"
/>
<result
property=
"empNo"
column=
"EMP_NO"
/>
<result
property=
"tryPeriod"
column=
"TRY_PERIOD"
/>
<result
property=
"school"
column=
"school"
/>
</resultMap>
<sql
id=
"baseParam"
>
...
...
@@ -970,9 +971,11 @@
c.UNIT_NAME,
c.UNIT_NO,c.DEPT_ID,c.DEPT_NAME,c.DEPT_NO,c.POST,c.EMP_NO,c.PROJECT_STATUS,c.EMP_NATRUE,c.TRY_PERIOD
,a.SCHOOL
from (
select e.ID,e.EMP_CODE,e.EMP_NAME,e.EMP_IDCARD,e.EMP_NATIONAL,e.EMP_PHONE,e.ID_PROVINCE,e.ID_CITY,
e.ID_TOWN,e.EMP_REGIS_TYPE,e.FILE_PROVINCE,e.FILE_CITY,e.FILE_TOWN,e.HIGN_EDUCATION,e.FILE_STATUS,e.CONTACT_ADDRESS
,e.SCHOOL
from t_employee_info e
where 1=1 and e.DELETE_FLAG = '0'
<if
test=
"checkVo != null"
>
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
0efa9b10
...
...
@@ -1402,6 +1402,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dispatch
.
setIdCardCity
(
Common
.
isNotNullToStr
(
empVo
.
getIdCity
()));
dispatch
.
setIdCardTown
(
Common
.
isNotNullToStr
(
empVo
.
getIdTown
()));
}
if
(
Common
.
isEmpty
(
dispatch
.
getSchoolName
()))
{
dispatch
.
setSchoolName
(
empVo
.
getSchool
());
}
}
// 生成申请编码
...
...
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