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
41045cb5
Commit
41045cb5
authored
Aug 15, 2024
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.6.8' into MVP1.6.8
parents
6586096d
55da9d06
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
12 deletions
+19
-12
TEmpEducation.java
...ifu/cloud/plus/v1/yifu/archives/entity/TEmpEducation.java
+4
-0
TPreEmpEducation.java
.../cloud/plus/v1/yifu/archives/entity/TPreEmpEducation.java
+5
-4
TPreEmployeeInfo.java
.../cloud/plus/v1/yifu/archives/entity/TPreEmployeeInfo.java
+4
-0
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+3
-5
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+3
-3
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmpEducation.java
View file @
41045cb5
...
...
@@ -76,6 +76,7 @@ public class TEmpEducation extends BaseEntity {
/**
* 入学时间
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
)
@Schema
(
description
=
"入学时间"
)
private
Date
entryDate
;
...
...
@@ -90,6 +91,7 @@ public class TEmpEducation extends BaseEntity {
/**
* 结业日期
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd"
)
@Schema
(
description
=
"结业日期"
)
private
Date
gradutionDate
;
...
...
@@ -97,6 +99,7 @@ public class TEmpEducation extends BaseEntity {
/**
* 学校名称
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@Max
(
value
=
50
)
@Schema
(
description
=
"学校名称"
)
private
String
school
;
...
...
@@ -162,6 +165,7 @@ public class TEmpEducation extends BaseEntity {
/**
* 专业
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@Max
(
value
=
50
)
@Schema
(
description
=
"专业"
)
private
String
major
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TPreEmpEducation.java
View file @
41045cb5
...
...
@@ -19,10 +19,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.entity;
import
com.alibaba.excel.annotation.ExcelIgnore
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -108,6 +105,7 @@ public class TPreEmpEducation extends BaseEntity {
/**
* 入学日期
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@ExcelAttribute
(
name
=
"入学日期"
,
isDate
=
true
)
@ExcelProperty
(
"入学日期"
)
@Schema
(
description
=
"入学日期"
)
...
...
@@ -123,6 +121,7 @@ public class TPreEmpEducation extends BaseEntity {
/**
* 结业日期
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@ExcelAttribute
(
name
=
"结业日期"
,
isDate
=
true
)
@ExcelProperty
(
"结业日期"
)
@Schema
(
description
=
"结业日期"
)
...
...
@@ -130,6 +129,7 @@ public class TPreEmpEducation extends BaseEntity {
/**
* 学校名称
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@ExcelAttribute
(
name
=
"学校名称"
,
maxLength
=
64
)
@Length
(
max
=
64
,
message
=
"学校名称不能超过64个字符"
)
@ExcelProperty
(
"学校名称"
)
...
...
@@ -210,6 +210,7 @@ public class TPreEmpEducation extends BaseEntity {
/**
* 专业
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@ExcelAttribute
(
name
=
"专业"
,
maxLength
=
64
)
@Length
(
max
=
64
,
message
=
"专业不能超过64个字符"
)
@ExcelProperty
(
"专业"
)
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TPreEmployeeInfo.java
View file @
41045cb5
...
...
@@ -246,6 +246,7 @@ public class TPreEmployeeInfo extends BaseEntity {
/**
* 学校
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@ExcelAttribute
(
name
=
"学校"
,
maxLength
=
50
)
@Length
(
max
=
50
,
message
=
"学校不能超过50个字符"
)
@ExcelProperty
(
"学校"
)
...
...
@@ -254,6 +255,7 @@ public class TPreEmployeeInfo extends BaseEntity {
/**
* 专业
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@ExcelAttribute
(
name
=
"专业"
,
maxLength
=
50
)
@Length
(
max
=
50
,
message
=
"专业不能超过50个字符"
)
@ExcelProperty
(
"专业"
)
...
...
@@ -262,6 +264,7 @@ public class TPreEmployeeInfo extends BaseEntity {
/**
* 入学时间
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@ExcelAttribute
(
name
=
"入学时间"
,
isDate
=
true
)
@ExcelProperty
(
"入学时间"
)
@Schema
(
description
=
"入学时间"
)
...
...
@@ -269,6 +272,7 @@ public class TPreEmployeeInfo extends BaseEntity {
/**
* 毕业时间
*/
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@ExcelAttribute
(
name
=
"毕业时间"
,
isDate
=
true
)
@ExcelProperty
(
"毕业时间"
)
@Schema
(
description
=
"毕业时间"
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
41045cb5
...
...
@@ -999,10 +999,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmpEducation
.
setCreateTime
(
LocalDateTime
.
now
());
tPreEmpEducationService
.
saveOrUpdate
(
tPreEmpEducation
);
// 附件
tAttaInfoService
.
deleteByDomainIdAndType
(
tPreEmpEducation
.
getId
(),
0
);
if
(
tPreEmpEducation
.
getAttaList
()
!=
null
&&
!
tPreEmpEducation
.
getAttaList
().
isEmpty
())
{
List
<
TAttaInfo
>
attaList
=
tPreEmpEducation
.
getAttaList
();
if
(
attaList
!=
null
)
{
tAttaInfoService
.
deleteByDomainIdAndType
(
tPreEmpEducation
.
getId
(),
0
);
for
(
TAttaInfo
atta
:
attaList
)
{
atta
.
setId
(
null
);
atta
.
setDomainId
(
tPreEmpEducation
.
getId
());
...
...
@@ -1386,13 +1386,11 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tEmpEducation
.
setCreateTime
(
LocalDateTime
.
now
());
}
tEmpEducationService
.
saveOrUpdate
(
tEmpEducation
);
String
attaId
=
tPreEmpEducation
.
getOldId
();
tAttaInfoService
.
deleteByDomainIdAndType
(
attaId
,
0
);
if
(
tPreEmpEducation
.
getAttaList
()
!=
null
&&
!
tPreEmpEducation
.
getAttaList
().
isEmpty
())
{
List
<
TAttaInfo
>
attaList
=
tPreEmpEducation
.
getAttaList
();
if
(
attaList
!=
null
)
{
String
attaId
=
tPreEmpEducation
.
getOldId
();
tAttaInfoService
.
deleteByDomainIdAndType
(
attaId
,
0
);
TAttaInfo
newEmpAtta
;
for
(
TAttaInfo
atta
:
attaList
)
{
newEmpAtta
=
new
TAttaInfo
();
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
41045cb5
...
...
@@ -1399,7 +1399,7 @@
<!-- hgw 2024-5-10 10:42:33 社保士兵列表查询 -->
<select
id=
"getTSocialSoldierHandlePage"
resultMap=
"socialSoldierPageMap"
>
SELECT
a.
ID,
SUBSTRING_INDEX(GROUP_CONCAT(a.ID ORDER BY a.CREATE_TIME desc),',',1)
ID,
a.EMP_ID,
a.EMP_NAME,
a.EMP_NO,
...
...
@@ -1408,8 +1408,8 @@
a.EMP_MOBILE,
a.EMP_NATIONAL,
a.STATUS,
a.
TYPE,
a.
SOCIAL_ID,
SUBSTRING_INDEX(GROUP_CONCAT(a.TYPE ORDER BY a.CREATE_TIME desc),',',1)
TYPE,
SUBSTRING_INDEX(GROUP_CONCAT(a.SOCIAL_ID ORDER BY a.CREATE_TIME desc),',',1)
SOCIAL_ID,
a.FUND_ID,
a.TYPE_SUB,
a.PROCESS_INST_ID,
...
...
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