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
773bd917
Commit
773bd917
authored
May 22, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.23' into MVP1.7.23
parents
31402687
189b8b73
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
361 additions
and
58 deletions
+361
-58
TAutoMainRelExportVo.java
.../cloud/plus/v1/yifu/archives/vo/TAutoMainRelExportVo.java
+15
-1
TAutoMainRelServiceImpl.java
...1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
+38
-3
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+4
-2
TAutoMainRelMapper.xml
...ives-biz/src/main/resources/mapper/TAutoMainRelMapper.xml
+6
-0
ErrorCodes.java
.../cloud/plus/v1/yifu/common/core/exception/ErrorCodes.java
+5
-0
messages_zh_CN.properties
...on-core/src/main/resources/i18n/messages_zh_CN.properties
+2
-0
SecurityUtils.java
...loud/plus/v1/yifu/common/security/util/SecurityUtils.java
+2
-2
RegistConstants.java
...com/yifu/cloud/plus/v1/csp/constants/RegistConstants.java
+2
-0
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+17
-22
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+270
-28
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TAutoMainRelExportVo.java
View file @
773bd917
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.format.DateTimeFormat
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
com.alibaba.excel.annotation.write.style.ColumnWidth
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.alibaba.excel.annotation.write.style.HeadStyle
;
import
com.alibaba.excel.annotation.write.style.HeadStyle
;
...
@@ -25,6 +26,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
...
@@ -25,6 +26,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
@@ -34,6 +36,7 @@ import org.hibernate.validator.constraints.Length;
...
@@ -34,6 +36,7 @@ import org.hibernate.validator.constraints.Length;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotBlank
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.time.LocalDateTime
;
import
java.util.Date
;
import
java.util.Date
;
/**
/**
...
@@ -107,6 +110,7 @@ public class TAutoMainRelExportVo implements Serializable {
...
@@ -107,6 +110,7 @@ public class TAutoMainRelExportVo implements Serializable {
* 非数据库字段,查询时动态生成
* 非数据库字段,查询时动态生成
*/
*/
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
@ExcelProperty
(
"限制项"
)
@Schema
(
description
=
"限制项显示(拼接后的服务项目名称)"
)
@Schema
(
description
=
"限制项显示(拼接后的服务项目名称)"
)
private
String
restrictItemsDisplay
;
private
String
restrictItemsDisplay
;
...
@@ -116,4 +120,14 @@ public class TAutoMainRelExportVo implements Serializable {
...
@@ -116,4 +120,14 @@ public class TAutoMainRelExportVo implements Serializable {
@Schema
(
description
=
"自动化配置项列表(记录配置了哪些服务项目)"
)
@Schema
(
description
=
"自动化配置项列表(记录配置了哪些服务项目)"
)
private
String
autoConfigItemsDisplay
;
private
String
autoConfigItemsDisplay
;
}
/**
\ No newline at end of file
* 创建时间
*/
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"创建时间"
)
@Schema
(
description
=
"创建时间"
)
@DateTimeFormat
(
"yyyy-MM-dd HH:mm:ss"
)
@ColumnWidth
(
18
)
private
LocalDateTime
createTime
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
View file @
773bd917
...
@@ -2177,6 +2177,7 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
...
@@ -2177,6 +2177,7 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
ErrorMessage
errorMessage
=
excelUtil
.
checkEntity
(
excel
,
rowNum
);
ErrorMessage
errorMessage
=
excelUtil
.
checkEntity
(
excel
,
rowNum
);
if
(
Common
.
isNotNull
(
errorMessage
))
{
if
(
Common
.
isNotNull
(
errorMessage
))
{
errorMessage
.
setData
(
excel
);
errorMessageList
.
add
(
errorMessage
);
errorMessageList
.
add
(
errorMessage
);
continue
;
continue
;
}
}
...
@@ -2232,9 +2233,43 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
...
@@ -2232,9 +2233,43 @@ private R<Boolean> checkItemRepeat(List<SysAutoDictItem> autoDictItems, Map<Stri
// 获取当前要设置的值(使用Excel中的值,如果为null则使用实体当前值)
// 获取当前要设置的值(使用Excel中的值,如果为null则使用实体当前值)
String
newAutoFlag
=
Common
.
isNotNull
(
excel
.
getAutoFlag
())
?
excel
.
getAutoFlag
()
:
entity
.
getAutoFlag
();
String
newAutoFlag
=
Common
.
isNotNull
(
excel
.
getAutoFlag
())
?
excel
.
getAutoFlag
()
:
entity
.
getAutoFlag
();
String
newRestrictArchive
=
null
==
excel
.
getRestrictArchive
()?
CommonConstants
.
ZERO_STRING
:
excel
.
getRestrictArchive
();
String
newRestrictArchive
=
null
==
excel
.
getRestrictArchive
()?
CommonConstants
.
ZERO_STRING
:
excel
.
getRestrictArchive
();
String
newRestrictInsurance
=
null
==
excel
.
getRestrictInsurance
()
?
CommonConstants
.
ZERO_STRING
:
excel
.
getRestrictInsurance
();
String
newRestrictInsurance
=
excel
.
getRestrictInsurance
();
String
newRestrictContract
=
null
==
excel
.
getRestrictContract
()?
CommonConstants
.
ZERO_STRING
:
excel
.
getRestrictContract
();
String
newRestrictContract
=
excel
.
getRestrictContract
();
String
newRestrictSocialFund
=
null
==
excel
.
getRestrictSocialFund
()?
CommonConstants
.
ZERO_STRING
:
excel
.
getRestrictSocialFund
();
String
newRestrictSocialFund
=
excel
.
getRestrictSocialFund
();
// 校验autoFlag的值必须为0或1
if
(!
CommonConstants
.
ZERO_STRING
.
equals
(
newAutoFlag
)
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
newAutoFlag
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"是否限制值不合法,必须为0或1"
,
excel
));
return
;
}
// 校验restrictInsurance的值必须为0或1
if
(
Common
.
isNotNull
(
newRestrictInsurance
)
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
newRestrictInsurance
)
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
newRestrictInsurance
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"商险限制值不合法,必须为0或1"
,
excel
));
return
;
}
// 校验restrictContract的值必须为0或1
if
(
Common
.
isNotNull
(
newRestrictContract
)
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
newRestrictContract
)
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
newRestrictContract
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"合同限制值不合法,必须为0或1"
,
excel
));
return
;
}
// 校验restrictSocialFund的值必须为0或1
if
(
Common
.
isNotNull
(
newRestrictSocialFund
)
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
newRestrictSocialFund
)
&&
!
CommonConstants
.
ONE_STRING
.
equals
(
newRestrictSocialFund
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"社保公积金限制值不合法,必须为0或1"
,
excel
));
return
;
}
// 业务规则:如果是否限制为"是"(0),各限制分项不能为空,且至少有一项为限制(1)
// 业务规则:如果是否限制为"是"(0),各限制分项不能为空,且至少有一项为限制(1)
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
newAutoFlag
))
{
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
newAutoFlag
))
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
773bd917
...
@@ -188,7 +188,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -188,7 +188,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
return
R
.
failed
(
CommonConstants
.
USER_FAIL
);
return
R
.
failed
(
CommonConstants
.
USER_FAIL
);
}
}
TSettleDomain
domain
=
tSettleDomainService
.
getById
(
tEmployeeContractInfo
.
getSettleDomain
());
TSettleDomain
domain
=
tSettleDomainService
.
getById
(
tEmployeeContractInfo
.
getSettleDomain
());
if
(
Common
.
isNotNull
(
user
)
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
user
.
getSystemFlag
())
&&
null
!=
domain
)
{
if
(
Common
.
isNotNull
(
user
)
&&
null
!=
domain
)
{
// 超管放行,不进行自动化限制检查
// 超管放行,不进行自动化限制检查
if
(!
isSuperAdmin
(
user
))
{
if
(!
isSuperAdmin
(
user
))
{
String
deptNo
=
domain
.
getDepartNo
();
String
deptNo
=
domain
.
getDepartNo
();
...
@@ -1428,6 +1428,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -1428,6 +1428,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
* 项目编码自动化校验缓存,key: deptNo, value: true-已纳入自动化, false-未纳入
* 项目编码自动化校验缓存,key: deptNo, value: true-已纳入自动化, false-未纳入
*/
*/
private
Map
<
String
,
Boolean
>
autoCheckCache
=
new
HashMap
<>();
private
Map
<
String
,
Boolean
>
autoCheckCache
=
new
HashMap
<>();
private
boolean
notSuperAdmin
=
!
isSuperAdmin
(
user
);
@Override
@Override
public
void
invoke
(
EmployeeContractVO
data
,
AnalysisContext
context
)
{
public
void
invoke
(
EmployeeContractVO
data
,
AnalysisContext
context
)
{
...
@@ -1440,7 +1442,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -1440,7 +1442,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
else
{
}
else
{
// 导入时的自动化校验
// 导入时的自动化校验
String
deptNo
=
data
.
getDeptNo
();
String
deptNo
=
data
.
getDeptNo
();
if
(
Common
.
isNotNull
(
deptNo
)
&&
!
isSuperAdmin
(
user
)
)
{
if
(
Common
.
isNotNull
(
deptNo
)
&&
notSuperAdmin
)
{
// 先从缓存中获取
// 先从缓存中获取
Boolean
isAuto
=
autoCheckCache
.
get
(
deptNo
);
Boolean
isAuto
=
autoCheckCache
.
get
(
deptNo
);
if
(
isAuto
==
null
)
{
if
(
isAuto
==
null
)
{
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TAutoMainRelMapper.xml
View file @
773bd917
...
@@ -89,6 +89,11 @@
...
@@ -89,6 +89,11 @@
<if
test=
"tAutoMainRel.createTime != null"
>
<if
test=
"tAutoMainRel.createTime != null"
>
AND a.CREATE_TIME = #{tAutoMainRel.createTime}
AND a.CREATE_TIME = #{tAutoMainRel.createTime}
</if>
</if>
<!-- 创建时间区间查询 -->
<if
test=
"tAutoMainRel.createTimes != null and tAutoMainRel.createTimes.length == 2"
>
AND a.CREATE_TIME
>
= #{tAutoMainRel.createTimes[0]}
AND a.CREATE_TIME
<
= #{tAutoMainRel.createTimes[1]}
</if>
<if
test=
"tAutoMainRel.updateBy != null and tAutoMainRel.updateBy.trim() != ''"
>
<if
test=
"tAutoMainRel.updateBy != null and tAutoMainRel.updateBy.trim() != ''"
>
AND a.UPDATE_BY = #{tAutoMainRel.updateBy}
AND a.UPDATE_BY = #{tAutoMainRel.updateBy}
</if>
</if>
...
@@ -245,6 +250,7 @@
...
@@ -245,6 +250,7 @@
SELECT
SELECT
a.RULE_UPDATE_TIME,
a.RULE_UPDATE_TIME,
a.RULE_UPDATE_PERSON,
a.RULE_UPDATE_PERSON,
a.CREATE_TIME,
b.DEPART_NAME,
b.DEPART_NAME,
IFNULL(b.cs_name,'') csUserName,
IFNULL(b.cs_name,'') csUserName,
b.DEPART_NO dept_NO,
b.DEPART_NO dept_NO,
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/exception/ErrorCodes.java
View file @
773bd917
...
@@ -490,6 +490,11 @@ public interface ErrorCodes {
...
@@ -490,6 +490,11 @@ public interface ErrorCodes {
* 派增异常: 社保各项基数不一致,委托备注必填
* 派增异常: 社保各项基数不一致,委托备注必填
*/
*/
String
EMP_DISPATCH_SOCIAL_BASE_LIMIT_ERROR
=
"emp.dispatch.social.base.limit.error"
;
String
EMP_DISPATCH_SOCIAL_BASE_LIMIT_ERROR
=
"emp.dispatch.social.base.limit.error"
;
/**
* 派增异常: 社保各项基数与备案基数不一致,自定义类型 备案基数需要与各项基数一致(不含大病)
*/
String
EMP_DISPATCH_SOCIAL_BASE_RECORD_ERROR
=
"emp.dispatch.social.base.record.error"
;
/**
/**
* 派增异常: 社保各项起缴日不一致,委托备注必填
* 派增异常: 社保各项起缴日不一致,委托备注必填
*/
*/
...
...
yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties
View file @
773bd917
...
@@ -178,6 +178,8 @@ emp.dispatch.fund.limit.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u516C\u79EF\u91D1\
...
@@ -178,6 +178,8 @@ emp.dispatch.fund.limit.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u516C\u79EF\u91D1\
emp.dispatch.social.base.limit.error
=
\u
6D3E
\u
589E
\u
5F02
\u
5E38
\u
FF1A
\u5907\u6848\u
57FA
\u6570\u
4E0E
\u
793E
\u
4FDD
\u
4EFB
\u
610F
\u
57FA
\u6570\u
4E0D
\u
4E00
\u
81F4
\u
FF0C
\u
59D4
\u6258\u5907\u
6CE8
\u
5FC5
\u
586B
emp.dispatch.social.base.limit.error
=
\u
6D3E
\u
589E
\u
5F02
\u
5E38
\u
FF1A
\u5907\u6848\u
57FA
\u6570\u
4E0E
\u
793E
\u
4FDD
\u
4EFB
\u
610F
\u
57FA
\u6570\u
4E0D
\u
4E00
\u
81F4
\u
FF0C
\u
59D4
\u6258\u5907\u
6CE8
\u
5FC5
\u
586B
emp.dispatch.social.base.record.error
=
\u
6D3E
\u
589E
\u
5F02
\u
5E38
\u
FF1A
\u
793E
\u
4FDD
\u5404\u9879\u
57FA
\u6570\u
4E0E
\u5907\u6848\u
57FA
\u6570\u
4E0D
\u
4E00
\u
81F4
\u
FF0C
\u
81EA
\u
5B9A
\u
4E49
\u
7C7B
\u
578B
\u5907\u6848\u
57FA
\u6570\u9700\u8981\u
4E0E
\u5404\u9879\u
57FA
\u6570\u
4E00
\u
81F4
\u
FF08
\u
4E0D
\u
542B
\u5927\u
75C5
\u
FF09
emp.dispatch.social.date.limit.error
=
\u
6D3E
\u
589E
\u
5F02
\u
5E38
\u
FF1A
\u
793E
\u
4FDD
\u9669\u
79CD
\u
8D77
\u
7F34
\u
65E5
\u
671F
\u
4E0D
\u
4E00
\u
81F4
\u
65F6
\u
FF0C
\u
201C
\u
59D4
\u6258\u5907\u
6CE8
\u
201D
\u5217\u
5FC5
\u
586B
\u
FF0C
\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
emp.dispatch.social.date.limit.error
=
\u
6D3E
\u
589E
\u
5F02
\u
5E38
\u
FF1A
\u
793E
\u
4FDD
\u9669\u
79CD
\u
8D77
\u
7F34
\u
65E5
\u
671F
\u
4E0D
\u
4E00
\u
81F4
\u
65F6
\u
FF0C
\u
201C
\u
59D4
\u6258\u5907\u
6CE8
\u
201D
\u5217\u
5FC5
\u
586B
\u
FF0C
\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
emp.dispatch.social.date.limit.error2
=
\u
6D3E
\u
589E
\u
5F02
\u
5E38
\u
FF1A
\u5408\u
540C
\u
8D77
\u
59CB
\u
65E5
\u
671F
\u
4E0E
\u
793E
\u
4FDD
\u
8D77
\u
7F34
\u
65E5
\u
671F
\u
4E0D
\u
4E00
\u
81F4
\u
65F6
\u
FF0C
\u
201C
\u
59D4
\u6258\u5907\u
6CE8
\u
201D
\u5217\u
5FC5
\u
586B
\u
FF0C
\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
emp.dispatch.social.date.limit.error2
=
\u
6D3E
\u
589E
\u
5F02
\u
5E38
\u
FF1A
\u5408\u
540C
\u
8D77
\u
59CB
\u
65E5
\u
671F
\u
4E0E
\u
793E
\u
4FDD
\u
8D77
\u
7F34
\u
65E5
\u
671F
\u
4E0D
\u
4E00
\u
81F4
\u
65F6
\u
FF0C
\u
201C
\u
59D4
\u6258\u5907\u
6CE8
\u
201D
\u5217\u
5FC5
\u
586B
\u
FF0C
\u
4E0D
\u
53EF
\u
4E3A
\u
7A7A
...
...
yifu-common/yifu-common-security/src/main/java/com/yifu/cloud/plus/v1/yifu/common/security/util/SecurityUtils.java
View file @
773bd917
...
@@ -117,9 +117,9 @@ public class SecurityUtils {
...
@@ -117,9 +117,9 @@ public class SecurityUtils {
if
(
roleList
==
null
||
roleList
.
isEmpty
())
{
if
(
roleList
==
null
||
roleList
.
isEmpty
())
{
return
false
;
return
false
;
}
}
//
SSC开发组-1668092146875969537L
超管1
// 超管1
for
(
Long
role
:
roleList
)
{
for
(
Long
role
:
roleList
)
{
if
(
role
==
1
668092146875969537L
||
role
==
1
L
)
{
if
(
role
==
1L
)
{
return
true
;
return
true
;
}
}
}
}
...
...
yifu-csp/yifu-csp-api/src/main/java/com/yifu/cloud/plus/v1/csp/constants/RegistConstants.java
View file @
773bd917
...
@@ -19,6 +19,8 @@ public class RegistConstants {
...
@@ -19,6 +19,8 @@ public class RegistConstants {
public
static
final
String
EMP_PROJECT_EXIT_CHECK
=
"未找到该人员对应的在项信息!"
;
public
static
final
String
EMP_PROJECT_EXIT_CHECK
=
"未找到该人员对应的在项信息!"
;
public
static
final
String
EMP_PROJECT_IS_EXIT_CHECK
=
"该人员存在在项的项目档案!"
;
public
static
final
String
EMP_CONTRACT_EXIT_CHECK
=
"已存在流程中的合同待签订数据!"
;
public
static
final
String
EMP_CONTRACT_EXIT_CHECK
=
"已存在流程中的合同待签订数据!"
;
public
static
final
String
CONFIRM_SUBMIT
=
"确认接收"
;
public
static
final
String
CONFIRM_SUBMIT
=
"确认接收"
;
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
773bd917
...
@@ -2156,22 +2156,25 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -2156,22 +2156,25 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
.
eq
(
EmployeeRegistration:
:
getEmpIdcard
,
registration
.
getEmpIdcard
())
.
eq
(
EmployeeRegistration:
:
getEmpIdcard
,
registration
.
getEmpIdcard
())
.
eq
(
EmployeeRegistration:
:
getDeptNo
,
registration
.
getDeptNo
())
.
eq
(
EmployeeRegistration:
:
getDeptNo
,
registration
.
getDeptNo
())
.
eq
(
EmployeeRegistration:
:
getFeedbackType
,
registration
.
getFeedbackType
())
.
eq
(
EmployeeRegistration:
:
getFeedbackType
,
registration
.
getFeedbackType
())
.
orderByDesc
(
EmployeeRegistration:
:
getCreateTime
)
.
in
(
EmployeeRegistration:
:
getProcessStatus
,
CommonConstants
.
processStatus
)
.
in
(
EmployeeRegistration:
:
getProcessStatus
,
CommonConstants
.
processStatus
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
exit
))
{
if
(
Common
.
isNotNull
(
exit
))
{
return
RegistConstants
.
REGIST_SAME_CHECK
;
return
RegistConstants
.
REGIST_SAME_CHECK
;
}
}
//针对入职的判断
是否存在流程中的合同待签订数据
//针对入职的判断
if
(
CommonConstants
.
ONE_STRING
.
equals
(
registration
.
getFeedbackType
()))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
registration
.
getFeedbackType
()))
{
int
nowDay
=
Integer
.
parseInt
(
DateUtil
.
getThisDay
());
int
nowDay
=
Integer
.
parseInt
(
DateUtil
.
getThisDay
());
if
(
Common
.
isNot16Age
(
registration
.
getEmpIdcard
(),
nowDay
))
{
if
(
Common
.
isNot16Age
(
registration
.
getEmpIdcard
(),
nowDay
))
{
return
CommonConstants
.
UNDER_16_ERROR
;
return
CommonConstants
.
UNDER_16_ERROR
;
}
}
//针对入职的判断是否存在在项项目档案
EmpProjectStatusVo
vo
=
new
EmpProjectStatusVo
();
EmpProjectStatusVo
vo
=
new
EmpProjectStatusVo
();
vo
.
setEmpIdcard
(
registration
.
getEmpIdcard
());
vo
.
setEmpIdcard
(
registration
.
getEmpIdcard
());
vo
.
setDeptNo
(
registration
.
getDeptNo
());
vo
.
setDeptNo
(
registration
.
getDeptNo
());
if
(
Boolean
.
TRUE
.
equals
(
checkContractPreIsExit
(
vo
)))
{
EmpProjectStatusVo
exitProject
=
getEmpProjectStatus
(
vo
);
return
RegistConstants
.
EMP_CONTRACT_EXIT_CHECK
;
if
(!
Common
.
isEmpty
(
exitProject
))
{
return
RegistConstants
.
EMP_PROJECT_IS_EXIT_CHECK
;
}
}
}
}
//针对离职的判断人员项目档案状态是否正常
//针对离职的判断人员项目档案状态是否正常
...
@@ -3187,33 +3190,25 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -3187,33 +3190,25 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
//该人员入职/离职数据已登记,请勿重复操作
//该人员入职/离职数据已登记,请勿重复操作
if
(
CommonConstants
.
TWO_STRING
.
equals
(
insert
.
getFeedbackType
())){
exit
=
baseMapper
.
selectOne
(
Wrappers
.<
EmployeeRegistration
>
query
().
lambda
()
exit
=
baseMapper
.
selectOne
(
Wrappers
.<
EmployeeRegistration
>
query
().
lambda
()
.
eq
(
EmployeeRegistration:
:
getEmpIdcard
,
insert
.
getEmpIdcard
())
.
eq
(
EmployeeRegistration:
:
getEmpIdcard
,
insert
.
getEmpIdcard
())
.
eq
(
EmployeeRegistration:
:
getDeptNo
,
insert
.
getDeptNo
())
.
eq
(
EmployeeRegistration:
:
getDeptNo
,
insert
.
getDeptNo
())
.
eq
(
EmployeeRegistration:
:
getFeedbackType
,
insert
.
getFeedbackType
())
.
eq
(
EmployeeRegistration:
:
getFeedbackType
,
insert
.
getFeedbackType
())
.
in
(
EmployeeRegistration:
:
getProcessStatus
,
CommonConstants
.
processStatus
)
.
in
(
EmployeeRegistration:
:
getProcessStatus
,
CommonConstants
.
processStatus
)
.
orderByDesc
(
EmployeeRegistration:
:
getCreateTime
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
else
{
// v1.7.23 新增:已处理 也要拒绝入职
exit
=
baseMapper
.
selectOne
(
Wrappers
.<
EmployeeRegistration
>
query
().
lambda
()
.
eq
(
EmployeeRegistration:
:
getEmpIdcard
,
insert
.
getEmpIdcard
())
.
eq
(
EmployeeRegistration:
:
getDeptNo
,
insert
.
getDeptNo
())
.
eq
(
EmployeeRegistration:
:
getFeedbackType
,
insert
.
getFeedbackType
())
.
in
(
EmployeeRegistration:
:
getProcessStatus
,
Stream
.
of
(
"0"
,
"1"
).
collect
(
Collectors
.
toList
()))
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
if
(
Common
.
isNotNull
(
exit
))
{
if
(
Common
.
isNotNull
(
exit
))
{
errorList
.
add
(
RegistConstants
.
REGIST_SAME_CHECK
);
errorList
.
add
(
RegistConstants
.
REGIST_SAME_CHECK
);
}
}
//针对入职的判断是否存在
流程中的合同待签订数据
//针对入职的判断是否存在
在项项目档案
if
(
CommonConstants
.
ONE_STRING
.
equals
(
insert
.
getFeedbackType
()))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
insert
.
getFeedbackType
()))
{
EmpProjectStatusVo
vo
=
new
EmpProjectStatusVo
();
EmpProjectStatusVo
vo
=
new
EmpProjectStatusVo
();
vo
.
setEmpIdcard
(
insert
.
getEmpIdcard
());
vo
.
setEmpIdcard
(
insert
.
getEmpIdcard
());
vo
.
setDeptNo
(
insert
.
getDeptNo
());
vo
.
setDeptNo
(
insert
.
getDeptNo
());
if
(
Boolean
.
TRUE
.
equals
(
checkContractPreIsExit
(
vo
)))
{
EmpProjectStatusVo
exitProject
=
getEmpProjectStatus
(
vo
);
errorList
.
add
(
RegistConstants
.
EMP_CONTRACT_EXIT_CHECK
);
if
(!
Common
.
isEmpty
(
exitProject
))
{
errorList
.
add
(
RegistConstants
.
EMP_PROJECT_IS_EXIT_CHECK
);
}
}
}
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
773bd917
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