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
20ea9b8c
Commit
20ea9b8c
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
b79e61b6
1ba39a2d
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
388 additions
and
140 deletions
+388
-140
TEmpContractAlert.java
...cloud/plus/v1/yifu/archives/entity/TEmpContractAlert.java
+0
-2
ContractAlertSearchVo.java
...cloud/plus/v1/yifu/archives/vo/ContractAlertSearchVo.java
+21
-2
TEmployeeContractPreNewSearchVo.java
.../v1/yifu/archives/vo/TEmployeeContractPreNewSearchVo.java
+1
-1
TEmployeeContractPreNewController.java
...rchives/controller/TEmployeeContractPreNewController.java
+6
-9
TEmployeeContractPreNewMapper.java
...1/yifu/archives/mapper/TEmployeeContractPreNewMapper.java
+3
-2
TEmployeeContractPreNewService.java
...yifu/archives/service/TEmployeeContractPreNewService.java
+3
-6
TEmpContractAlertServiceImpl.java
...u/archives/service/impl/TEmpContractAlertServiceImpl.java
+7
-1
TEmployeeContractPreNewServiceImpl.java
...ives/service/impl/TEmployeeContractPreNewServiceImpl.java
+36
-8
DoFascTask.java
...om/yifu/cloud/plus/v1/yifu/archives/utils/DoFascTask.java
+4
-0
TEmpContractAlertMapper.xml
...biz/src/main/resources/mapper/TEmpContractAlertMapper.xml
+6
-0
TEmployeeContractPreNewMapper.xml
...c/main/resources/mapper/TEmployeeContractPreNewMapper.xml
+301
-109
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmpContractAlert.java
View file @
20ea9b8c
...
...
@@ -350,7 +350,6 @@ public class TEmpContractAlert extends BaseEntity {
/**
* 前端客服
*/
@TableField
(
exist
=
false
)
@ExcelAttribute
(
name
=
"前端客服"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"前端客服"
)
...
...
@@ -360,7 +359,6 @@ public class TEmpContractAlert extends BaseEntity {
/**
* 前端客服
*/
@TableField
(
exist
=
false
)
@ExcelAttribute
(
name
=
"前端客服"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"前端客服"
)
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/ContractAlertSearchVo.java
View file @
20ea9b8c
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpContractAlert
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
org.hibernate.validator.constraints.Length
;
import
java.time.LocalDateTime
;
import
java.util.List
;
...
...
@@ -27,6 +31,12 @@ public class ContractAlertSearchVo extends TEmpContractAlert {
@Schema
(
description
=
"创建时间区间"
)
private
LocalDateTime
[]
createTimes
;
/**
* 预计合同发起时间区间 [开始时间,结束时间]
*/
@Schema
(
description
=
"预计合同发起时间区间"
)
private
LocalDateTime
[]
startEndTimecreate
;
/**
* @Author fxj
* 查询数据起
...
...
@@ -51,12 +61,12 @@ public class ContractAlertSearchVo extends TEmpContractAlert {
/**
* @Author fxj
* 合同
截止
时间区间查询--开始
* 合同
预计发起
时间区间查询--开始
**/
private
LocalDateTime
expectedCollectionTimeStart
;
/**
* @Author fxj
* 合同
截止
时间区间查询--截止
* 合同
预计发起
时间区间查询--截止
**/
private
LocalDateTime
expectedCollectionTimeEnd
;
...
...
@@ -75,6 +85,15 @@ public class ContractAlertSearchVo extends TEmpContractAlert {
/**
* 合同IDS
*/
@TableField
(
exist
=
false
)
@Schema
(
description
=
"合同IDS"
)
private
List
<
String
>
idList
;
@Schema
(
description
=
"处理状态数组"
)
@TableField
(
exist
=
false
)
private
List
<
String
>
statusList
;
@TableField
(
exist
=
false
)
@Schema
(
description
=
"前端客服"
)
private
String
customerUserLoginname
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmployeeContractPreNewSearchVo.java
View file @
20ea9b8c
...
...
@@ -37,7 +37,7 @@ public class TEmployeeContractPreNewSearchVo extends TEmployeeContractPreNew {
* 多选导出或删除等操作
*/
@Schema
(
description
=
"选中ID,多个逗号分割"
)
private
String
ids
;
private
List
<
String
>
ids
;
/**
* 创建时间区间 [开始时间,结束时间]
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractPreNewController.java
View file @
20ea9b8c
...
...
@@ -22,10 +22,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.service.TEmployeeContractPreNewService
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeAutoRegistRevokeVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPreNewDetailVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPreNewSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPreNewVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
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.security.annotation.Inner
;
...
...
@@ -75,8 +72,8 @@ public class TEmployeeContractPreNewController {
* @return
*/
@Operation
(
description
=
"简单分页查询"
)
@
Ge
tMapping
(
"/getDetailList"
)
public
R
<
List
<
TEmployeeContractPreNewDetailVo
>>
getDetailList
(
TEmployeeContractPreNew
SearchVo
tEmployeeContractPreNew
)
{
@
Pos
tMapping
(
"/getDetailList"
)
public
R
<
List
<
TEmployeeContractPreNewDetailVo
>>
getDetailList
(
@RequestBody
ContractAlert
SearchVo
tEmployeeContractPreNew
)
{
return
tEmployeeContractPreNewService
.
getDetailList
(
tEmployeeContractPreNew
);
}
/**
...
...
@@ -87,8 +84,8 @@ public class TEmployeeContractPreNewController {
* @return
*/
@Operation
(
description
=
"简单分页查询"
)
@
Ge
tMapping
(
"/getDetailListCount"
)
public
R
<
Integer
>
getDetailListCount
(
TEmployeeContractPreNew
SearchVo
tEmployeeContractPreNew
)
{
@
Pos
tMapping
(
"/getDetailListCount"
)
public
R
<
Integer
>
getDetailListCount
(
@RequestBody
ContractAlert
SearchVo
tEmployeeContractPreNew
)
{
return
tEmployeeContractPreNewService
.
getDetailListCount
(
tEmployeeContractPreNew
);
}
...
...
@@ -111,7 +108,7 @@ public class TEmployeeContractPreNewController {
* @param id id
* @return R
*/
@Operation
(
summary
=
"通过id查询"
,
description
=
"通过id查询
:hasPermission('archives_temployeecontractprenew_get')
"
)
@Operation
(
summary
=
"通过id查询"
,
description
=
"通过id查询"
)
@GetMapping
(
"/{id}"
)
public
R
<
TEmployeeContractPreNew
>
getById
(
@PathVariable
(
"id"
)
String
id
)
{
return
R
.
ok
(
tEmployeeContractPreNewService
.
getById
(
id
));
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeContractPreNewMapper.java
View file @
20ea9b8c
...
...
@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractPreNew
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.ContractAlertSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeContractVO
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPreNewDetailVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPreNewSearchVo
;
...
...
@@ -47,9 +48,9 @@ public interface TEmployeeContractPreNewMapper extends BaseMapper<TEmployeeContr
List
<
EmployeeContractVO
>
getDisPatcherContractListRenew
(
@Param
(
"idList"
)
List
<
String
>
idList
,
@Param
(
"statusList"
)
List
<
String
>
statusList
,
@Param
(
"type"
)
String
type
);
List
<
TEmployeeContractPreNewDetailVo
>
getDetailList
(
@Param
(
"tEmp
loyeeContractPreNew"
)
TEmployeeContractPreNew
SearchVo
tEmployeeContractPreNew
);
List
<
TEmployeeContractPreNewDetailVo
>
getDetailList
(
@Param
(
"tEmp
ContractAlert"
)
ContractAlert
SearchVo
tEmployeeContractPreNew
);
List
<
String
>
getUnDispatchList
();
int
getDetailListCount
(
@Param
(
"tEmp
loyeeContractPreNew"
)
TEmployeeContractPreNew
SearchVo
tEmployeeContractPreNew
);
int
getDetailListCount
(
@Param
(
"tEmp
ContractAlert"
)
ContractAlert
SearchVo
tEmployeeContractPreNew
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeContractPreNewService.java
View file @
20ea9b8c
...
...
@@ -23,12 +23,9 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractPre;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractPreNew
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeAutoRegistRevokeVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPreNewDetailVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPreNewVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeeContractPreNewSearchVo
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.InputStream
;
...
...
@@ -71,7 +68,7 @@ public interface TEmployeeContractPreNewService extends IService<TEmployeeContra
R
<
TEmployeeContractPreNew
>
getInfoByPreId
(
String
preId
);
R
<
List
<
TEmployeeContractPreNewDetailVo
>>
getDetailList
(
TEmployeeContractPreNew
SearchVo
tEmployeeContractPreNew
);
R
<
List
<
TEmployeeContractPreNewDetailVo
>>
getDetailList
(
ContractAlert
SearchVo
tEmployeeContractPreNew
);
R
<
TEmployeeContractInfo
>
getRenewContractByPreId
(
String
preId
);
...
...
@@ -79,7 +76,7 @@ public interface TEmployeeContractPreNewService extends IService<TEmployeeContra
void
pushDisConfrimContracts
();
R
<
Integer
>
getDetailListCount
(
TEmployeeContractPreNew
SearchVo
tEmployeeContractPreNew
);
R
<
Integer
>
getDetailListCount
(
ContractAlert
SearchVo
tEmployeeContractPreNew
);
R
getContractTerm
(
String
startDate
,
String
endDate
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpContractAlertServiceImpl.java
View file @
20ea9b8c
...
...
@@ -52,6 +52,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -1088,11 +1089,16 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
@Override
public
IPage
<
ContractAlertAutoVo
>
getTEmpContractAlertAutoPage
(
Page
<
TEmpContractAlert
>
page
,
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
()));
}
//初始化客服的项目权限 ,管理员及SSC 全量
initSearchVo
(
tEmpContractAlert
);
if
(
ArrayUtil
.
isNotEmpty
(
tEmpContractAlert
.
getStartEndTimecreate
())
&&
tEmpContractAlert
.
getStartEndTimecreate
().
length
==
2
)
{
tEmpContractAlert
.
setExpectedCollectionTimeStart
(
tEmpContractAlert
.
getStartEndTimecreate
()[
0
]);
tEmpContractAlert
.
setExpectedCollectionTimeEnd
(
tEmpContractAlert
.
getStartEndTimecreate
()[
1
]);
}
return
baseMapper
.
getTEmpContractAlertAutoPage
(
page
,
tEmpContractAlert
);
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreNewServiceImpl.java
View file @
20ea9b8c
...
...
@@ -59,6 +59,7 @@ import javax.servlet.ServletOutputStream;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.IOException
;
import
java.net.URLEncoder
;
import
java.text.ParseException
;
import
java.time.LocalDate
;
import
java.time.ZoneId
;
import
java.util.*
;
...
...
@@ -187,7 +188,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
@Override
public
List
<
TEmployeeContractPreNew
>
noPageDiy
(
TEmployeeContractPreNewSearchVo
searchVo
)
{
LambdaQueryWrapper
<
TEmployeeContractPreNew
>
wrapper
=
buildQueryWrapper
(
searchVo
);
List
<
String
>
idList
=
Common
.
getList
(
searchVo
.
getIds
()
);
List
<
String
>
idList
=
searchVo
.
getIds
(
);
if
(
Common
.
isNotNull
(
idList
))
{
wrapper
.
in
(
TEmployeeContractPreNew:
:
getId
,
idList
);
}
...
...
@@ -200,7 +201,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
private
Long
noPageCountDiy
(
TEmployeeContractPreNewSearchVo
searchVo
)
{
LambdaQueryWrapper
<
TEmployeeContractPreNew
>
wrapper
=
buildQueryWrapper
(
searchVo
);
List
<
String
>
idList
=
Common
.
getList
(
searchVo
.
getIds
()
);
List
<
String
>
idList
=
searchVo
.
getIds
(
);
if
(
Common
.
isNotNull
(
idList
))
{
wrapper
.
in
(
TEmployeeContractPreNew:
:
getId
,
idList
);
}
...
...
@@ -405,7 +406,16 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
}
//续签合同发起时间类型 :0 上一份合同到期前一个月
if
(
null
!=
rule
&&
CommonConstants
.
ZERO_STRING
.
equals
(
rule
.
getRenewalDateType
())
&&
null
!=
contract
.
getContractEnd
()){
pre
.
setExpectedCollectionTime
(
DateUtil
.
addDayByDate
(
DateUtil
.
addMonthByDate
(
contract
.
getContractEnd
(),-
1
),-
1
));
Date
dateTemp
=
null
;
try
{
dateTemp
=
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
contract
.
getContractEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
" 15:20"
,
DateUtil
.
DATETIME_PATTERN_MINUTE
);
}
catch
(
ParseException
e
)
{
dateTemp
=
new
Date
();
}
if
(
null
!=
dateTemp
){
pre
.
setExpectedCollectionTime
(
DateUtil
.
addDayByDate
(
DateUtil
.
addMonthByDate
(
dateTemp
,-
1
),-
1
));
}
}
preList
.
add
(
pre
);
}
...
...
@@ -498,6 +508,9 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
/**
* @Author fxj
* @Description 合同续签待签订信息单个/批量发起签署任务
*定时任务:1、每日定时发起合同签署任务-11:00、15:00、15:20——工作日,
* 会将发起失败、签署失败、审核不通过的“预计合同发起时间”为当日及之前日期的(空白的不在)
* 合同续签任务自动尝试发起,若发起失败后,将统一推送移动端消息提醒,并在续签待办列表,状态处增加小问号,可查询失败原因;
* @Date 18:35 2026/2/9
* @param type 1 手动 2 自动
**/
...
...
@@ -1505,21 +1518,35 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
}
@Override
public
R
<
List
<
TEmployeeContractPreNewDetailVo
>>
getDetailList
(
TEmployeeContractPreNew
SearchVo
tEmployeeContractPreNew
)
{
public
R
<
List
<
TEmployeeContractPreNewDetailVo
>>
getDetailList
(
ContractAlert
SearchVo
tEmployeeContractPreNew
)
{
//系统会自动拉取当前客服且“预计合同发起时间”为空的或为今日及今日之前的,续签状态为“待发起、发起失败、审核不通过、签署失败”的合同信息
//续签状态,0待确认,1待发起,2线下签待审核,3线下签审核不通过4线下签待归档5发起失败6签署中7签署失败8电子待归档9(已归档-电子签+线下签)已完结10撤销签署
List
<
String
>
statusList
=
new
ArrayList
<>();
statusList
.
add
(
CommonConstants
.
FIVE_STRING
);
statusList
.
add
(
CommonConstants
.
ONE_STRING
);
statusList
.
add
(
CommonConstants
.
FIVE_STRING
);
statusList
.
add
(
CommonConstants
.
TEN_STRING
);
statusList
.
add
(
CommonConstants
.
ELEVEN_STRING
);
statusList
.
add
(
CommonConstants
.
SEVEN_STRING
);
statusList
.
add
(
CommonConstants
.
THREE_STRING
);
tEmployeeContractPreNew
.
setStatusList
(
statusList
);
initSearchVo
(
tEmployeeContractPreNew
);
if
(
ArrayUtil
.
isNotEmpty
(
tEmployeeContractPreNew
.
getStartEndTimecreate
())
&&
tEmployeeContractPreNew
.
getStartEndTimecreate
().
length
==
2
)
{
tEmployeeContractPreNew
.
setExpectedCollectionTimeStart
(
tEmployeeContractPreNew
.
getStartEndTimecreate
()[
0
]);
tEmployeeContractPreNew
.
setExpectedCollectionTimeEnd
(
tEmployeeContractPreNew
.
getStartEndTimecreate
()[
1
]);
}
return
R
.
ok
(
baseMapper
.
getDetailList
(
tEmployeeContractPreNew
));
}
@Override
public
R
<
Integer
>
getDetailListCount
(
TEmployeeContractPreNew
SearchVo
tEmployeeContractPreNew
)
{
public
R
<
Integer
>
getDetailListCount
(
ContractAlert
SearchVo
tEmployeeContractPreNew
)
{
//系统会自动拉取当前客服且“预计合同发起时间”为空的或为今日及今日之前的,续签状态为“待发起、发起失败、审核不通过、签署失败”的合同信息
List
<
String
>
statusList
=
new
ArrayList
<>();
statusList
.
add
(
CommonConstants
.
FIVE_STRING
);
statusList
.
add
(
CommonConstants
.
ONE_STRING
);
statusList
.
add
(
CommonConstants
.
FIVE_STRING
);
statusList
.
add
(
CommonConstants
.
TEN_STRING
);
statusList
.
add
(
CommonConstants
.
ELEVEN_STRING
);
statusList
.
add
(
CommonConstants
.
SEVEN_STRING
);
statusList
.
add
(
CommonConstants
.
THREE_STRING
);
tEmployeeContractPreNew
.
setStatusList
(
statusList
);
initSearchVo
(
tEmployeeContractPreNew
);
return
R
.
ok
(
baseMapper
.
getDetailListCount
(
tEmployeeContractPreNew
));
...
...
@@ -1534,7 +1561,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
return
R
.
ok
(
term
);
}
public
void
initSearchVo
(
TEmployeeContractPreNew
SearchVo
searchVo
)
{
public
void
initSearchVo
(
ContractAlert
SearchVo
searchVo
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
long
roleId
=
1839501715787390978L
;
boolean
isSsc
=
this
.
haveRole
(
user
,
roleId
);
...
...
@@ -1558,6 +1585,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
public
R
<
TEmployeeContractInfo
>
getRenewContractByPreId
(
String
preId
)
{
return
R
.
ok
(
contractInfoMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractInfo
>
query
()
.
lambda
().
eq
(
TEmployeeContractInfo:
:
getPreId
,
preId
)
.
orderByDesc
(
BaseEntity:
:
getCreateTime
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
)));
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/DoFascTask.java
View file @
20ea9b8c
...
...
@@ -11,6 +11,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.scheduling.annotation.Async
;
...
...
@@ -81,6 +82,7 @@ public class DoFascTask {
contractInfo
=
tEmployeeContractInfoService
.
getOne
(
Wrappers
.<
TEmployeeContractInfo
>
query
()
.
lambda
().
eq
(
TEmployeeContractInfo:
:
getPreNewId
,
preNew
.
getId
())
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
orderByDesc
(
BaseEntity:
:
getCreateTime
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
if
(
contractInfo
!=
null
)
{
...
...
@@ -156,6 +158,8 @@ public class DoFascTask {
||
fddEvent
.
equals
(
"sign-task-fill-rejected"
))
{
// 3:签署任务参与方签署失败事件
preNew
.
setProcessStatus
(
CommonConstants
.
dingleDigitStrArray
[
7
]);
preNew
.
setErrorInfo
(
terminationNote
);
preNew
.
setErrorTime
(
new
Date
());
preNew
.
setRequestId
(
""
);
tEmployeeContractPreNewService
.
updateById
(
preNew
);
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmpContractAlertMapper.xml
View file @
20ea9b8c
...
...
@@ -347,6 +347,12 @@
<if
test=
"tEmpContractAlert.expectedCollectionTimeEnd != null"
>
AND b.EXPECTED_COLLECTION_TIME
<![CDATA[ <= ]]>
#{tEmpContractAlert.expectedCollectionTimeEnd}
</if>
<if
test=
"tEmpContractAlert.contractEndStart != null"
>
AND a.CONTRACT_END
<![CDATA[ >= ]]>
#{tEmpContractAlert.contractEndStart}
</if>
<if
test=
"tEmpContractAlert.contractEndEnd != null"
>
AND a.CONTRACT_END
<![CDATA[ <= ]]>
#{tEmpContractAlert.contractEndEnd}
</if>
<if
test=
"tEmpContractAlert.csLoginName != null and tEmpContractAlert.csLoginName.trim() != ''"
>
AND a.CS_LOGIN_NAME = #{tEmpContractAlert.csLoginName}
</if>
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreNewMapper.xml
View file @
20ea9b8c
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