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
96fc74b9
Commit
96fc74b9
authored
Feb 27, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.20' into MVP1.7.20
parents
2739f374
dcc34958
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
249 additions
and
33 deletions
+249
-33
TAutoContractRuleInfo.java
...d/plus/v1/yifu/archives/entity/TAutoContractRuleInfo.java
+1
-1
EmployeeContractVO.java
...fu/cloud/plus/v1/yifu/archives/vo/EmployeeContractVO.java
+2
-0
EmployeeConstants.java
...ud/plus/v1/yifu/archives/constants/EmployeeConstants.java
+1
-0
TEmployeeContractPreNewController.java
...rchives/controller/TEmployeeContractPreNewController.java
+24
-0
TEmployeeContractPreNewService.java
...yifu/archives/service/TEmployeeContractPreNewService.java
+4
-0
TEmpContractAlertServiceImpl.java
...u/archives/service/impl/TEmpContractAlertServiceImpl.java
+1
-1
TEmployeeContractPreNewServiceImpl.java
...ives/service/impl/TEmployeeContractPreNewServiceImpl.java
+199
-28
TEmployeeContractPreMapper.xml
.../src/main/resources/mapper/TEmployeeContractPreMapper.xml
+1
-1
TEmployeeContractPreNewMapper.xml
...c/main/resources/mapper/TEmployeeContractPreNewMapper.xml
+1
-2
DateUtil.java
...om/yifu/cloud/plus/v1/yifu/common/core/util/DateUtil.java
+15
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TAutoContractRuleInfo.java
View file @
96fc74b9
...
@@ -88,7 +88,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
...
@@ -88,7 +88,7 @@ public class TAutoContractRuleInfo extends BaseEntity {
@Schema
(
description
=
"确认签署时间"
)
@Schema
(
description
=
"确认签署时间"
)
private
String
confirmSignDate
;
private
String
confirmSignDate
;
/**
/**
* 续签合同发起时间类型 0 上一份合同到期前一个月
* 续签合同发起时间类型 0 上一份合同到期前一个月
最新更新为:0 上一份合同到期前第5个工作日 1 上一份合同到期后第10个工作日
*/
*/
@ExcelAttribute
(
name
=
"续签合同发起时间类型 "
)
@ExcelAttribute
(
name
=
"续签合同发起时间类型 "
)
@ExcelProperty
(
"续签合同发起时间类型 "
)
@ExcelProperty
(
"续签合同发起时间类型 "
)
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeContractVO.java
View file @
96fc74b9
...
@@ -276,4 +276,6 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
...
@@ -276,4 +276,6 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@Schema
(
description
=
"自动化提交人"
)
@Schema
(
description
=
"自动化提交人"
)
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
String
reNewSubmitter
;
private
String
reNewSubmitter
;
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeConstants.java
View file @
96fc74b9
...
@@ -106,4 +106,5 @@ public class EmployeeConstants {
...
@@ -106,4 +106,5 @@ public class EmployeeConstants {
public
static
final
String
DATA_CONTRACT_CANCEL_MUST_OFFLINE_SIGN
=
"系统自动撤销签署必须走线下签!"
;
public
static
final
String
DATA_CONTRACT_CANCEL_MUST_OFFLINE_SIGN
=
"系统自动撤销签署必须走线下签!"
;
public
static
final
String
DATA_CONTRACT_EXPECTED_SIGN_TIME_ERROR
=
"待续签合同超期一个月,需走线下签"
;
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractPreNewController.java
View file @
96fc74b9
...
@@ -23,6 +23,8 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
...
@@ -23,6 +23,8 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractPreNew
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractPreNew
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeContractPreNewService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeContractPreNewService
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
import
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
...
@@ -33,6 +35,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
...
@@ -33,6 +35,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.text.ParseException
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
...
@@ -320,4 +324,24 @@ public class TEmployeeContractPreNewController {
...
@@ -320,4 +324,24 @@ public class TEmployeeContractPreNewController {
public
R
getContractTerm
(
@RequestParam
String
startDate
,
@RequestParam
String
endDate
)
{
public
R
getContractTerm
(
@RequestParam
String
startDate
,
@RequestParam
String
endDate
)
{
return
tEmployeeContractPreNewService
.
getContractTerm
(
startDate
,
endDate
);
return
tEmployeeContractPreNewService
.
getContractTerm
(
startDate
,
endDate
);
}
}
/**
* @Author fxj
* @Description 通过配置找到合同预计发起时间
* @Date 19:19 2026/2/10
**/
@Operation
(
description
=
"通过配置找到合同预计发起时间"
)
@GetMapping
(
"/getPreDateByConfigId"
)
public
R
getPreDateByConfigId
(
@RequestParam
String
configId
,
@RequestParam
String
endDate
)
{
if
(!
Common
.
isNotNull
(
configId
)
||
!
Common
.
isNotNull
(
endDate
)){
return
R
.
failed
();
}
Date
temp
=
null
;
try
{
temp
=
DateUtil
.
parseDate
(
endDate
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
);
}
catch
(
ParseException
e
)
{
return
R
.
failed
();
}
return
R
.
ok
(
tEmployeeContractPreNewService
.
getPreDateByConfigId
(
configId
,
temp
));
}
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeContractPreNewService.java
View file @
96fc74b9
...
@@ -29,6 +29,8 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
...
@@ -29,6 +29,8 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.InputStream
;
import
java.io.InputStream
;
import
java.time.LocalDate
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -79,4 +81,6 @@ public interface TEmployeeContractPreNewService extends IService<TEmployeeContra
...
@@ -79,4 +81,6 @@ public interface TEmployeeContractPreNewService extends IService<TEmployeeContra
R
<
Integer
>
getDetailListCount
(
ContractAlertSearchVo
tEmployeeContractPreNew
);
R
<
Integer
>
getDetailListCount
(
ContractAlertSearchVo
tEmployeeContractPreNew
);
R
getContractTerm
(
String
startDate
,
String
endDate
);
R
getContractTerm
(
String
startDate
,
String
endDate
);
LocalDate
getPreDateByConfigId
(
String
configId
,
Date
contractEnd
);
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContractAlertServiceImpl.java
View file @
96fc74b9
...
@@ -1126,7 +1126,7 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
...
@@ -1126,7 +1126,7 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
@Override
@Override
public
Integer
getTEmpContractAlertAutoCount
(
ContractAlertSearchVo
tEmpContractAlert
)
{
public
Integer
getTEmpContractAlertAutoCount
(
ContractAlertSearchVo
tEmpContractAlert
)
{
// 如果查询条件续签状态为空默认查询 非已完成 状态数据
// 如果查询条件续签状态为空默认查询 非已完成 状态数据
if
(
Common
.
isNotNull
(
tEmpContractAlert
.
getProcessStatusList
())){
if
(
!
Common
.
isNotNull
(
tEmpContractAlert
.
getProcessStatusList
())){
tEmpContractAlert
.
setProcessStatusList
(
Stream
.
of
(
"0"
,
"1"
,
"2"
,
"3"
,
"4"
,
"5"
,
"6"
,
"7"
,
"8"
,
"10"
,
"11"
).
collect
(
Collectors
.
toList
()));
tEmpContractAlert
.
setProcessStatusList
(
Stream
.
of
(
"0"
,
"1"
,
"2"
,
"3"
,
"4"
,
"5"
,
"6"
,
"7"
,
"8"
,
"10"
,
"11"
).
collect
(
Collectors
.
toList
()));
}
}
//初始化客服的项目权限 ,管理员及SSC 全量
//初始化客服的项目权限 ,管理员及SSC 全量
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreNewServiceImpl.java
View file @
96fc74b9
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreMapper.xml
View file @
96fc74b9
...
@@ -399,7 +399,7 @@
...
@@ -399,7 +399,7 @@
a.emp_idcard empIdcard,
a.emp_idcard empIdcard,
a.dept_no deptNo,
a.dept_no deptNo,
a.situation,
a.situation,
a.contract_
typ
e contractName,
a.contract_
nam
e contractName,
a.CONTRACT_SUB_NAME contractSubName,
a.CONTRACT_SUB_NAME contractSubName,
null reason,
null reason,
a.signatory contractParty,
a.signatory contractParty,
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreNewMapper.xml
View file @
96fc74b9
...
@@ -658,8 +658,7 @@
...
@@ -658,8 +658,7 @@
a.emp_idcard empIdcard,
a.emp_idcard empIdcard,
a.dept_no deptNo,
a.dept_no deptNo,
a.situation,
a.situation,
a.contract_type contractName,
a.contract_name contractName,
a.contract_term contractType,
a.CONTRACT_SUB_NAME contractSubName,
a.CONTRACT_SUB_NAME contractSubName,
null reason,
null reason,
a.signatory contractParty,
a.signatory contractParty,
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/DateUtil.java
View file @
96fc74b9
...
@@ -1997,6 +1997,21 @@ public class DateUtil {
...
@@ -1997,6 +1997,21 @@ public class DateUtil {
return
false
;
return
false
;
}
}
/**
* @Author fxj
* @Description LocalDate 转 Date 类型
* @Date 19:42 2026/2/26
* @Param
* @return
**/
public
static
Date
getDateByLocalDate
(
LocalDate
date
)
{
if
(
date
==
null
)
{
return
null
;
// 输入为空时直接返回 null
}
// 使用系统默认时区将 LocalDate 转换为 Date
return
Date
.
from
(
date
.
atStartOfDay
(
ZoneId
.
systemDefault
()).
toInstant
());
}
/**
/**
* 日期月份类型枚举
* 日期月份类型枚举
*/
*/
...
...
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