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
b7d51874
Commit
b7d51874
authored
Oct 20, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-社保自动化相关提交
parent
8a915caf
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
130 additions
and
9 deletions
+130
-9
TEmployeeContractInfo.java
...d/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
+1
-1
TEmployeeContractPre.java
...ud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
+3
-0
EmployeeContractExportAuditVO.java
...us/v1/yifu/archives/vo/EmployeeContractExportAuditVO.java
+1
-1
EmployeeContractExportVO.java
...ud/plus/v1/yifu/archives/vo/EmployeeContractExportVO.java
+2
-2
TDispatchInfoPreVo.java
...fu/cloud/plus/v1/yifu/archives/vo/TDispatchInfoPreVo.java
+21
-0
FascController.java
...loud/plus/v1/yifu/archives/controller/FascController.java
+57
-0
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+10
-2
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+3
-2
TEmployeeContractInfoMapper.xml
...src/main/resources/mapper/TEmployeeContractInfoMapper.xml
+2
-0
TDispatchInfoPre.java
...fu/cloud/plus/v1/yifu/social/entity/TDispatchInfoPre.java
+21
-0
TDispatchInfoPreServiceImpl.java
...yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
+4
-0
TDispatchInfoPreMapper.xml
...-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
+5
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
View file @
b7d51874
...
@@ -507,7 +507,7 @@ public class TEmployeeContractInfo extends BaseEntity {
...
@@ -507,7 +507,7 @@ public class TEmployeeContractInfo extends BaseEntity {
* @Date 14:50 2022/11/7
* @Date 14:50 2022/11/7
**/
**/
@ExcelAttribute
(
name
=
"审核类型"
,
readConverterExp
=
"0=派增,1=派减"
)
@ExcelAttribute
(
name
=
"审核类型"
,
readConverterExp
=
"0=派增,1=派减"
)
@Schema
(
description
=
"审核类型:0派增-社保派单、1派增-无社保新签、2派增-续签、3派减-作废、4派减-终止"
)
@Schema
(
description
=
"审核类型:0派增-社保派单、1派增-无社保新签、2派增-续签、3派减-作废、4派减-终止
、5自动化派单-无需审核
"
)
private
String
type
;
private
String
type
;
/**
/**
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
View file @
b7d51874
...
@@ -88,6 +88,9 @@ public class TEmployeeContractPre extends BaseEntity {
...
@@ -88,6 +88,9 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema
(
description
=
"法大大模版名称"
)
@Schema
(
description
=
"法大大模版名称"
)
private
String
fadadaTemplate
;
private
String
fadadaTemplate
;
@Schema
(
description
=
"电子签转线下签的原因"
)
private
String
changeTypeReason
;
@Schema
(
description
=
"数据来源1客户端 2客服端"
)
@Schema
(
description
=
"数据来源1客户端 2客服端"
)
private
String
dataSource
;
private
String
dataSource
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeContractExportAuditVO.java
View file @
b7d51874
...
@@ -49,7 +49,7 @@ public class EmployeeContractExportAuditVO implements Serializable {
...
@@ -49,7 +49,7 @@ public class EmployeeContractExportAuditVO implements Serializable {
* 3、合同申请处申请类型为:作废——审核类型统一为:派减-作废;终止——审核类型统一为:派减-终止;
* 3、合同申请处申请类型为:作废——审核类型统一为:派减-作废;终止——审核类型统一为:派减-终止;
* @Date 14:50 2022/11/7
* @Date 14:50 2022/11/7
**/
**/
@ExcelAttribute
(
name
=
"审核类型"
,
readConverterExp
=
"0=派增-社保派单,1=派增-无社保新签,2=派增-续签,3=派减-作废,4=派减-终止"
)
@ExcelAttribute
(
name
=
"审核类型"
,
readConverterExp
=
"0=派增-社保派单,1=派增-无社保新签,2=派增-续签,3=派减-作废,4=派减-终止
,5=自动化派单-无需审核
"
)
@Schema
(
description
=
"审核类型"
)
@Schema
(
description
=
"审核类型"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"审核类型"
)
@ExcelProperty
(
"审核类型"
)
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeContractExportVO.java
View file @
b7d51874
...
@@ -46,14 +46,14 @@ public class EmployeeContractExportVO implements Serializable {
...
@@ -46,14 +46,14 @@ public class EmployeeContractExportVO implements Serializable {
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
/**
/**
* @Author fxj
* @Author fxj
* @Description 0派增-社保派单、1派增-无社保新签、2派增-续签、3派减-作废、4派减-终止
* @Description 0派增-社保派单、1派增-无社保新签、2派增-续签、3派减-作废、4派减-终止
、5自动化派单-无需审核
* 1、增加“审核类型”,内容为:派增-社保派单、派增-无社保新签、派增-续签、派减-作废、派减-终止
* 1、增加“审核类型”,内容为:派增-社保派单、派增-无社保新签、派增-续签、派减-作废、派减-终止
* 2、社保派单过来的合同,审核类型统一为:派增-社保派单;
* 2、社保派单过来的合同,审核类型统一为:派增-社保派单;
* 3、合同申请处申请类型为:新签(正常签订)——审核类型为:派增-无社保新签、;续签(合同未到期重新签订、离职再入职、商务合同更改)——审核类型统一为:派增-续签;
* 3、合同申请处申请类型为:新签(正常签订)——审核类型为:派增-无社保新签、;续签(合同未到期重新签订、离职再入职、商务合同更改)——审核类型统一为:派增-续签;
* 3、合同申请处申请类型为:作废——审核类型统一为:派减-作废;终止——审核类型统一为:派减-终止;
* 3、合同申请处申请类型为:作废——审核类型统一为:派减-作废;终止——审核类型统一为:派减-终止;
* @Date 14:50 2022/11/7
* @Date 14:50 2022/11/7
**/
**/
@ExcelAttribute
(
name
=
"审核类型"
,
readConverterExp
=
"0=派增-社保派单,1=派增-无社保新签,2=派增-续签,3=派减-作废,4=派减-终止"
)
@ExcelAttribute
(
name
=
"审核类型"
,
readConverterExp
=
"0=派增-社保派单,1=派增-无社保新签,2=派增-续签,3=派减-作废,4=派减-终止
,5=自动化派单-无需审核
"
)
@Schema
(
description
=
"审核类型"
)
@Schema
(
description
=
"审核类型"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"审核类型"
)
@ExcelProperty
(
"审核类型"
)
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TDispatchInfoPreVo.java
View file @
b7d51874
...
@@ -86,6 +86,27 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
...
@@ -86,6 +86,27 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@Schema
(
description
=
"社保缴纳地-县"
)
@Schema
(
description
=
"社保缴纳地-县"
)
@ExcelProperty
(
"社保缴纳地-县"
)
@ExcelProperty
(
"社保缴纳地-县"
)
private
String
socialTown
;
private
String
socialTown
;
/**
* 社保缴纳地-省
*/
@ExcelAttribute
(
name
=
"社保缴纳地-省id"
)
@ExcelProperty
(
"社保缴纳地-省"
)
@Schema
(
description
=
"社保缴纳地-省"
)
private
String
socialProvinceId
;
/**
* 社保缴纳地-市
*/
@ExcelAttribute
(
name
=
"社保缴纳地-市"
)
@ExcelProperty
(
"社保缴纳地-市"
)
@Schema
(
description
=
"社保缴纳地-市"
)
private
String
socialCityId
;
/**
* 社保缴纳地-县
*/
@ExcelAttribute
(
name
=
"社保缴纳地-县"
)
@ExcelProperty
(
"社保缴纳地-县"
)
@Schema
(
description
=
"社保缴纳地-县"
)
private
String
socialTownId
;
/**
/**
* 公积金缴纳地-省
* 公积金缴纳地-省
*/
*/
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FascController.java
View file @
b7d51874
...
@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
...
@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import
com.fadada.api.utils.crypt.FddCryptUtil
;
import
com.fadada.api.utils.crypt.FddCryptUtil
;
import
com.fasc.open.api.constants.RequestConstants
;
import
com.fasc.open.api.constants.RequestConstants
;
import
com.fasc.open.api.exception.ApiException
;
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.FascConfig
;
import
com.yifu.cloud.plus.v1.yifu.archives.config.WxConfig
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.*
;
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.service.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
...
@@ -14,6 +16,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
...
@@ -14,6 +16,7 @@ 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.Common
;
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.core.vo.YifuUser
;
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
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
...
@@ -23,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -23,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.security.core.GrantedAuthority
;
import
org.springframework.security.core.GrantedAuthority
;
import
org.springframework.security.core.authority.AuthorityUtils
;
import
org.springframework.security.core.authority.AuthorityUtils
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.client.RestTemplate
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
...
@@ -43,6 +47,12 @@ public class FascController {
...
@@ -43,6 +47,12 @@ public class FascController {
@Autowired
@Autowired
private
FascConfig
fascConfig
;
private
FascConfig
fascConfig
;
@Autowired
private
WxConfig
wxConfig
;
@Autowired
private
UpmsDaprUtils
upmsDaprUtils
;
private
final
TFascPushLogService
tFascPushLogService
;
private
final
TFascPushLogService
tFascPushLogService
;
private
final
TEmployeeContractPreService
tEmployeeContractPreService
;
private
final
TEmployeeContractPreService
tEmployeeContractPreService
;
private
final
TEmployeeContractInfoService
tEmployeeContractInfoService
;
private
final
TEmployeeContractInfoService
tEmployeeContractInfoService
;
...
@@ -252,6 +262,9 @@ public class FascController {
...
@@ -252,6 +262,9 @@ public class FascController {
contractInfo
.
setInUse
(
CommonConstants
.
ONE_STRING
);
contractInfo
.
setInUse
(
CommonConstants
.
ONE_STRING
);
tEmployeeContractInfoService
.
updateById
(
contractInfo
);
tEmployeeContractInfoService
.
updateById
(
contractInfo
);
//签署失败发送企微消息
sendFddFalureInfoToWx
(
pre
);
// 加日志
// 加日志
this
.
saveAuditLogFail
(
pre
,
"签署失败"
,
terminationNote
);
this
.
saveAuditLogFail
(
pre
,
"签署失败"
,
terminationNote
);
pushLog
.
setReturnData
(
"签署任务参与方签署失败事件:fddEvent:"
+
fddEvent
+
FASC_BIZ_CONTENT_STR
+
fddBizContent
);
pushLog
.
setReturnData
(
"签署任务参与方签署失败事件:fddEvent:"
+
fddEvent
+
FASC_BIZ_CONTENT_STR
+
fddBizContent
);
...
@@ -325,4 +338,48 @@ public class FascController {
...
@@ -325,4 +338,48 @@ public class FascController {
return
true
;
return
true
;
}
}
/**
* 发送法大大失败提醒通知到企微
* @param pre 合同待购买
*/
private
void
sendFddFalureInfoToWx
(
TEmployeeContractPre
pre
)
{
//获取前端客服
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"
+
pre
.
getId
());
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/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
b7d51874
...
@@ -621,6 +621,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -621,6 +621,9 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
//正常签订
//正常签订
tEmployeeContractInfo
.
setType
(
CommonConstants
.
ONE_STRING
);
tEmployeeContractInfo
.
setType
(
CommonConstants
.
ONE_STRING
);
}
}
if
(
Common
.
isNotNull
(
tEmployeeContractInfo
.
getSignType
())
&&
"0"
.
equals
(
tEmployeeContractInfo
.
getSignType
()))
{
tEmployeeContractInfo
.
setType
(
CommonConstants
.
FIVE_STRING
);
}
}
}
/**
/**
...
@@ -1436,8 +1439,13 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
...
@@ -1436,8 +1439,13 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
else
{
}
else
{
insert
.
setEmpId
(
project
.
getEmpId
());
insert
.
setEmpId
(
project
.
getEmpId
());
insert
.
setSettleDomain
(
project
.
getDeptId
());
insert
.
setSettleDomain
(
project
.
getDeptId
());
// 批量直接待审核
//电子签更新为签署中
insert
.
setAuditStatus
(
CommonConstants
.
ONE_INT
);
if
(
Common
.
isNotNull
(
insert
.
getSignType
())
&&
"0"
.
equals
(
insert
.
getSignType
()))
{
insert
.
setAuditStatus
(
CommonConstants
.
FOUR_INT
);
}
else
{
// 批量直接待审核
insert
.
setAuditStatus
(
CommonConstants
.
ONE_INT
);
}
if
(
Common
.
isEmpty
(
insert
.
getContractTerm
())
if
(
Common
.
isEmpty
(
insert
.
getContractTerm
())
&&
Common
.
isNotNull
(
insert
.
getContractStart
())
&&
Common
.
isNotNull
(
insert
.
getContractStart
())
&&
Common
.
isNotNull
(
insert
.
getContractEnd
()))
{
&&
Common
.
isNotNull
(
insert
.
getContractEnd
()))
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
b7d51874
...
@@ -403,7 +403,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
...
@@ -403,7 +403,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
// 更新processStatus为电子签发起失败
// 更新processStatus为电子签发起失败
LambdaUpdateWrapper
<
TEmployeeContractPre
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
LambdaUpdateWrapper
<
TEmployeeContractPre
>
updateWrapper
=
new
LambdaUpdateWrapper
<>();
updateWrapper
.
eq
(
TEmployeeContractPre:
:
getId
,
contractPre
.
getId
())
updateWrapper
.
eq
(
TEmployeeContractPre:
:
getId
,
contractPre
.
getId
())
.
set
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
SIX
_STRING
)
.
set
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
FIVE
_STRING
)
.
set
(
TEmployeeContractPre:
:
getErrorInfo
,
errorMsg
)
.
set
(
TEmployeeContractPre:
:
getErrorInfo
,
errorMsg
)
.
set
(
TEmployeeContractPre:
:
getErrorTime
,
LocalDateTimeUtils
.
convertLDToDate
(
LocalDate
.
now
()));
.
set
(
TEmployeeContractPre:
:
getErrorTime
,
LocalDateTimeUtils
.
convertLDToDate
(
LocalDate
.
now
()));
this
.
update
(
updateWrapper
);
this
.
update
(
updateWrapper
);
...
@@ -765,7 +765,8 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
...
@@ -765,7 +765,8 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
updateWrapper
.
eq
(
TEmployeeContractPre:
:
getId
,
contractPre
.
getId
())
updateWrapper
.
eq
(
TEmployeeContractPre:
:
getId
,
contractPre
.
getId
())
.
set
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
ONE_STRING
)
// 待发起
.
set
(
TEmployeeContractPre:
:
getProcessStatus
,
CommonConstants
.
ONE_STRING
)
// 待发起
.
set
(
TEmployeeContractPre:
:
getSignType
,
CommonConstants
.
ONE_STRING
)
// 线下签
.
set
(
TEmployeeContractPre:
:
getSignType
,
CommonConstants
.
ONE_STRING
)
// 线下签
.
set
(
TEmployeeContractPre:
:
getRevokeReason
,
"超时未签署自行变更为线下签"
);
.
set
(
TEmployeeContractPre:
:
getRevokeReason
,
"超时未签署自行变更为线下签"
)
.
set
(
TEmployeeContractPre:
:
getChangeTypeReason
,
"超时未签署自行变更为线下签"
);
this
.
update
(
updateWrapper
);
this
.
update
(
updateWrapper
);
TEmployeeContractAudit
audit
=
new
TEmployeeContractAudit
();
TEmployeeContractAudit
audit
=
new
TEmployeeContractAudit
();
audit
.
setRootName
(
"撤销签署"
);
audit
.
setRootName
(
"撤销签署"
);
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml
View file @
b7d51874
...
@@ -517,6 +517,7 @@
...
@@ -517,6 +517,7 @@
WHEN a.type =2 THEN "派增-续签"
WHEN a.type =2 THEN "派增-续签"
WHEN a.type =3 THEN "派减-作废"
WHEN a.type =3 THEN "派减-作废"
WHEN a.type =4 THEN "派减-终止"
WHEN a.type =4 THEN "派减-终止"
WHEN a.type =5 THEN "自动化派单-无需审核"
ELSE a.type END as "type",
ELSE a.type END as "type",
b.REMARK,
b.REMARK,
a.REMARK as memo,
a.REMARK as memo,
...
@@ -597,6 +598,7 @@
...
@@ -597,6 +598,7 @@
WHEN a.type =2 THEN "派增-续签"
WHEN a.type =2 THEN "派增-续签"
WHEN a.type =3 THEN "派减-作废"
WHEN a.type =3 THEN "派减-作废"
WHEN a.type =4 THEN "派减-终止"
WHEN a.type =4 THEN "派减-终止"
WHEN a.type =5 THEN "自动化派单-无需审核"
ELSE a.type END as "type",
ELSE a.type END as "type",
a.CREATE_TIME,
a.CREATE_TIME,
count(1) CREATE_NUM,
count(1) CREATE_NUM,
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfoPre.java
View file @
b7d51874
...
@@ -98,6 +98,27 @@ public class TDispatchInfoPre extends BaseEntity {
...
@@ -98,6 +98,27 @@ public class TDispatchInfoPre extends BaseEntity {
@ExcelProperty
(
"社保缴纳地-县"
)
@ExcelProperty
(
"社保缴纳地-县"
)
@Schema
(
description
=
"社保缴纳地-县"
)
@Schema
(
description
=
"社保缴纳地-县"
)
private
String
socialTown
;
private
String
socialTown
;
/**
* 社保缴纳地-省
*/
@ExcelAttribute
(
name
=
"社保缴纳地-省id"
)
@ExcelProperty
(
"社保缴纳地-省"
)
@Schema
(
description
=
"社保缴纳地-省"
)
private
String
socialProvinceId
;
/**
* 社保缴纳地-市
*/
@ExcelAttribute
(
name
=
"社保缴纳地-市"
)
@ExcelProperty
(
"社保缴纳地-市"
)
@Schema
(
description
=
"社保缴纳地-市"
)
private
String
socialCityId
;
/**
* 社保缴纳地-县
*/
@ExcelAttribute
(
name
=
"社保缴纳地-县"
)
@ExcelProperty
(
"社保缴纳地-县"
)
@Schema
(
description
=
"社保缴纳地-县"
)
private
String
socialTownId
;
/**
/**
* 公积金缴纳地-省
* 公积金缴纳地-省
*/
*/
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
View file @
b7d51874
...
@@ -291,6 +291,10 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
...
@@ -291,6 +291,10 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
TDispatchInfoPreVo
pre
=
new
TDispatchInfoPreVo
();
TDispatchInfoPreVo
pre
=
new
TDispatchInfoPreVo
();
BeanUtils
.
copyProperties
(
preExit
,
pre
);
BeanUtils
.
copyProperties
(
preExit
,
pre
);
if
(
Common
.
isNotNull
(
preExit
.
getExpectedCollectionTime
()))
{
pre
.
setExpectedCollectionTime
(
LocalDateTimeUtils
.
convertLDTToDate
(
preExit
.
getExpectedCollectionTime
()));
pre
.
setExpectedConfirmTime
(
LocalDateTimeUtils
.
convertLDTToDate
(
preExit
.
getExpectedConfirmTime
()));
}
preSocialListVo
.
setDispatchInfoPreVo
(
pre
);
preSocialListVo
.
setDispatchInfoPreVo
(
pre
);
}
}
return
preSocialListVo
;
return
preSocialListVo
;
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
View file @
b7d51874
...
@@ -11,8 +11,11 @@
...
@@ -11,8 +11,11 @@
<result
property=
"processStatus"
column=
"PROCESS_STATUS"
/>
<result
property=
"processStatus"
column=
"PROCESS_STATUS"
/>
<result
property=
"deptId"
column=
"DEPT_ID"
/>
<result
property=
"deptId"
column=
"DEPT_ID"
/>
<result
property=
"socialProvince"
column=
"SOCIAL_PROVINCE"
/>
<result
property=
"socialProvince"
column=
"SOCIAL_PROVINCE"
/>
<result
property=
"socialProvinceId"
column=
"SOCIAL_PROVINCE_ID"
/>
<result
property=
"socialCity"
column=
"SOCIAL_CITY"
/>
<result
property=
"socialCity"
column=
"SOCIAL_CITY"
/>
<result
property=
"socialCityId"
column=
"SOCIAL_CITY_ID"
/>
<result
property=
"socialTown"
column=
"SOCIAL_TOWN"
/>
<result
property=
"socialTown"
column=
"SOCIAL_TOWN"
/>
<result
property=
"socialTownId"
column=
"SOCIAL_TOWN_ID"
/>
<result
property=
"fundProvince"
column=
"FUND_PROVINCE"
/>
<result
property=
"fundProvince"
column=
"FUND_PROVINCE"
/>
<result
property=
"fundCity"
column=
"FUND_CITY"
/>
<result
property=
"fundCity"
column=
"FUND_CITY"
/>
<result
property=
"fundTown"
column=
"FUND_TOWN"
/>
<result
property=
"fundTown"
column=
"FUND_TOWN"
/>
...
@@ -135,7 +138,8 @@
...
@@ -135,7 +138,8 @@
a.CREATE_NAME,
a.CREATE_NAME,
a.UPDATE_TIME,
a.UPDATE_TIME,
a.CREATE_TIME,
a.CREATE_TIME,
a.DELETE_FLAG,error_info,error_time,a.DISPATCHER_ID,a.error_back_info,a.position,SOCIAL_FUND_ID,a.phone
a.DELETE_FLAG,error_info,error_time,a.DISPATCHER_ID,a.error_back_info,a.position,SOCIAL_FUND_ID,a.phone,
a.SOCIAL_PROVINCE_ID,a.SOCIAL_CITY_ID,a.SOCIAL_TOWN_ID
</sql>
</sql>
<sql
id=
"tDispatchInfoPre_where"
>
<sql
id=
"tDispatchInfoPre_where"
>
<if
test=
"tDispatchInfoPre != null"
>
<if
test=
"tDispatchInfoPre != null"
>
...
...
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