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
3e18fa65
Commit
3e18fa65
authored
Mar 10, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7
parents
a0398312
14113e5e
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
26 additions
and
21 deletions
+26
-21
EmployeeConstants.java
...ud/plus/v1/yifu/archives/constants/EmployeeConstants.java
+1
-0
TEmployeeInfoServiceImpl.java
.../yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
+0
-6
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+16
-5
EmployeeRegistrationExportVo.java
...fu/cloud/plus/v1/csp/vo/EmployeeRegistrationExportVo.java
+1
-1
EmployeeRegistrationHrExportVo.java
.../cloud/plus/v1/csp/vo/EmployeeRegistrationHrExportVo.java
+1
-1
application.yml
...social/yifu-social-biz/src/main/resources/application.yml
+1
-1
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+6
-7
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeConstants.java
View file @
3e18fa65
...
...
@@ -13,6 +13,7 @@ public class EmployeeConstants {
public
static
final
String
VALIDITY_END
=
"身份证截止日期必填"
;
public
static
final
String
VALIDITY_END_FORMAT
=
"身份证截止日期只能为日期格式:yyyy-MM-dd或者固定值:长期"
;
public
static
final
String
EMP_VALIDITY_END_START_DATE
=
"身份证截止日期不能小于等于身份证开始日期"
;
public
static
final
String
EMP_VALIDITY_DATE_ERROR
=
"身份证截止日期或开始日期有误,请检查修改后导入"
;
public
static
final
String
EMP_NATIONAL
=
"民族必填"
;
public
static
final
String
ID_PROVINCE
=
"户籍所在地必填"
;
public
static
final
String
FILE_PROVINCE
=
"档案所在地(省市)必填"
;
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @
3e18fa65
...
...
@@ -1148,12 +1148,6 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
errorMsg
.
add
(
EmployeeConstants
.
VALIDITY_END_FORMAT
);
errorMsgMap
.
put
(
lineNum
,
new
ErrorMessage
(
EmployeeConstants
.
VALIDITY_END_FORMAT
));
}
// 身份证起止有效期 都有值 且 截止日期正常
if
(
Common
.
isNotNull
(
employeeInfo
.
getValidityStart
())
&&
Common
.
isNotNull
(
employeeInfo
.
getValidityEnd
())
&&
!
"长期"
.
equals
(
employeeInfo
.
getValidityEnd
())
&&
DateUtil
.
checkStringToDate
(
employeeInfo
.
getValidityEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
&&
employeeInfo
.
getValidityStart
().
after
(
DateUtil
.
stringToDate
(
employeeInfo
.
getValidityEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))){
}
}
@Override
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
3e18fa65
...
...
@@ -3333,6 +3333,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
Map
<
String
,
String
>
parentAreaMap
=
new
HashMap
<>();
Map
<
String
,
Date
>
startDateMap
;
int
lineNum
=
2
;
Date
date1
;
Date
date2
;
for
(
Map
<
String
,
String
>
rowMap
:
vo
.
getContentList
())
{
curVo
=
null
;
errorMust
=
new
StringBuilder
();
...
...
@@ -3502,11 +3504,20 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
// 身份证起止有效期 都有值 且 截止日期正常
if
(
Common
.
isNotNull
(
detail
.
getValidityStart
())
&&
Common
.
isNotNull
(
detail
.
getValidityEnd
())
&&
!
"长期"
.
equals
(
detail
.
getValidityEnd
())
&&
!
DateUtil
.
stringToDate
(
detail
.
getValidityEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
.
after
(
DateUtil
.
stringToDate
(
detail
.
getValidityStart
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))){
detail
.
setErrorInfo
(
EmployeeConstants
.
EMP_VALIDITY_END_START_DATE
);
&&
Common
.
isNotNull
(
detail
.
getValidityEnd
())){
date1
=
DateUtil
.
stringToDate
(
detail
.
getValidityStart
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
);
date2
=
DateUtil
.
stringToDate
(
detail
.
getValidityEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
);
if
(
null
==
date1
||
null
==
date2
){
detail
.
setErrorInfo
(
EmployeeConstants
.
EMP_VALIDITY_DATE_ERROR
);
}
else
{
if
(!
"长期"
.
equals
(
detail
.
getValidityEnd
())
&&
!
DateUtil
.
stringToDate
(
detail
.
getValidityEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
.
after
(
DateUtil
.
stringToDate
(
detail
.
getValidityStart
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))){
detail
.
setErrorInfo
(
EmployeeConstants
.
EMP_VALIDITY_END_START_DATE
);
}
}
}
excelList
.
add
(
detail
);
}
...
...
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationExportVo.java
View file @
3e18fa65
...
...
@@ -17,7 +17,7 @@ import java.util.Date;
* @date 2025-02-25 14:48:11
*/
@Data
@ColumnWidth
(
1
2
)
@ColumnWidth
(
1
5
)
public
class
EmployeeRegistrationExportVo
implements
Serializable
{
@ExcelAttribute
(
name
=
"员工姓名"
)
...
...
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/vo/EmployeeRegistrationHrExportVo.java
View file @
3e18fa65
...
...
@@ -17,7 +17,7 @@ import java.util.Date;
* @date 2025-02-25 14:48:11
*/
@Data
@ColumnWidth
(
1
2
)
@ColumnWidth
(
1
5
)
public
class
EmployeeRegistrationHrExportVo
implements
Serializable
{
@ExcelAttribute
(
name
=
"项目编码"
)
...
...
yifu-social/yifu-social-biz/src/main/resources/application.yml
View file @
3e18fa65
...
...
@@ -26,7 +26,7 @@ mybatis-plus:
logic-not-delete-value
:
0
configuration
:
map-underscore-to-camel-case
:
true
#
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
log-impl
:
org.apache.ibatis.logging.stdout.StdOutImpl
# spring security 配置
security
:
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
3e18fa65
...
...
@@ -1476,7 +1476,6 @@
1=1
<include
refid=
"tPaymentInfo_where"
/>
</where>
ORDER BY a.CREATE_TIME desc
</select>
<select
id=
"getTPaymentInfoPageIds"
resultType=
"java.lang.String"
>
SELECT
...
...
@@ -1682,18 +1681,18 @@
<choose>
<when
test=
"tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != '' and tPaymentInfo.socialHousehold == null"
>
CONCAT( a.EMP_IDCARD, '_', a.PROVIDENT_PAY_MONTH, '_', a.PROVIDENT_CREATE_MONTH) AS keyGroup,
a.PROVIDENT_PAY_MONTH as
SOCIAL_PAY_MONTH,
a.PROVIDENT_CREATE_MONTH as
SOCIAL_CREATE_MONTH,
IFNULL(a.PROVIDENT_PAY_MONTH,a.SOCIAL_PAY_MONTH) as
SOCIAL_PAY_MONTH,
IFNULL(a.PROVIDENT_CREATE_MONTH,a.SOCIAL_CREATE_MONTH) as
SOCIAL_CREATE_MONTH,
</when>
<when
test=
"tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''"
>
CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH) AS keyGroup,
a.
SOCIAL_PAY_MONTH,
a.
SOCIAL_CREATE_MONTH,
IFNULL(a.SOCIAL_PAY_MONTH,a.PROVIDENT_PAY_MONTH) as
SOCIAL_PAY_MONTH,
IFNULL(a.SOCIAL_CREATE_MONTH,a.PROVIDENT_CREATE_MONTH) as
SOCIAL_CREATE_MONTH,
</when>
<otherwise>
CONCAT( a.EMP_IDCARD, '_', a.SOCIAL_PAY_MONTH, '_', a.SOCIAL_CREATE_MONTH) AS keyGroup,
a.
SOCIAL_PAY_MONTH,
a.
SOCIAL_CREATE_MONTH,
IFNULL(a.SOCIAL_PAY_MONTH,a.PROVIDENT_PAY_MONTH) as
SOCIAL_PAY_MONTH,
IFNULL(a.SOCIAL_CREATE_MONTH,a.PROVIDENT_CREATE_MONTH) as
SOCIAL_CREATE_MONTH,
</otherwise>
</choose>
a.EMP_NAME,
...
...
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