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
c2e897ef
Commit
c2e897ef
authored
Oct 30, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
d0d21995
469a0443
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
195 additions
and
217 deletions
+195
-217
TAutoSocialRuleRel.java
...loud/plus/v1/yifu/archives/entity/TAutoSocialRuleRel.java
+108
-0
FascController.java
...loud/plus/v1/yifu/archives/controller/FascController.java
+6
-208
TEmployeeContractInfoController.java
.../archives/controller/TEmployeeContractInfoController.java
+1
-1
TEmployeeContractInfoMapper.java
.../v1/yifu/archives/mapper/TEmployeeContractInfoMapper.java
+8
-0
TEmployeeContractInfoService.java
...1/yifu/archives/service/TEmployeeContractInfoService.java
+3
-0
TAutoMainRelServiceImpl.java
...1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
+13
-0
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+10
-0
DoFascTask.java
...om/yifu/cloud/plus/v1/yifu/archives/utils/DoFascTask.java
+4
-4
FascUtil.java
.../com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
+1
-1
TAutoSocialRuleRelMapper.xml
...iz/src/main/resources/mapper/TAutoSocialRuleRelMapper.xml
+25
-1
TEmployeeContractInfoMapper.xml
...src/main/resources/mapper/TEmployeeContractInfoMapper.xml
+16
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TAutoSocialRuleRel.java
View file @
c2e897ef
...
...
@@ -196,4 +196,112 @@ public class TAutoSocialRuleRel extends BaseEntity {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"基数下限(社保或公积金)"
)
private
BigDecimal
lowerLimit
;
/**
* 养老基数上限
*/
@ExcelAttribute
(
name
=
"养老基数上限"
)
@Schema
(
description
=
"养老基数上限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"养老基数上限"
)
private
BigDecimal
upPersion
;
/**
* 医疗基数上限
*/
@ExcelAttribute
(
name
=
"医疗基数上限"
)
@Schema
(
description
=
"医疗基数上限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医疗基数上限"
)
private
BigDecimal
upMedical
;
/**
* 失业基数上限
*/
@ExcelAttribute
(
name
=
"失业基数上限"
)
@Schema
(
description
=
"失业基数上限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"失业基数上限"
)
private
BigDecimal
upUnemployment
;
/**
* 工伤基数上限
*/
@ExcelAttribute
(
name
=
"工伤基数上限"
)
@Schema
(
description
=
"工伤基数上限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"工伤基数上限"
)
private
BigDecimal
upInjury
;
/**
* 生育基数上限
*/
@ExcelAttribute
(
name
=
"生育基数上限"
)
@Schema
(
description
=
"生育基数上限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"生育基数上限"
)
private
BigDecimal
upBirth
;
/**
* 大病基数上限
*/
@ExcelAttribute
(
name
=
"大病基数上限"
)
@Schema
(
description
=
"大病基数上限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"大病基数上限"
)
private
BigDecimal
upBig
;
/**
* 养老基数下限
*/
@ExcelAttribute
(
name
=
"养老基数下限"
)
@Schema
(
description
=
"养老基数下限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"养老基数下限"
)
private
BigDecimal
lowerPersion
;
/**
* 医疗基数下限
*/
@ExcelAttribute
(
name
=
"医疗基数下限"
)
@Schema
(
description
=
"医疗基数下限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医疗基数下限"
)
private
BigDecimal
lowerMedical
;
/**
* 失业基数下限
*/
@ExcelAttribute
(
name
=
"失业基数下限"
)
@Schema
(
description
=
"失业基数下限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"失业基数下限"
)
private
BigDecimal
lowerUnemployment
;
/**
* 工伤基数下限
*/
@ExcelAttribute
(
name
=
"工伤基数下限"
)
@Schema
(
description
=
"工伤基数下限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"工伤基数下限"
)
private
BigDecimal
lowerInjury
;
/**
* 生育基数下限
*/
@ExcelAttribute
(
name
=
"生育基数下限"
)
@Schema
(
description
=
"生育基数下限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"生育基数下限"
)
private
BigDecimal
lowerBirth
;
/**
* 大病基数下限
*/
@ExcelAttribute
(
name
=
"大病基数下限"
)
@Schema
(
description
=
"大病基数下限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"大病基数下限"
)
private
BigDecimal
lowerBig
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FascController.java
View file @
c2e897ef
...
...
@@ -2,23 +2,19 @@ package com.yifu.cloud.plus.v1.yifu.archives.controller;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.fadada.api.utils.crypt.FddCryptUtil
;
import
com.fasc.open.api.constants.RequestConstants
;
import
com.fasc.open.api.exception.ApiException
;
import
com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser
;
import
com.yifu.cloud.plus.v1.yifu.archives.config.FascConfig
;
import
com.yifu.cloud.plus.v1.yifu.archives.
config.WxConfi
g
;
import
com.yifu.cloud.plus.v1.yifu.archives.
entity.*
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.
*
;
import
com.yifu.cloud.plus.v1.yifu.archives.
entity.TFascPushLo
g
;
import
com.yifu.cloud.plus.v1.yifu.archives.
service.FascService
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.
TFascPushLogService
;
import
com.yifu.cloud.plus.v1.yifu.archives.utils.DoFascTask
;
import
com.yifu.cloud.plus.v1.yifu.archives.utils.DoJointTask
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
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.security.annotation.Inner
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
...
...
@@ -29,7 +25,6 @@ import org.springframework.context.annotation.Lazy;
import
org.springframework.security.core.GrantedAuthority
;
import
org.springframework.security.core.authority.AuthorityUtils
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.client.RestTemplate
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
...
...
@@ -50,26 +45,15 @@ public class FascController {
@Autowired
private
FascConfig
fascConfig
;
@Autowired
private
WxConfig
wxConfig
;
@Autowired
private
UpmsDaprUtils
upmsDaprUtils
;
@Autowired
@Lazy
private
DoFascTask
doFascTask
;
private
final
TFascPushLogService
tFascPushLogService
;
private
final
TEmployeeContractPreService
tEmployeeContractPreService
;
private
final
TEmployeeContractInfoService
tEmployeeContractInfoService
;
private
final
TEmployeeContractAuditService
tEmployeeContractAuditService
;
private
final
TContractAutoLogService
contractAutoLogService
;
private
static
String
FASC_EVENT
=
"X-FASC-Event"
;
private
static
String
FASC_BIZ_CONTENT
=
"bizContent"
;
private
static
String
FASC_SUCCESS
=
"success"
;
private
static
String
FASC_BIZ_CONTENT_STR
=
";fddBizContent:"
;
/**
* @Description: 获取模板
...
...
@@ -159,7 +143,7 @@ public class FascController {
@Operation
(
description
=
"获取附件"
)
@GetMapping
(
"/getFileByRequestId"
)
public
R
<
String
>
getFileByRequestId
(
@RequestParam
String
id
)
throws
ApiException
{
boolean
flag
=
fascService
.
getFileByRequestId
(
id
);
fascService
.
getFileByRequestId
(
id
);
return
R
.
ok
();
}
...
...
@@ -173,7 +157,7 @@ public class FascController {
true
,
"1"
,
authorities
,
"1"
,
null
,
null
,
null
,
null
);
null
,
null
);
}
@Operation
(
summary
=
"异步通知"
,
description
=
"异步通知"
)
...
...
@@ -202,159 +186,17 @@ public class FascController {
// 原因
String
terminationNote
=
jsonObject
.
getString
(
"terminationNote"
);
// 操作人
String
userName
=
jsonObject
.
getString
(
"userName"
);
//String userName = jsonObject.getString("userName")
// 异步执行:
doFascTask
.
doFascOkCore
(
pushLog
,
fddEvent
,
fddBizContent
,
signTaskId
,
terminationNote
);
/*YifuUser user = getNewYifuUser();
pushLog.setTypeKey("fddEvent:"+ fddEvent);
pushLog.setReturnData("初始无事件:fddEvent:" + fddEvent + "fddBizContent:" + fddBizContent);
if (Common.isNotNull(signTaskId)) {
// 根据requestId获取信息:
TEmployeeContractPre pre = tEmployeeContractPreService.getOne(Wrappers.<TEmployeeContractPre>query().lambda()
.eq(TEmployeeContractPre::getRequestId, signTaskId).last(CommonConstants.LAST_ONE_SQL));
if (pre != null && Common.isNotNull(pre.getProcessStatus()) && !pre.getProcessStatus().equals(CommonConstants.dingleDigitStrArray[9])) {
TEmployeeContractInfo contractInfo = null;
if (Common.isNotNull(pre.getContractId())) {
//如果存在合同申请审核数据,将状态更新成待提交
contractInfo = tEmployeeContractInfoService.getById(pre.getContractId());
}
if (contractInfo != null) {
if (fddEvent.equals("sign-task-finished")) {
// 1:签署任务完成事件
// 8电子待归档
pre.setProcessStatus(CommonConstants.dingleDigitStrArray[8]);
// 加日志
this.saveAuditLogSuccess(pre, "签署成功");
// 尝试获取归档文件
boolean flag = fascService.getFileByRequestId(pre.getId());
contractInfo.setAuditStatus(CommonConstants.TWO_INT);
// 传了false,就不要审核日志
tEmployeeContractInfoService.auditContract(contractInfo, user, false);
if (flag) {
// 加日志
this.saveAuditLogSuccess(pre, "归档成功");
pre.setProcessStatus(CommonConstants.dingleDigitStrArray[9]);
contractInfo.setIsFile(CommonConstants.ZERO_STRING);
contractInfo.setContractNo(pre.getRequestId());
tEmployeeContractInfoService.updateById(contractInfo);
//瓜子项目编码:皖A694302
if (CommonConstants.GZ_DEPT_NO.equals(contractInfo.getDeptNo())) {
//合同归档瓜子合同状态更新已归档
tEmployeeContractInfoService.updateGzOfferStatus(contractInfo,CommonConstants.EIGHT_STRING,CommonConstants.NINETY_NINE,user.getId(),user.getNickname());
}
}
tEmployeeContractPreService.updateById(pre);
pushLog.setReturnData("签署任务完成事件:fddEvent:" + fddEvent + FASC_BIZ_CONTENT_STR + fddBizContent);
} else if (fddEvent.equals("sign-task-canceled") || fddEvent.equals("sign-task-abolish")) {
// 2:签署任务撤销事件 || 4:签署任务作废事件
if (fddEvent.equals("sign-task-canceled")) {
// 4:签署任务作废事件
pushLog.setReturnData("签署任务撤销事件:fddEvent:" + fddEvent + FASC_BIZ_CONTENT_STR + fddBizContent);
} else {
// 4:签署任务作废事件
pushLog.setReturnData("签署任务作废事件:fddEvent:" + fddEvent + FASC_BIZ_CONTENT_STR + fddBizContent);
}
//电子待归档、线下签待归档、已完结的不能撤销签署
if (Common.isNotNull(pre) && !CommonConstants.NINE_STRING.equals(pre.getProcessStatus()) &&
!CommonConstants.FOUR_STRING.equals(pre.getProcessStatus()) &&
!CommonConstants.EIGHT_STRING.equals(pre.getProcessStatus())) {
//如果不是待确认和待发起,需要记录操作记录
if (!CommonConstants.ZERO_STRING.equals(pre.getProcessStatus()) &&
!CommonConstants.ONE_STRING.equals(pre.getProcessStatus()) &&
Common.isNotNull(pre.getContractId())) {
// 加日志
this.saveAuditLogFail(pre, "撤销签署", terminationNote);
}
pre.setProcessStatus(CommonConstants.TEN_STRING);
pre.setSignFlag(CommonConstants.ZERO_STRING);
pre.setRevokeReason(terminationNote);
tEmployeeContractPreService.updateById(pre);
}
//如果存在合同申请审核数据,将状态更新成待提交
contractInfo.setAuditStatus(CommonConstants.ZERO_INT);
contractInfo.setInUse(CommonConstants.ONE_STRING);
tEmployeeContractInfoService.updateById(contractInfo);
} else if (fddEvent.equals("sign-task-sign-failed")
|| fddEvent.equals("sign-task-sign-rejected")
|| fddEvent.equals("sign-task-ignore")
|| fddEvent.equals("sign-task-fill-rejected")) {
// 3:签署任务参与方签署失败事件
pre.setProcessStatus(CommonConstants.dingleDigitStrArray[7]);
pre.setRequestId("");
tEmployeeContractPreService.updateById(pre);
//如果存在合同申请审核数据,将状态更新成待提交
contractInfo.setAuditStatus(CommonConstants.ZERO_INT);
contractInfo.setInUse(CommonConstants.ONE_STRING);
tEmployeeContractInfoService.updateById(contractInfo);
UUID uuid = UUID.randomUUID();
//生成快照数据
TContractAutoLog contractAutoLog = new TContractAutoLog();
contractAutoLog.setContractId(uuid.toString());
contractAutoLog.setEmpName(pre.getEmployeeName());
contractAutoLog.setEmpIdcard(pre.getEmpIdcard());
contractAutoLog.setPhone(pre.getEmpPhone());
contractAutoLog.setMainId(pre.getId());
contractAutoLog.setErrorInfo(null== terminationNote ? "法大大签署失败" : terminationNote);
contractAutoLogService.save(contractAutoLog);
//签署失败发送企微消息
sendFddFalureInfoToWx(pre,contractAutoLog.getId());
// 加日志
this.saveAuditLogFail(pre, "签署失败", terminationNote);
pushLog.setReturnData("签署任务参与方签署失败事件:fddEvent:" + fddEvent + FASC_BIZ_CONTENT_STR + fddBizContent);
}
}
}
}
tFascPushLogService.updateById(pushLog);*/
return
R
.
ok
(
null
,
FASC_SUCCESS
);
}
return
R
.
ok
(
null
,
FASC_SUCCESS
);
}
// 加合同里的流程进展明细的日志——成功
public
void
saveAuditLogSuccess
(
TEmployeeContractPre
tEmployeeContractPre
,
String
rootName
)
{
// 加流程进展明细
if
(
tEmployeeContractPre
!=
null
&&
Common
.
isNotNull
(
tEmployeeContractPre
.
getContractId
()))
{
this
.
saveAuditLogInfo
(
tEmployeeContractPre
.
getContractId
(),
rootName
,
null
);
}
}
// 加合同里的流程进展明细的日志——失败
public
void
saveAuditLogFail
(
TEmployeeContractPre
tEmployeeContractPre
,
String
rootName
,
String
remark
)
{
// 加流程进展明细
if
(
tEmployeeContractPre
!=
null
&&
Common
.
isNotNull
(
tEmployeeContractPre
.
getContractId
()))
{
this
.
saveAuditLogInfo
(
tEmployeeContractPre
.
getContractId
(),
rootName
,
remark
);
}
}
// 加合同里的流程进展明细的日志
public
void
saveAuditLogInfo
(
String
contractId
,
String
rootName
,
String
remark
)
{
// 加流程进展明细
if
(
Common
.
isNotNull
(
contractId
))
{
TEmployeeContractAudit
audit
=
new
TEmployeeContractAudit
();
audit
.
setRootName
(
rootName
);
audit
.
setLinkId
(
contractId
);
audit
.
setLinkType
(
CommonConstants
.
ONE_INT
);
if
(
Common
.
isNotNull
(
remark
))
{
audit
.
setRemark
(
remark
);
}
audit
.
setCreateBy
(
"1"
);
audit
.
setCreateName
(
"法大大电子签"
);
tEmployeeContractAuditService
.
save
(
audit
);
}
}
//验证签名,返回true表示失败
public
boolean
checkSign
(
HttpServletRequest
request
,
TFascPushLog
pushLog
)
throws
Exception
{
...
...
@@ -382,48 +224,4 @@ public class FascController {
return
true
;
}
/**
* 发送法大大失败提醒通知到企微
* @param pre 合同待购买
*/
private
void
sendFddFalureInfoToWx
(
TEmployeeContractPre
pre
,
String
id
)
{
//获取前端客服
SysUser
user
;
if
(
Common
.
isEmpty
(
pre
.
getCustomerUserLoginname
()))
{
return
;
}
R
<
SysUser
>
res
=
upmsDaprUtils
.
getSimpleUserByLoginName
(
pre
.
getCustomerUserLoginname
());
if
(
Common
.
isNotNull
(
res
)
&&
Common
.
isNotNull
(
res
.
getData
()))
{
user
=
res
.
getData
();
}
else
{
return
;
}
StringBuilder
sendUser
=
null
;
if
(
Common
.
isNotKong
(
user
.
getWxMessage
()))
{
sendUser
=
new
StringBuilder
(
user
.
getWxMessage
());
}
if
(
sendUser
!=
null
)
{
RestTemplate
restTemplate
=
new
RestTemplate
();
Map
<
String
,
Object
>
requestMap
=
new
HashMap
<>();
Map
<
String
,
Object
>
textcard
=
new
HashMap
<>();
String
authUrl
=
String
.
format
(
SecurityConstants
.
WX_GET_MESSAGE_AUTH_URL
,
wxConfig
.
getCorpid
()
,
wxConfig
.
getDomainName
()
+
"/auth/oauth/wxLogin"
,
"72"
+
id
);
StringBuilder
description
=
new
StringBuilder
();
String
title
=
"作业自动化——电子合同签署失败提醒"
;
description
.
append
(
pre
.
getEmployeeName
()
+
"-"
+
pre
.
getEmpIdcard
()+
"-"
+
pre
.
getEmpPhone
()
+
",电子合同签署失败"
).
append
(
"<br>"
);
description
.
append
(
"请及时处理,以免产生用工风险!"
).
append
(
"<br>"
);
textcard
.
put
(
"title"
,
title
);
textcard
.
put
(
"url"
,
authUrl
);
textcard
.
put
(
"description"
,
description
.
toString
());
requestMap
.
put
(
"touser"
,
sendUser
);
requestMap
.
put
(
"agentid"
,
wxConfig
.
getAgentid
());
requestMap
.
put
(
"msgtype"
,
"textcard"
);
requestMap
.
put
(
"textcard"
,
textcard
);
// 必须加上header说明
if
(!
wxConfig
.
sendTextCard
(
restTemplate
,
requestMap
))
{
wxConfig
.
sendTextCard
(
restTemplate
,
requestMap
);
}
}
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractInfoController.java
View file @
c2e897ef
...
...
@@ -108,7 +108,7 @@ public class TEmployeeContractInfoController {
public
R
<
IPage
<
TEmployeeContractInfo
>>
getAuditPage
(
Page
<
TEmployeeContractInfo
>
page
,
TEmployeeContractInfo
tEmployeeContractInfo
)
{
tEmployeeContractInfo
.
setAuditStatus
(
CommonConstants
.
ONE_INT
);
this
.
setAuth
(
tEmployeeContractInfo
);
return
new
R
<>(
tEmployeeContractInfoService
.
getTEmployeeContractInfoPage
(
page
,
tEmployeeContractInfo
));
return
new
R
<>(
tEmployeeContractInfoService
.
getTEmployeeContractInfoPage
ByAudit
(
page
,
tEmployeeContractInfo
));
}
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeContractInfoMapper.java
View file @
c2e897ef
...
...
@@ -44,6 +44,14 @@ public interface TEmployeeContractInfoMapper extends BaseMapper<TEmployeeContrac
*/
IPage
<
TEmployeeContractInfo
>
getTEmployeeContractInfoPage
(
Page
<
TEmployeeContractInfo
>
page
,
@Param
(
"tEmployeeContractInfo"
)
TEmployeeContractInfo
tEmployeeContractInfo
);
/**
* 审核列表
*
* @param tEmployeeContractInfo 员工合同信息表
* @return
*/
IPage
<
TEmployeeContractInfo
>
getTEmployeeContractInfoPageByAudit
(
Page
<
TEmployeeContractInfo
>
page
,
@Param
(
"tEmployeeContractInfo"
)
TEmployeeContractInfo
tEmployeeContractInfo
);
List
<
TEmployeeContractInfo
>
getTEmployeeContractList
(
@Param
(
"tEmployeeContractInfo"
)
TEmployeeContractInfo
tEmployeeContractInfo
);
List
<
EmployeeContractExportVO
>
getTEmployeeContractExport
(
@Param
(
"tEmployeeContractInfo"
)
TEmployeeContractInfo
tEmployeeContractInfo
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeContractInfoService.java
View file @
c2e897ef
...
...
@@ -46,6 +46,9 @@ public interface TEmployeeContractInfoService extends IService<TEmployeeContract
*/
IPage
<
TEmployeeContractInfo
>
getTEmployeeContractInfoPage
(
Page
<
TEmployeeContractInfo
>
page
,
TEmployeeContractInfo
tEmployeeContractInfo
);
// 审核列表
IPage
<
TEmployeeContractInfo
>
getTEmployeeContractInfoPageByAudit
(
Page
<
TEmployeeContractInfo
>
page
,
TEmployeeContractInfo
tEmployeeContractInfo
);
/**
* @param tEmployeeContractInfo
* @Description: list
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TAutoMainRelServiceImpl.java
View file @
c2e897ef
...
...
@@ -902,6 +902,19 @@ public class TAutoMainRelServiceImpl extends ServiceImpl<TAutoMainRelMapper, TAu
ignoreFields
.
add
(
"upperLimit"
);
ignoreFields
.
add
(
"lowerLimit"
);
ignoreFields
.
add
(
"upPersion"
);
ignoreFields
.
add
(
"upMedical"
);
ignoreFields
.
add
(
"upUnemployment"
);
ignoreFields
.
add
(
"upInjury"
);
ignoreFields
.
add
(
"upBirth"
);
ignoreFields
.
add
(
"upBig"
);
ignoreFields
.
add
(
"lowerPersion"
);
ignoreFields
.
add
(
"lowerMedical"
);
ignoreFields
.
add
(
"lowerUnemployment"
);
ignoreFields
.
add
(
"lowerInjury"
);
ignoreFields
.
add
(
"lowerBirth"
);
ignoreFields
.
add
(
"lowerBig"
);
// 更新档案管理规则
if
(
Common
.
isNotNull
(
autoEmpRuleNew
)){
String
differenceKey
=
HrEquator
.
comparisonValueIgnoreField
(
autoEmpRuleOld
,
autoEmpRuleNew
,
ignoreFields
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
c2e897ef
...
...
@@ -126,6 +126,16 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
public
IPage
<
TEmployeeContractInfo
>
getTEmployeeContractInfoPage
(
Page
<
TEmployeeContractInfo
>
page
,
TEmployeeContractInfo
tEmployeeContractInfo
)
{
return
baseMapper
.
getTEmployeeContractInfoPage
(
page
,
tEmployeeContractInfo
);
}
/**
* 审核列表
*
* @param tEmployeeContractInfo 员工合同信息表
* @return
*/
@Override
public
IPage
<
TEmployeeContractInfo
>
getTEmployeeContractInfoPageByAudit
(
Page
<
TEmployeeContractInfo
>
page
,
TEmployeeContractInfo
tEmployeeContractInfo
)
{
return
baseMapper
.
getTEmployeeContractInfoPageByAudit
(
page
,
tEmployeeContractInfo
);
}
@Override
public
List
<
TEmployeeContractInfo
>
getTEmployeeContractList
(
TEmployeeContractInfo
tEmployeeContractInfo
)
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/DoFascTask.java
View file @
c2e897ef
...
...
@@ -131,8 +131,8 @@ public class DoFascTask {
pre
.
setRevokeReason
(
terminationNote
);
tEmployeeContractPreService
.
updateById
(
pre
);
}
//如果存在合同申请审核数据,将状态更新成
待提交
contractInfo
.
setAuditStatus
(
CommonConstants
.
ZERO
_INT
);
//如果存在合同申请审核数据,将状态更新成
5撤销签署
contractInfo
.
setAuditStatus
(
CommonConstants
.
FIVE
_INT
);
contractInfo
.
setInUse
(
CommonConstants
.
ONE_STRING
);
tEmployeeContractInfoService
.
updateById
(
contractInfo
);
}
else
if
(
fddEvent
.
equals
(
"sign-task-sign-failed"
)
...
...
@@ -144,8 +144,8 @@ public class DoFascTask {
pre
.
setRequestId
(
""
);
tEmployeeContractPreService
.
updateById
(
pre
);
//如果存在合同申请审核数据,将状态更新成
待提交
contractInfo
.
setAuditStatus
(
CommonConstants
.
ZERO
_INT
);
//如果存在合同申请审核数据,将状态更新成
6签署失败
contractInfo
.
setAuditStatus
(
CommonConstants
.
SIX
_INT
);
contractInfo
.
setInUse
(
CommonConstants
.
ONE_STRING
);
tEmployeeContractInfoService
.
updateById
(
contractInfo
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
View file @
c2e897ef
...
...
@@ -55,7 +55,7 @@ public class FascUtil {
@Autowired
private
RedisTemplate
redisTemplate
;
@Autowired
//
@Autowired
//private FascConfig fascConfig;
private
static
final
String
DATA_COVER
=
"dataCover"
;
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TAutoSocialRuleRelMapper.xml
View file @
c2e897ef
...
...
@@ -47,6 +47,18 @@
<result
property=
"province"
column=
"PROVINCE"
/>
<result
property=
"city"
column=
"CITY"
/>
<result
property=
"town"
column=
"TOWN"
/>
<result
property=
"upPersion"
column=
"UP_PERSION"
/>
<result
property=
"upMedical"
column=
"UP_MEDICAL"
/>
<result
property=
"upUnemployment"
column=
"UP_UNEMPLOYMENT"
/>
<result
property=
"upInjury"
column=
"UP_INJURY"
/>
<result
property=
"upBirth"
column=
"UP_BIRTH"
/>
<result
property=
"upBig"
column=
"UP_BIG"
/>
<result
property=
"lowerPersion"
column=
"LOWER_PERSION"
/>
<result
property=
"lowerMedical"
column=
"LOWER_MEDICAL"
/>
<result
property=
"lowerUnemployment"
column=
"LOWER_UNEMPLOYMENT"
/>
<result
property=
"lowerInjury"
column=
"LOWER_INJURY"
/>
<result
property=
"lowerBirth"
column=
"LOWER_BIRTH"
/>
<result
property=
"lowerBig"
column=
"LOWER_BIG"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.ID,
...
...
@@ -72,7 +84,19 @@
a.CITY,
a.TOWN,
a.UPPER_LIMIT,
a.LOWER_LIMIT
a.LOWER_LIMIT,
a.UP_PERSION,
a.UP_MEDICAL,
a.UP_UNEMPLOYMENT,
a.UP_INJURY,
a.UP_BIRTH,
a.UP_BIG,
a.LOWER_PERSION,
a.LOWER_MEDICAL,
a.LOWER_UNEMPLOYMENT,
a.LOWER_INJURY,
a.LOWER_BIRTH,
a.LOWER_BIG
</sql>
<sql
id=
"tAutoSocialRuleRel_where"
>
<if
test=
"tAutoSocialRuleRel != null"
>
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml
View file @
c2e897ef
...
...
@@ -445,6 +445,20 @@
</where>
order by a.APPLY_NO desc
</select>
<!--审核列表-->
<select
id=
"getTEmployeeContractInfoPageByAudit"
resultMap=
"tEmployeeContrctInfoMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM t_employee_contract_info a
<where>
a.DELETE_FLAG = 0 and (a.sign_type is null or a.sign_type = '1')
<include
refid=
"tEmployeeContractInfo_where"
/>
<if
test=
"tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''"
>
${tEmployeeContractInfo.authSql}
</if>
</where>
order by a.APPLY_NO desc
</select>
<!--list-->
<select
id=
"getTEmployeeContractList"
resultMap=
"tEmployeeContrctInfoMap"
>
...
...
@@ -675,7 +689,7 @@
left join (select REMARK,LINK_ID from t_employee_contract_audit where ROOT_NAME='合同审核') b on a.ID=b.LINK_ID
<where>
a.DELETE_FLAG = 0
a.DELETE_FLAG = 0
and (a.sign_type is null or a.sign_type = '1')
<include
refid=
"tEmployeeContractInfo_where"
/>
<if
test=
"tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''"
>
${tEmployeeContractInfo.authSql}
...
...
@@ -694,7 +708,7 @@
count(1)
FROM t_employee_contract_info a
<where>
a.DELETE_FLAG = 0
a.DELETE_FLAG = 0
and (a.sign_type is null or a.sign_type = '1')
<include
refid=
"tEmployeeContractInfo_where"
/>
<if
test=
"tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''"
>
${tEmployeeContractInfo.authSql}
...
...
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