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
4453d7ae
Commit
4453d7ae
authored
Aug 30, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
1259cba1
9a5dde17
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
34 changed files
with
1793 additions
and
49 deletions
+1793
-49
CommonConstants.java
...ud.plus.v1/yifu/common/core/constant/CommonConstants.java
+2
-0
EkpFundProperties.java
...yifu.cloud.plus.v1/yifu/ekp/config/EkpFundProperties.java
+32
-0
EkpSocialProperties.java
...fu.cloud.plus.v1/yifu/ekp/config/EkpSocialProperties.java
+32
-0
EkpFundUtil.java
...ava/com/yifu.cloud.plus.v1/yifu/ekp/util/EkpFundUtil.java
+73
-0
EkpSocialUtil.java
...a/com/yifu.cloud.plus.v1/yifu/ekp/util/EkpSocialUtil.java
+73
-0
EkpPushFundParam.java
.../com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpPushFundParam.java
+140
-0
EkpPushSocialParam.java
...om/yifu/cloud/plus/v1/yifu/ekp/vo/EkpPushSocialParam.java
+244
-0
spring.factories
...u-common-ekp/src/main/resources/META-INF/spring.factories
+3
-1
ekpFundConfig.properties
...fu-common-ekp/src/main/resources/ekpFundConfig.properties
+6
-0
ekpSocialConfig.properties
...-common-ekp/src/main/resources/ekpSocialConfig.properties
+6
-0
SocialTask.java
...n/java/com/yifu/cloud/plus/v1/job/compont/SocialTask.java
+48
-0
TOrderEnclosure.java
...yifu/cloud/plus/v1/yifu/order/entity/TOrderEnclosure.java
+1
-1
OrderController.java
.../cloud/plus/v1/yifu/order/controller/OrderController.java
+1
-1
TOrderService.java
.../yifu/cloud/plus/v1/yifu/order/service/TOrderService.java
+1
-1
TOrderServiceImpl.java
...ud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java
+43
-35
SysMessageSalaryController.java
...v1/yifu/salary/controller/SysMessageSalaryController.java
+1
-1
TStatisticsDeclarerServiceImpl.java
...u/salary/service/impl/TStatisticsDeclarerServiceImpl.java
+4
-0
SysMessageSalaryMapper.xml
...-biz/src/main/resources/mapper/SysMessageSalaryMapper.xml
+4
-4
TStatisticsLaborMapper.xml
...-biz/src/main/resources/mapper/TStatisticsLaborMapper.xml
+0
-1
TStatisticsRemunerationMapper.xml
...c/main/resources/mapper/TStatisticsRemunerationMapper.xml
+0
-1
TPaymentInfo.java
...m/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
+1
-1
EkpSocialFundParam.java
...yifu/cloud/plus/v1/yifu/social/vo/EkpSocialFundParam.java
+266
-0
pom.xml
yifu-social/yifu-social-biz/pom.xml
+5
-0
SocialConstants.java
.../cloud/plus/v1/yifu/social/constants/SocialConstants.java
+1
-0
TForecastLibraryController.java
...v1/yifu/social/controller/TForecastLibraryController.java
+28
-0
TPaymentInfoController.java
...lus/v1/yifu/social/controller/TPaymentInfoController.java
+28
-0
TForecastLibraryMapper.java
...ud/plus/v1/yifu/social/mapper/TForecastLibraryMapper.java
+8
-0
TPaymentInfoMapper.java
.../cloud/plus/v1/yifu/social/mapper/TPaymentInfoMapper.java
+9
-0
TForecastLibraryService.java
.../plus/v1/yifu/social/service/TForecastLibraryService.java
+3
-0
TPaymentInfoService.java
...loud/plus/v1/yifu/social/service/TPaymentInfoService.java
+2
-1
TForecastLibraryServiceImpl.java
...yifu/social/service/impl/TForecastLibraryServiceImpl.java
+353
-1
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+354
-0
TForecastLibraryMapper.xml
...-biz/src/main/resources/mapper/TForecastLibraryMapper.xml
+10
-0
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+11
-0
No files found.
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/CommonConstants.java
View file @
4453d7ae
...
...
@@ -297,6 +297,8 @@ public interface CommonConstants {
String
SEX_MAN
=
"1"
;
String
SEX_WONMAN
=
"2"
;
String
SALARY_ISFLAG
=
"已结算"
;
String
SALARY_UNFLAG
=
"未结算"
;
// 是否
String
IS_FALSE
=
"否"
;
...
...
yifu-common/yifu-common-ekp/src/main/java/com/yifu.cloud.plus.v1/yifu/ekp/config/EkpFundProperties.java
0 → 100644
View file @
4453d7ae
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
ekp
.
config
;
import
lombok.Data
;
import
org.springframework.boot.context.properties.ConfigurationProperties
;
import
org.springframework.context.annotation.PropertySource
;
import
org.springframework.stereotype.Component
;
/**
* @Author huyc
* @Description 公积金明细对接
* @Date 11:57 2022/8/29
* @Param
* @return
**/
@Data
@Component
@PropertySource
(
"classpath:ekpFundConfig.properties"
)
@ConfigurationProperties
(
value
=
"ekpfund"
,
ignoreInvalidFields
=
false
)
public
class
EkpFundProperties
{
String
url
;
String
fdModelId
;
String
fdFlowId
;
String
docStatus
;
String
LoginName
;
String
docSubject
;
}
yifu-common/yifu-common-ekp/src/main/java/com/yifu.cloud.plus.v1/yifu/ekp/config/EkpSocialProperties.java
0 → 100644
View file @
4453d7ae
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
ekp
.
config
;
import
lombok.Data
;
import
org.springframework.boot.context.properties.ConfigurationProperties
;
import
org.springframework.context.annotation.PropertySource
;
import
org.springframework.stereotype.Component
;
/**
* @Author huyc
* @Description 社保明细对接
* @Date 11:57 2022/8/29
* @Param
* @return
**/
@Data
@Component
@PropertySource
(
"classpath:ekpSocialConfig.properties"
)
@ConfigurationProperties
(
value
=
"ekpsocial"
,
ignoreInvalidFields
=
false
)
public
class
EkpSocialProperties
{
String
url
;
String
fdModelId
;
String
fdFlowId
;
String
docStatus
;
String
LoginName
;
String
docSubject
;
}
yifu-common/yifu-common-ekp/src/main/java/com/yifu.cloud.plus.v1/yifu/ekp/util/EkpFundUtil.java
0 → 100644
View file @
4453d7ae
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
ekp
.
util
;
import
cn.hutool.json.JSONObject
;
import
com.yifu.cloud.plus.v1.yifu.ekp.config.EkpFundProperties
;
import
com.yifu.cloud.plus.v1.yifu.ekp.constant.EkpConstants
;
import
com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpPushFundParam
;
import
io.micrometer.core.instrument.util.StringUtils
;
import
lombok.extern.log4j.Log4j2
;
import
org.codehaus.jackson.map.ObjectMapper
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.context.properties.EnableConfigurationProperties
;
import
org.springframework.http.*
;
import
org.springframework.util.LinkedMultiValueMap
;
import
org.springframework.util.MultiValueMap
;
import
org.springframework.web.client.RestTemplate
;
/**
* @Author huyc
* @Date 2022/8/29
* @Description
* @Version 1.0
*/
@Log4j2
@EnableConfigurationProperties
(
EkpFundProperties
.
class
)
public
class
EkpFundUtil
{
@Autowired
private
EkpFundProperties
ekpProperties
;
public
String
sendToEKP
(
EkpPushFundParam
param
){
log
.
info
(
"推送EKP开始--公积金明细数据"
);
RestTemplate
yourRestTemplate
=
new
RestTemplate
();
try
{
String
formValues
=
new
ObjectMapper
().
writeValueAsString
(
param
);
//指向EKP的接口url
//把ModelingAppModelParameterAddForm转换成MultiValueMap
JSONObject
loginName
=
new
JSONObject
();
loginName
.
append
(
"LoginName"
,
ekpProperties
.
getLoginName
());
String
loginData
=
new
ObjectMapper
().
writeValueAsString
(
loginName
);
MultiValueMap
<
String
,
Object
>
wholeForm
=
new
LinkedMultiValueMap
<>();
//wholeForm.add("docSubject", new String(docSubject.getBytes("UTF-8"),"ISO-8859-1") );
wholeForm
.
add
(
"docSubject"
,
ekpProperties
.
getDocSubject
());
wholeForm
.
add
(
"docCreator"
,
"{\"LoginName\":\"admin\"}"
);
//wholeForm.add("docCreator", loginData);
wholeForm
.
add
(
"docStatus"
,
ekpProperties
.
getDocStatus
());
wholeForm
.
add
(
"fdModelId"
,
ekpProperties
.
getFdModelId
());
wholeForm
.
add
(
"fdFlowId"
,
ekpProperties
.
getFdFlowId
());
//wholeForm.add("formValues", new String(formValues.getBytes("UTF-8"),"ISO-8859-1"));
wholeForm
.
add
(
"formValues"
,
formValues
);
//wholeForm.add("formValues", new String("{\"fd_3adfe6af71a1cc\":\"王五\", \"fd_3adfe658c6229e\":\"2019-03-26\", \"fd_3adfe6592b4158\":\"这里内容\"}".getBytes("UTF-8"),"ISO-8859-1") );
System
.
out
.
println
(
"wholeForm:"
+
wholeForm
);
HttpHeaders
headers
=
new
HttpHeaders
();
//如果EKP对该接口启用了Basic认证,那么客户端需要加入
//addAuth(headers,"yourAccount"+":"+"yourPassword");是VO,则使用APPLICATION_JSON
headers
.
setContentType
(
MediaType
.
MULTIPART_FORM_DATA
);
//必须设置上传类型,如果入参是字符串,使用MediaType.TEXT_PLAIN;如果
HttpEntity
<
MultiValueMap
<
String
,
Object
>>
entity
=
new
HttpEntity
<
MultiValueMap
<
String
,
Object
>>(
wholeForm
,
headers
);
//有返回值的情况 VO可以替换成具体的JavaBean
ResponseEntity
<
String
>
obj
=
yourRestTemplate
.
exchange
(
ekpProperties
.
getUrl
(),
HttpMethod
.
POST
,
entity
,
String
.
class
);
String
body
=
obj
.
getBody
();
if
(
StringUtils
.
isBlank
(
body
)){
log
.
error
(
EkpConstants
.
SEND_FAILED
);
return
null
;
}
else
{
log
.
info
(
EkpConstants
.
SEND_SUCCESS
+
body
);
return
body
;
}
}
catch
(
Exception
e
){
log
.
info
(
e
.
getMessage
());
return
null
;
}
}
}
yifu-common/yifu-common-ekp/src/main/java/com/yifu.cloud.plus.v1/yifu/ekp/util/EkpSocialUtil.java
0 → 100644
View file @
4453d7ae
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
ekp
.
util
;
import
cn.hutool.json.JSONObject
;
import
com.yifu.cloud.plus.v1.yifu.ekp.config.EkpSocialProperties
;
import
com.yifu.cloud.plus.v1.yifu.ekp.constant.EkpConstants
;
import
com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpPushSocialParam
;
import
io.micrometer.core.instrument.util.StringUtils
;
import
lombok.extern.log4j.Log4j2
;
import
org.codehaus.jackson.map.ObjectMapper
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.context.properties.EnableConfigurationProperties
;
import
org.springframework.http.*
;
import
org.springframework.util.LinkedMultiValueMap
;
import
org.springframework.util.MultiValueMap
;
import
org.springframework.web.client.RestTemplate
;
/**
* @Author huyc
* @Date 2022/8/29
* @Description
* @Version 1.0
*/
@Log4j2
@EnableConfigurationProperties
(
EkpSocialProperties
.
class
)
public
class
EkpSocialUtil
{
@Autowired
private
EkpSocialProperties
ekpProperties
;
public
String
sendToEKP
(
EkpPushSocialParam
param
){
log
.
info
(
"推送EKP开始--社保明细数据"
);
RestTemplate
yourRestTemplate
=
new
RestTemplate
();
try
{
String
formValues
=
new
ObjectMapper
().
writeValueAsString
(
param
);
//指向EKP的接口url
//把ModelingAppModelParameterAddForm转换成MultiValueMap
JSONObject
loginName
=
new
JSONObject
();
loginName
.
append
(
"LoginName"
,
ekpProperties
.
getLoginName
());
String
loginData
=
new
ObjectMapper
().
writeValueAsString
(
loginName
);
MultiValueMap
<
String
,
Object
>
wholeForm
=
new
LinkedMultiValueMap
<>();
//wholeForm.add("docSubject", new String(docSubject.getBytes("UTF-8"),"ISO-8859-1") );
wholeForm
.
add
(
"docSubject"
,
ekpProperties
.
getDocSubject
());
wholeForm
.
add
(
"docCreator"
,
"{\"LoginName\":\"admin\"}"
);
//wholeForm.add("docCreator", loginData);
wholeForm
.
add
(
"docStatus"
,
ekpProperties
.
getDocStatus
());
wholeForm
.
add
(
"fdModelId"
,
ekpProperties
.
getFdModelId
());
wholeForm
.
add
(
"fdFlowId"
,
ekpProperties
.
getFdFlowId
());
//wholeForm.add("formValues", new String(formValues.getBytes("UTF-8"),"ISO-8859-1"));
wholeForm
.
add
(
"formValues"
,
formValues
);
//wholeForm.add("formValues", new String("{\"fd_3adfe6af71a1cc\":\"王五\", \"fd_3adfe658c6229e\":\"2019-03-26\", \"fd_3adfe6592b4158\":\"这里内容\"}".getBytes("UTF-8"),"ISO-8859-1") );
System
.
out
.
println
(
"wholeForm:"
+
wholeForm
);
HttpHeaders
headers
=
new
HttpHeaders
();
//如果EKP对该接口启用了Basic认证,那么客户端需要加入
//addAuth(headers,"yourAccount"+":"+"yourPassword");是VO,则使用APPLICATION_JSON
headers
.
setContentType
(
MediaType
.
MULTIPART_FORM_DATA
);
//必须设置上传类型,如果入参是字符串,使用MediaType.TEXT_PLAIN;如果
HttpEntity
<
MultiValueMap
<
String
,
Object
>>
entity
=
new
HttpEntity
<
MultiValueMap
<
String
,
Object
>>(
wholeForm
,
headers
);
//有返回值的情况 VO可以替换成具体的JavaBean
ResponseEntity
<
String
>
obj
=
yourRestTemplate
.
exchange
(
ekpProperties
.
getUrl
(),
HttpMethod
.
POST
,
entity
,
String
.
class
);
String
body
=
obj
.
getBody
();
if
(
StringUtils
.
isBlank
(
body
)){
log
.
error
(
EkpConstants
.
SEND_FAILED
);
return
null
;
}
else
{
log
.
info
(
EkpConstants
.
SEND_SUCCESS
+
body
);
return
body
;
}
}
catch
(
Exception
e
){
log
.
info
(
e
.
getMessage
());
return
null
;
}
}
}
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpPushFundParam.java
0 → 100644
View file @
4453d7ae
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
ekp
.
vo
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* @Author hyc
* @Date 2022/8/26
* @Description 公积金明细对应参数
* @Version 1.0
*/
@Data
public
class
EkpPushFundParam
implements
Serializable
{
/**
* 订单类型
**/
private
String
fd_3add9dd7833db8
;
/**
* 与工资合并结算
**/
private
String
fd_3add9e1a670144
;
/**
* 是否有预估
**/
private
String
fd_3add9de0be85e4
;
/**
* 项目编码
**/
private
String
fd_3adfe8c70d3fd4
;
/**
* 项目名称
**/
private
String
fd_3adfe8c8468e54
;
/**
* 单号
**/
private
String
fd_3adfe95c169c48
;
/**
* 客户编码
**/
private
String
fd_3adfe8c73cb5a4
;
/**
* 客户名称
**/
private
String
fd_3adfe8c81a0e42
;
/**
* 公积金账户
**/
private
String
fd_3aeafa8cc144bc
;
/**
* 姓名
**/
private
String
fd_3adfe8c79989d4
;
/**
* 身份证号
**/
private
String
fd_3adfe8c7e4cf7a
;
/**
* 生成月份
**/
private
String
fd_3adfe8cb96c41e
;
/**
* 缴纳月份
**/
private
String
fd_3adfe8cf632700
;
/**
* 结算月份
**/
private
String
fd_3adfe8cff746bc
;
/**
* 预估单位代缴
**/
private
String
fd_3adfeb4e8064a8
;
/**
* 预估个人代缴
**/
private
String
fd_3adfeb52a4d2e2
;
/**
* 单位代缴
**/
private
String
fd_3adfeb52fbe966
;
/**
* 个人代缴
**/
private
String
fd_3adfeb5366dd82
;
/**
* 单位差异
**/
private
String
fd_3adfeb53c70f72
;
/**
* 个人差异
**/
private
String
fd_3adfeb5413fb44
;
/**
* 应收
**/
private
String
fd_3adfeb7b624f06
;
/**
* 结算状态
**/
private
String
fd_3add9ea428879a
;
/**
* 收款状态
**/
private
String
fd_3add9eaeed2560
;
/**
* 结算单号
**/
private
String
fd_3adfeb830523b6
;
/**
* 收款单号
**/
private
String
fd_3adfeb8489e6c2
;
/**
* 应支出
**/
private
String
fd_3adfeb7bd97464
;
/**
* 支出结算状态
**/
private
String
fd_3add9edfbc6f7e
;
/**
* 付款状态
**/
private
String
fd_3add9eed23894a
;
/**
* 支出缴纳单号
**/
private
String
fd_3adfeb83a704c8
;
/**
* 付款单号
**/
private
String
fd_3adfeb84175f28
;
/**
* 我司到款单位
**/
private
String
fd_3b019a2e9bfdd6
;
}
\ No newline at end of file
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpPushSocialParam.java
0 → 100644
View file @
4453d7ae
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
ekp
.
vo
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* @Author hyc
* @Date 2022/8/26
* @Description 社保明细对应参数
* @Version 1.0
*/
@Data
public
class
EkpPushSocialParam
implements
Serializable
{
/**
* 订单类型
**/
private
String
fd_3add9dd7833db8
;
/**
* 与工资合并结算
**/
private
String
fd_3add9e1a670144
;
/**
* 是否有预估
**/
private
String
fd_3add9de0be85e4
;
/**
* 项目编码
**/
private
String
fd_3adfe8c70d3fd4
;
/**
* 项目名称
**/
private
String
fd_3adfe8c8468e54
;
/**
* 单号
**/
private
String
fd_3adfe95c169c48
;
/**
* 客户编码
**/
private
String
fd_3adfe8c73cb5a4
;
/**
* 客户名称
**/
private
String
fd_3adfe8c81a0e42
;
/**
* 社保户
**/
private
String
fd_3aeafa25916e82
;
/**
* 姓名
**/
private
String
fd_3adfe8c79989d4
;
/**
* 身份证号
**/
private
String
fd_3adfe8c7e4cf7a
;
/**
* 生成月份
**/
private
String
fd_3adfe8cb96c41e
;
/**
* 缴纳月份
**/
private
String
fd_3adfe8cf632700
;
/**
* 结算月份
**/
private
String
fd_3adfe8cff746bc
;
/**
* 预估单位合计
**/
private
String
fd_3adfeb4e8064a8
;
/**
* 预估个人合计
**/
private
String
fd_3adfeb52a4d2e2
;
/**
* 单位差异
**/
private
String
fd_3adfeb53c70f72
;
/**
* 个人差异
**/
private
String
fd_3adfeb5413fb44
;
/**
* 应收
**/
private
String
fd_3adfeb7b624f06
;
/**
* 结算状态
**/
private
String
fd_3add9ea428879a
;
/**
* 收款状态
**/
private
String
fd_3add9eaeed2560
;
/**
* 结算单号
**/
private
String
fd_3adfeb830523b6
;
/**
* 收款单号
**/
private
String
fd_3adfeb8489e6c2
;
/**
* 应支出
**/
private
String
fd_3adfeb7bd97464
;
/**
* 支出结算状态
**/
private
String
fd_3add9edfbc6f7e
;
/**
* 付款状态
**/
private
String
fd_3add9eed23894a
;
/**
* 支出缴纳单号
**/
private
String
fd_3adfeb83a704c8
;
/**
* 实缴单位生育
**/
private
String
fd_3af9ee3afb34c2
;
/**
* 付款单号
**/
private
String
fd_3adfeb84175f28
;
/**
* 预估单位养老
**/
private
String
fd_3af9ec80a9de7a
;
/**
* 实缴个人合计
**/
private
String
fd_3af9ee3cb6d4fa
;
/**
* 预估合计
**/
private
String
fd_3af9ed7e813b86
;
/**
* 实缴单位合计
**/
private
String
fd_3af9ee3c0bf286
;
/**
* 实缴个人补缴利息
**/
private
String
fd_3af9ee3d634946
;
/**
* 实缴单位医疗
**/
private
String
fd_3af9ee39dea6a8
;
/**
* 预估单位失业
**/
private
String
fd_3af9eba5f6e19e
;
/**
* 预估个人补缴利息
**/
private
String
fd_3af9ebbecc4aa8
;
/**
* 实缴单位养老
**/
private
String
fd_3af9ee3938170a
;
/**
* 预估单位生育
**/
private
String
fd_3af9eba71c0138
;
/**
* 预估单位大病救助
**/
private
String
fd_3af9eba863c0ee
;
/**
* 实缴个人失业
**/
private
String
fd_3af9ee3db44d96
;
/**
* 实缴单位补缴利息
**/
private
String
fd_3af9ee3b5ddae8
;
/**
* 实缴单位大病救助
**/
private
String
fd_3af9ee3ba76f54
;
/**
* 实缴单位工伤
**/
private
String
fd_3af9ee3aa9c84a
;
/**
* 实缴合计
**/
private
String
fd_3af9ee3c6bfc74
;
/**
* 预估单位补缴利息
**/
private
String
fd_3af9eba7c3da5e
;
/**
* 预估单位医疗
**/
private
String
fd_3af9eba5899c90
;
/**
* 预估个人养老
**/
private
String
fd_3af9ebbd791662
;
/**
* 预估个人大病救助
**/
private
String
fd_3af9ebbf3e8be2
;
/**
* 预估个人医疗
**/
private
String
fd_3af9ebbdd9797e
;
/**
* 实缴个人医疗
**/
private
String
fd_3af9ee3e066d48
;
/**
* 实缴单位失业
**/
private
String
fd_3af9ee3a46b7e6
;
/**
* 预估个人失业
**/
private
String
fd_3af9ebbe29ce1c
;
/**
* 实缴个人养老
**/
private
String
fd_3af9ee3e513962
;
/**
* 实缴个人大病救助
**/
private
String
fd_3af9ee3d0ba3b6
;
/**
* 预估单位工伤
**/
private
String
fd_3af9eba684f592
;
/**
* 我司到款单位
**/
private
String
fd_3b01953871b8be
;
}
\ No newline at end of file
yifu-common/yifu-common-ekp/src/main/resources/META-INF/spring.factories
View file @
4453d7ae
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSalaryUtil
\ No newline at end of file
com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSalaryUtil,\
com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSocialUtil,\
com.yifu.cloud.plus.v1.yifu.ekp.util.EkpFundUtil
\ No newline at end of file
yifu-common/yifu-common-ekp/src/main/resources/ekpFundConfig.properties
0 → 100644
View file @
4453d7ae
ekpfund.url
=
http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
ekpfund.fdModelId
=
181d741547a691aa68b16149a40de901
ekpfund.fdFlowId
=
18290af372be55308327273487abf72a
ekpfund.docStatus
=
20
ekpfund.LoginName
=
admin
ekpfund.docSubject
=
\u
516C
\u
79EF
\u
91D1
\u
660E
\u
7EC6
\u6570\u
636E
\u
63A5
\u
53E3
yifu-common/yifu-common-ekp/src/main/resources/ekpSocialConfig.properties
0 → 100644
View file @
4453d7ae
ekpsocial.url
=
http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
ekpsocial.fdModelId
=
181d741547a69ba9dbc12377948e98fd
ekpsocial.fdFlowId
=
18233028fe91511376b00f74b3a8f3a7
ekpsocial.docStatus
=
20
ekpsocial.LoginName
=
admin
ekpsocial.docSubject
=
\u
793E
\u
4FDD
\u
660E
\u
7EC6
\u6570\u
636E
\u
63A5
\u
53E3
yifu-job/yifu-job-api/src/main/java/com/yifu/cloud/plus/v1/job/compont/SocialTask.java
View file @
4453d7ae
...
...
@@ -50,4 +50,52 @@ public class SocialTask {
log
.
info
(
"------------每月定时生成下月预估库数据-定时任务结束------------"
);
}
/**
* @Description: 定时生成社保预估明细的数据
* @Author: huyc
* @Date: 2022/8/30
* @return: void
**/
public
void
createForecastInfo
()
{
log
.
info
(
"------------定时生成社保预估明细的数据-定时任务开始------------"
);
HttpDaprUtil
.
invokeMethodPost
(
daprProperties
.
getAppUrl
(),
daprProperties
.
getAppId
(),
"/tforecastlibrary/inner/createForecastInfo"
,
""
,
Object
.
class
,
SecurityConstants
.
FROM_IN
);
log
.
info
(
"------------定时生成社保预估明细的数据-定时任务结束------------"
);
}
/**
* @Description: 定时生成公积金预估明细的数据
* @Author: huyc
* @Date: 2022/8/30
* @return: void
**/
public
void
createForecastFundInfo
()
{
log
.
info
(
"------------定时生成公积金预估明细的数据-定时任务开始------------"
);
HttpDaprUtil
.
invokeMethodPost
(
daprProperties
.
getAppUrl
(),
daprProperties
.
getAppId
(),
"/tforecastlibrary/inner/createForecastFundInfo"
,
""
,
Object
.
class
,
SecurityConstants
.
FROM_IN
);
log
.
info
(
"------------定时生成公积金预估明细的数据-定时任务结束------------"
);
}
/**
* @Description: 定时生成社保缴费库明细的数据
* @Author: huyc
* @Date: 2022/8/30
* @return: void
**/
public
void
createPaymentSocialInfo
()
{
log
.
info
(
"------------定时生成社保缴费库明细的数据-定时任务开始------------"
);
HttpDaprUtil
.
invokeMethodPost
(
daprProperties
.
getAppUrl
(),
daprProperties
.
getAppId
(),
"/tpaymentinfo/inner/createPaymentSocialInfo"
,
""
,
Object
.
class
,
SecurityConstants
.
FROM_IN
);
log
.
info
(
"------------定时生成社保缴费库明细的数据-定时任务结束------------"
);
}
/**
* @Description: 定时生成公积金缴费库明细的数据
* @Author: huyc
* @Date: 2022/8/30
* @return: void
**/
public
void
createPaymentFundInfo
()
{
log
.
info
(
"------------定时生成公积金缴费库明细的数据-定时任务开始------------"
);
HttpDaprUtil
.
invokeMethodPost
(
daprProperties
.
getAppUrl
(),
daprProperties
.
getAppId
(),
"/tpaymentinfo/inner/createPaymentFundInfo"
,
""
,
Object
.
class
,
SecurityConstants
.
FROM_IN
);
log
.
info
(
"------------定时生成公积金缴费库明细的数据-定时任务结束------------"
);
}
}
yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/entity/TOrderEnclosure.java
View file @
4453d7ae
...
...
@@ -28,7 +28,7 @@ public class TOrderEnclosure implements Serializable {
/**
* 附件标识是0时是订单编号,1时是回复表id
*/
@
Schema
(
description
=
"附件标识是0时是订单编号,1时是回复表id"
)
@
JsonIgnore
private
String
orderNo
;
/**
...
...
yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/controller/OrderController.java
View file @
4453d7ae
...
...
@@ -114,7 +114,7 @@ public class OrderController {
*/
@Schema
(
description
=
"添加回复"
)
@PostMapping
(
value
=
"/uploadReplyEnclosure"
)
public
R
uploadReplyEnclosure
(
@RequestBody
MultipartFile
file
,
String
filePath
,
String
replyContent
,
String
orderNo
)
throws
IOException
{
public
R
uploadReplyEnclosure
(
@RequestBody
MultipartFile
[]
file
,
String
filePath
,
String
replyContent
,
String
orderNo
)
throws
IOException
{
return
tOrderService
.
uploadReplyEnclosure
(
file
,
filePath
,
replyContent
,
orderNo
);
}
...
...
yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/TOrderService.java
View file @
4453d7ae
...
...
@@ -80,7 +80,7 @@ public interface TOrderService extends IService<TOrder> {
* @return {@link R}
* @throws IOException
*/
R
uploadReplyEnclosure
(
MultipartFile
file
,
String
filePath
,
String
replyContent
,
String
orderNo
)
throws
IOException
;
R
uploadReplyEnclosure
(
MultipartFile
[]
file
,
String
filePath
,
String
replyContent
,
String
orderNo
)
throws
IOException
;
/**
* 订单回复列表分页查询
...
...
yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java
View file @
4453d7ae
...
...
@@ -26,6 +26,7 @@ import com.yifu.cloud.plus.v1.yifu.order.vo.OrderReplyListVO;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.compress.utils.Lists
;
import
org.apache.commons.lang3.ArrayUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
...
...
@@ -183,12 +184,12 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
*/
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
R
uploadReplyEnclosure
(
MultipartFile
file
,
String
filePath
,
String
replyContent
,
String
orderNo
)
throws
IOException
{
public
R
uploadReplyEnclosure
(
MultipartFile
[]
file
,
String
filePath
,
String
replyContent
,
String
orderNo
)
throws
IOException
{
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
Common
.
isEmpty
(
orderNo
)){
return
R
.
failed
(
OrderConstants
.
ORDER_NO_IS_EMPTY
);
}
if
(
Common
.
isEmpty
(
replyContent
)
&&
Common
.
isEmpty
(
file
)){
if
(
Common
.
isEmpty
(
replyContent
)
&&
ArrayUtils
.
isEmpty
(
file
)){
return
R
.
failed
(
OrderConstants
.
REPLY_CONTENT_AND_ENCLOSURE_IS_EMPTY
);
}
// 校验回复内容200字以内
...
...
@@ -196,14 +197,19 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
return
R
.
failed
(
OrderConstants
.
REPLY_CONTENT_MORE_THAN_200
);
}
if
(!
Common
.
isEmpty
(
file
)){
if
(!
Common
.
checkInsuranceFile
(
file
.
getOriginalFilename
())){
return
R
.
failed
(
OrderConstants
.
ENCLOSURE_TYPE_IS_ERROR
);
}
if
(
file
.
getSize
()
>
(
CommonConstants
.
FIFTY_INT
*
CommonConstants
.
BYTE
*
CommonConstants
.
BYTE
)){
if
(
ArrayUtils
.
isNotEmpty
(
file
)){
if
(
file
.
length
>
CommonConstants
.
TWENTY_INT
){
return
R
.
failed
(
OrderConstants
.
ENCLOSURE_SIZE_ERROR
);
}
for
(
MultipartFile
multipartFile
:
file
)
{
if
(!
Common
.
checkInsuranceFile
(
multipartFile
.
getOriginalFilename
())){
return
R
.
failed
(
OrderConstants
.
ENCLOSURE_TYPE_IS_ERROR
);
}
if
(
multipartFile
.
getSize
()
>
(
CommonConstants
.
FIFTY_INT
*
CommonConstants
.
BYTE
*
CommonConstants
.
BYTE
)){
return
R
.
failed
(
OrderConstants
.
ENCLOSURE_SIZE_ERROR
);
}
}
}
TOrderReply
reply
=
new
TOrderReply
();
...
...
@@ -214,34 +220,36 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
reply
.
setDeleteFlag
(
CommonConstants
.
ZERO_INT
);
boolean
save
=
tOrderReplyService
.
save
(
reply
);
//todo 同步推送ekp
if
(
save
&&
!
Common
.
isEmpty
(
file
)){
String
fileName
=
System
.
currentTimeMillis
()
+
"_"
+
file
.
getOriginalFilename
();
//filePath不传默认存储空间的根目录
//支持的附件格式
String
key
=
""
;
if
(!
Common
.
isNotNull
(
filePath
))
{
key
=
fileName
;
}
else
{
key
=
filePath
+
"/"
+
fileName
;
}
boolean
flag
=
ossUtil
.
uploadFileByStream
(
file
.
getInputStream
(),
key
,
null
);
if
(
flag
)
{
log
.
info
(
"文件:"
+
fileName
+
"上传至存储空间"
+
ossUtil
.
getBucketName
()
+
"成功!"
);
TOrderEnclosure
orderEnclosure
=
new
TOrderEnclosure
();
orderEnclosure
.
setOrderNo
(
reply
.
getId
());
orderEnclosure
.
setEnclosureName
(
file
.
getOriginalFilename
());
orderEnclosure
.
setEnclosureFlag
(
CommonConstants
.
ONE_INT
);
orderEnclosure
.
setEnclosureAddress
(
key
);
orderEnclosure
.
setDeleteFlag
(
CommonConstants
.
ZERO_INT
);
try
{
tOrderEnclosureService
.
save
(
orderEnclosure
);
}
catch
(
Exception
e
)
{
log
.
error
(
"OSS文件上传接口异常:"
+
e
.
getMessage
());
ossUtil
.
deleteObject
(
null
,
key
);
return
R
.
failed
(
"failed:"
+
e
.
getMessage
());
if
(
save
&&
ArrayUtils
.
isNotEmpty
(
file
)){
for
(
MultipartFile
multipartFile
:
file
)
{
String
fileName
=
System
.
currentTimeMillis
()
+
"_"
+
multipartFile
.
getOriginalFilename
();
//filePath不传默认存储空间的根目录
//支持的附件格式
String
key
=
""
;
if
(!
Common
.
isNotNull
(
filePath
))
{
key
=
fileName
;
}
else
{
key
=
filePath
+
"/"
+
fileName
;
}
boolean
flag
=
ossUtil
.
uploadFileByStream
(
multipartFile
.
getInputStream
(),
key
,
null
);
if
(
flag
)
{
log
.
info
(
"文件:"
+
fileName
+
"上传至存储空间"
+
ossUtil
.
getBucketName
()
+
"成功!"
);
TOrderEnclosure
orderEnclosure
=
new
TOrderEnclosure
();
orderEnclosure
.
setOrderNo
(
reply
.
getId
());
orderEnclosure
.
setEnclosureName
(
multipartFile
.
getOriginalFilename
());
orderEnclosure
.
setEnclosureFlag
(
CommonConstants
.
ONE_INT
);
orderEnclosure
.
setEnclosureAddress
(
key
);
orderEnclosure
.
setDeleteFlag
(
CommonConstants
.
ZERO_INT
);
try
{
tOrderEnclosureService
.
save
(
orderEnclosure
);
}
catch
(
Exception
e
)
{
log
.
error
(
"OSS文件上传接口异常:"
+
e
.
getMessage
());
ossUtil
.
deleteObject
(
null
,
key
);
return
R
.
failed
(
"failed:"
+
e
.
getMessage
());
}
}
else
{
return
R
.
failed
(
OrderConstants
.
OPERATE_FAILED
);
}
}
else
{
return
R
.
failed
(
OrderConstants
.
OPERATE_FAILED
);
}
}
return
R
.
ok
(
OrderConstants
.
OPERATE_SUCCESS
);
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/SysMessageSalaryController.java
View file @
4453d7ae
...
...
@@ -76,7 +76,7 @@ public class SysMessageSalaryController {
**/
@Inner
@Operation
(
description
=
"生成最低工资提醒"
)
@
Ge
tMapping
(
"/inner/createSysMessageSalary"
)
@
Pos
tMapping
(
"/inner/createSysMessageSalary"
)
public
void
createSysMessageSalary
()
{
//薪资月份
String
salaryMonth
=
DateUtil
.
addMonth
(-
1
);
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsDeclarerServiceImpl.java
View file @
4453d7ae
...
...
@@ -154,6 +154,8 @@ public class TStatisticsDeclarerServiceImpl extends ServiceImpl<TStatisticsDecla
tStatisticsDeclarer
.
setIsDeclare
(
isDeclare
);
if
(
Common
.
isNotNull
(
undeclareReason
))
{
tStatisticsDeclarer
.
setUndeclareReason
(
undeclareReason
);
}
else
{
tStatisticsDeclarer
.
setUndeclareReason
(
CommonConstants
.
EMPTY_STRING
);
}
baseMapper
.
updateById
(
tStatisticsDeclarer
);
return
R
.
ok
();
...
...
@@ -283,6 +285,8 @@ public class TStatisticsDeclarerServiceImpl extends ServiceImpl<TStatisticsDecla
tStatisticsDeclarer
.
setIsDeclare
(
excel
.
getIsDeclare
());
if
(
Common
.
isNotNull
(
excel
.
getUndeclareReason
()))
{
tStatisticsDeclarer
.
setUndeclareReason
(
excel
.
getUndeclareReason
());
}
else
{
tStatisticsDeclarer
.
setUndeclareReason
(
CommonConstants
.
EMPTY_STRING
);
}
baseMapper
.
updateById
(
tStatisticsDeclarer
);
}
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/SysMessageSalaryMapper.xml
View file @
4453d7ae
...
...
@@ -178,9 +178,9 @@
province,
city,
town,
DEPT_ID,
DEPT_NAME,
DEPT_NO,
DEPT_ID
as DEPART_ID
,
DEPT_NAME
as DEPART_NAME
,
DEPT_NO
as DEPART_NO
,
0 as TYPE
FROM
(
...
...
@@ -196,7 +196,7 @@
a.SETTLEMENT_MONTH settle_month,
sum(i.SALARY_MONEY) AS actual_salary,
sum(l.SALARY_MONEY) AS relay_Salary,
s.
createBy AS create_by
,
s.
CREATE_BY AS CREATE_BY
,
min(IFNULL(t.salary_base,c.salary_base)) AS salary_base,
a.PROVINCE,
a.CITY,
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsLaborMapper.xml
View file @
4453d7ae
...
...
@@ -94,7 +94,6 @@
#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,sum(a.SALARY_TAX) PERSONAL_TAX,sum(a.ACTUAL_SALARY) INCOME,
a.INVOICE_TITLE DECLARE_UNIT,'一般劳务报酬所得' INCOME_ITEM,'居民身份证' CARD_TYPE
from t_salary_account a
left join t_salary_employee b on b.id = a.EMP_ID
where a.DELETE_FLAG = '1' and a.SETTLEMENT_MONTH like '${lastYear}%' and a.FORM_TYPE = '3'
GROUP BY a.EMP_IDCARD,a.EMP_NAME
</select>
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsRemunerationMapper.xml
View file @
4453d7ae
...
...
@@ -90,7 +90,6 @@
#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,sum(a.SALARY_TAX) PERSONAL_TAX,
sum(a.ACTUAL_SALARY) INCOME,a.INVOICE_TITLE DECLARE_UNIT,'居民身份证' CARD_TYPE
from t_salary_account a
left join t_salary_employee b on b.id = a.EMP_ID
where a.DELETE_FLAG = '1' and a.SETTLEMENT_MONTH like '${lastYear}%' and a.FORM_TYPE = '4'
GROUP BY a.EMP_IDCARD,a.EMP_NAME
</select>
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
View file @
4453d7ae
...
...
@@ -370,7 +370,7 @@ public class TPaymentInfo extends BaseEntity {
private
String
financeBillId
;
/**
*
财务账单ID
*
推送状态
*/
@ExcelAttribute
(
name
=
"推送状态 0已推送 1未推送"
)
@Schema
(
description
=
"推送状态 0已推送 1未推送"
)
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/EkpSocialFundParam.java
0 → 100644
View file @
4453d7ae
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
social
.
vo
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* @Author hyc
* @Date 2022/8/29
* @Description 社保公积金明细对应参数
* @Version 1.0
*/
@Data
public
class
EkpSocialFundParam
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
2689686777914935788L
;
/**
* 主键
*/
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@Schema
(
description
=
"主键"
)
private
String
id
;
/**
* 订单类型
**/
@Schema
(
description
=
"单据类型 (1、预估单 2、实缴单)"
)
private
String
settleType
;
/**
* 与工资合并结算
**/
@Schema
(
description
=
"主键"
)
private
String
fd_3add9e1a670144
;
/**
* 是否有预估
**/
private
String
fd_3add9de0be85e4
;
/**
* 项目编码
*/
@Schema
(
description
=
"项目编码"
)
private
String
deptNo
;
/**
* 项目名称
*/
@Schema
(
description
=
"项目名称"
)
private
String
deptName
;
/**
* 客户名称
*/
@Schema
(
description
=
"客户名称"
)
private
String
customerName
;
/**
* 客户编码
*/
@Schema
(
description
=
"客户编码"
)
private
String
customerCode
;
/**
* 员工姓名
*/
@Schema
(
description
=
"员工姓名"
)
private
String
empName
;
/**
* 员工身份证号
*/
@Schema
(
description
=
"员工身份证号"
)
private
String
empIdcardNo
;
/**
* 单号
**/
@Schema
(
description
=
"单号"
)
private
String
fd_3adfe95c169c48
;
/**
* 社保户
**/
@Schema
(
description
=
"社保户id"
)
private
String
socialHousehold
;
/**
* 生成月份
**/
private
String
createMonth
;
/**
* 缴纳月份
**/
private
String
payMonth
;
/**
* 结算月份
**/
private
String
settleMonth
;
/**
* 预估单位合计
**/
private
String
unitSum
;
/**
* 预估个人合计
**/
private
String
personalSum
;
/**
* 单位差异
**/
private
String
fd_3adfeb53c70f72
;
/**
* 个人差异
**/
private
String
fd_3adfeb5413fb44
;
/**
* 应收
**/
private
String
fd_3adfeb7b624f06
;
/**
* 结算状态
**/
private
String
settleType1
;
/**
* 收款状态
**/
private
String
Type
;
/**
* 结算单号
**/
private
String
fd_3adfeb830523b6
;
/**
* 收款单号
**/
private
String
fd_3adfeb8489e6c2
;
/**
* 应支出
**/
private
String
fd_3adfeb7bd97464
;
/**
* 支出结算状态
**/
private
String
fd_3add9edfbc6f7e
;
/**
* 付款状态
**/
private
String
fd_3add9eed23894a
;
/**
* 支出缴纳单号
**/
private
String
fd_3adfeb83a704c8
;
/**
* 实缴单位生育
**/
private
String
fd_3af9ee3afb34c2
;
/**
* 付款单号
**/
private
String
fd_3adfeb84175f28
;
/**
* 预估单位养老
**/
private
String
fd_3af9ec80a9de7a
;
/**
* 实缴个人合计
**/
private
String
fd_3af9ee3cb6d4fa
;
/**
* 预估合计
**/
private
String
fd_3af9ed7e813b86
;
/**
* 实缴单位合计
**/
private
String
fd_3af9ee3c0bf286
;
/**
* 实缴个人补缴利息
**/
private
String
fd_3af9ee3d634946
;
/**
* 实缴单位医疗
**/
private
String
fd_3af9ee39dea6a8
;
/**
* 预估单位失业
**/
private
String
fd_3af9eba5f6e19e
;
/**
* 预估个人补缴利息
**/
private
String
fd_3af9ebbecc4aa8
;
/**
* 实缴单位养老
**/
private
String
fd_3af9ee3938170a
;
/**
* 预估单位生育
**/
private
String
fd_3af9eba71c0138
;
/**
* 预估单位大病救助
**/
private
String
fd_3af9eba863c0ee
;
/**
* 实缴个人失业
**/
private
String
fd_3af9ee3db44d96
;
/**
* 实缴单位补缴利息
**/
private
String
fd_3af9ee3b5ddae8
;
/**
* 实缴单位大病救助
**/
private
String
fd_3af9ee3ba76f54
;
/**
* 实缴单位工伤
**/
private
String
fd_3af9ee3aa9c84a
;
/**
* 实缴合计
**/
private
String
fd_3af9ee3c6bfc74
;
/**
* 预估单位补缴利息
**/
private
String
fd_3af9eba7c3da5e
;
/**
* 预估单位医疗
**/
private
String
fd_3af9eba5899c90
;
/**
* 预估个人养老
**/
private
String
fd_3af9ebbd791662
;
/**
* 预估个人大病救助
**/
private
String
fd_3af9ebbf3e8be2
;
/**
* 预估个人医疗
**/
private
String
fd_3af9ebbdd9797e
;
/**
* 实缴个人医疗
**/
private
String
fd_3af9ee3e066d48
;
/**
* 实缴单位失业
**/
private
String
fd_3af9ee3a46b7e6
;
/**
* 预估个人失业
**/
private
String
fd_3af9ebbe29ce1c
;
/**
* 实缴个人养老
**/
private
String
fd_3af9ee3e513962
;
/**
* 实缴个人大病救助
**/
private
String
fd_3af9ee3d0ba3b6
;
/**
* 预估单位工伤
**/
private
String
fd_3af9eba684f592
;
/**
* 我司到款单位
**/
private
String
fd_3b01953871b8be
;
}
\ No newline at end of file
yifu-social/yifu-social-biz/pom.xml
View file @
4453d7ae
...
...
@@ -93,6 +93,11 @@
<groupId>
com.yifu.cloud.plus.v1
</groupId>
<artifactId>
yifu-common-core
</artifactId>
</dependency>
<dependency>
<groupId>
com.yifu.cloud.plus.v1
</groupId>
<artifactId>
yifu-common-ekp
</artifactId>
<version>
1.0.0
</version>
</dependency>
</dependencies>
<build>
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/SocialConstants.java
View file @
4453d7ae
...
...
@@ -10,6 +10,7 @@ public class SocialConstants {
public
static
final
String
SOCIAL_SET_ERROR
=
"社保补缴配置有误!"
;
public
static
final
String
EMP_NAME_ERROR
=
"员工姓名错误!"
;
public
static
final
String
DIFF_TYPE_ONE
=
"预估"
;
public
static
final
String
DIFF_TYPE_THR
=
"实缴"
;
public
static
final
String
DIFF_TYPE_TWO
=
"差额"
;
public
static
final
String
YL
=
"养老"
;
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TForecastLibraryController.java
View file @
4453d7ae
...
...
@@ -261,4 +261,32 @@ public class TForecastLibraryController {
tForecastLibraryService
.
updateForSocialAndFound
(
list
);
}
/**
* @Description: 定时任务推送社保预估明细的数据
* @Author: huyc
* @Date: 2022/8/30
* @return: void
**/
@Operation
(
summary
=
"定时任务推送社保预估明细的数据"
,
description
=
"定时任务推送社保预估明细的数据"
)
@SysLog
(
"定时任务推送社保预估明细的数据"
)
@Inner
@PostMapping
(
"/inner/createForecastInfo"
)
public
void
createForecastInfo
()
{
tForecastLibraryService
.
createForecastInfo
();
}
/**
* @Description: 定时任务推送社保预估明细的数据
* @Author: huyc
* @Date: 2022/8/30
* @return: void
**/
@Operation
(
summary
=
"定时生成公积金预估明细的数据"
,
description
=
"定时生成公积金预估明细的数据"
)
@SysLog
(
"定时生成公积金预估明细的数据"
)
@Inner
@PostMapping
(
"/inner/createForecastFundInfo"
)
public
void
createForecastFundInfo
()
{
tForecastLibraryService
.
createForecastFundInfo
();
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPaymentInfoController.java
View file @
4453d7ae
...
...
@@ -311,4 +311,32 @@ public class TPaymentInfoController {
public
void
updatePaymentSocialAndFound
(
@RequestBody
UpdateSocialFoundVo
list
)
{
tPaymentInfoService
.
updatePaymentSocialAndFound
(
list
);
}
/**
* @Description: 定时任务推送社保缴费库明细的数据
* @Author: huyc
* @Date: 2022/8/30
* @return: void
**/
@Operation
(
summary
=
"定时任务推送社保缴费库明细的数据"
,
description
=
"定时任务推送社保缴费库明细的数据"
)
@SysLog
(
"定时任务推送社保缴费库明细的数据"
)
@Inner
@PostMapping
(
"/inner/createPaymentSocialInfo"
)
public
void
createPaymentSocialInfo
()
{
tPaymentInfoService
.
createPaymentSocialInfo
();
}
/**
* @Description: 定时任务推送公积金缴费库明细的数据
* @Author: huyc
* @Date: 2022/8/30
* @return: void
**/
@Operation
(
summary
=
"定时任务推送公积金缴费库明细的数据"
,
description
=
"定时任务推送公积金缴费库明细的数据"
)
@SysLog
(
"定时任务推送公积金缴费库明细的数据"
)
@Inner
@PostMapping
(
"/inner/createPaymentFundInfo"
)
public
void
createPaymentFundInfo
()
{
tPaymentInfoService
.
createPaymentFundInfo
();
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TForecastLibraryMapper.java
View file @
4453d7ae
...
...
@@ -69,4 +69,12 @@ public interface TForecastLibraryMapper extends BaseMapper<TForecastLibrary> {
void
updateForSocialAndFound
(
@Param
(
"infoVo"
)
UpdateSocialFoundVo
infoVo
);
/**
* 更新社保结算状态
* @Author huyc
* @Date 2022-8-30
* @param idList
* @return
**/
int
updatePushStatus
(
@Param
(
"idList"
)
List
<
String
>
idList
);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TPaymentInfoMapper.java
View file @
4453d7ae
...
...
@@ -117,4 +117,13 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
void
updatePaymentSocialAndFound
(
@Param
(
"infoVo"
)
UpdateSocialFoundVo
infoVo
);
/**
* 更新社保推送
* @Author huyc
* @Date 2022-8-30
* @param idList
* @return
**/
int
updatePushStatus
(
@Param
(
"idList"
)
List
<
String
>
idList
);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TForecastLibraryService.java
View file @
4453d7ae
...
...
@@ -125,4 +125,7 @@ public interface TForecastLibraryService extends IService<TForecastLibrary> {
void
updateForSocialAndFound
(
UpdateSocialFoundVo
list
);
void
createForecastInfo
();
void
createForecastFundInfo
();
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TPaymentInfoService.java
View file @
4453d7ae
...
...
@@ -131,5 +131,6 @@ public interface TPaymentInfoService extends IService<TPaymentInfo> {
void
updatePaymentSocialAndFound
(
UpdateSocialFoundVo
list
);
void
createPaymentSocialInfo
();
void
createPaymentFundInfo
();
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @
4453d7ae
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
4453d7ae
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-biz/src/main/resources/mapper/TForecastLibraryMapper.xml
View file @
4453d7ae
...
...
@@ -674,4 +674,14 @@
or (SALARY_FUND_FLAG = '0' and PROVIDENT_CREATE_MONTH >= #{infoVo.socialCreateMonth})
</update>
<!-- 更改预估社保推送状态 -->
<update
id=
"updatePushStatus"
>
update t_forecast_library set DATA_PUSH = 1
where
ID in
<foreach
item=
"item"
index=
"index"
collection=
"idList"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</update>
</mapper>
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
4453d7ae
...
...
@@ -1103,4 +1103,15 @@
and (SOCIAL_CREATE_MONTH >= #{infoVo.socialCreateMonth} or PROVIDENT_CREATE_MONTH >= #{infoVo.socialCreateMonth})
</update>
<!-- 更改社保推送结算状态 -->
<update
id=
"updatePushStatus"
>
update t_payment_info
set PUSH_STATUS = 0
where
ID in
<foreach
item=
"item"
index=
"index"
collection=
"idList"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
</update>
</mapper>
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