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
13529104
Commit
13529104
authored
Aug 09, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
407c6ea9
95b8cbf3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
621 additions
and
204 deletions
+621
-204
InsurancesConstants.java
...lus/v1/yifu/insurances/constants/InsurancesConstants.java
+5
-0
EKPUtil.java
.../com/yifu/cloud/plus/v1/yifu/insurances/util/EKPUtil.java
+159
-31
Dept.java
.../java/com/yifu/cloud/plus/v1/yifu/insurances/vo/Dept.java
+1
-1
EKP.java
...n/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/EKP.java
+27
-0
EKPInteractiveParam.java
...cloud/plus/v1/yifu/insurances/vo/EKPInteractiveParam.java
+155
-0
TInsuranceSettlePushParam.java
...plus/v1/yifu/insurances/vo/TInsuranceSettlePushParam.java
+61
-14
TInsuranceDetailController.java
...ifu/insurances/controller/TInsuranceDetailController.java
+2
-2
TInsuranceDetailServiceImpl.java
.../insurances/service/impl/TInsuranceDetailServiceImpl.java
+116
-96
application-test.yml
...fu-insurances-biz/src/main/resources/application-test.yml
+7
-0
TApprovalRecord.java
...ifu/cloud/plus/v1/yifu/salary/entity/TApprovalRecord.java
+3
-4
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+22
-2
TPaymentHeFeiVo.java
...om/yifu/cloud/plus/v1/yifu/social/vo/TPaymentHeFeiVo.java
+2
-2
TPaymentInfoVo.java
...com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoVo.java
+13
-4
TPaymentInfoImportLogController.java
...fu/social/controller/TPaymentInfoImportLogController.java
+3
-9
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+23
-15
TPreDispatchInfoServiceImpl.java
...yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
+18
-21
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+4
-3
No files found.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java
View file @
13529104
...
...
@@ -789,5 +789,10 @@ public class InsurancesConstants {
*/
public
static
final
String
NO_UPDATE_DETAIL_JURISDICTION
=
"无更新当前保单信息的权限"
;
/**
* 保单信息已过期,不能进行出险操作
*/
public
static
final
String
INSURANCES_DETAIL_IS_OVERDUE_ERROR
=
"保单信息已过期,不能进行出险操作"
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/EKPUtil.java
View file @
13529104
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
util
;
import
cn.hutool.json.JSONObject
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.EKPInteractiveParam
;
import
com.yifu.cloud.plus.v1.yifu.insurances.vo.TInsuranceSettlePushParam
;
import
org.springframework.core.io.FileSystemResource
;
import
lombok.Getter
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang.StringUtils
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.context.annotation.ComponentScan
;
import
org.springframework.http.*
;
import
org.springframework.stereotype.Component
;
import
org.springframework.util.LinkedMultiValueMap
;
import
org.springframework.util.MultiValueMap
;
import
org.springframework.web.client.RestTemplate
;
import
java.io.File
;
import
java.time.LocalDate
;
import
java.time.format.DateTimeFormatter
;
/**
* @author zhaji
...
...
@@ -16,39 +25,158 @@ import java.io.File;
*
* @date 2022-08-05 09:42:33
*/
@Slf4j
@Component
public
class
EKPUtil
{
@Getter
public
static
String
url
;
@Getter
public
static
String
LoginName
;
@Getter
private
static
String
fdModelId
;
@Getter
private
static
String
fdFlowId
;
@Getter
private
static
String
docStatus
;
@Getter
private
static
String
docSubject
;
@Value
(
"${ekp.url}"
)
public
void
setUrl
(
String
db
)
{
url
=
db
;
}
@Value
(
"${ekp.LoginName}"
)
public
void
setLoginName
(
String
db
)
{
LoginName
=
db
;
}
@Value
(
"${ekp.fdModelId}"
)
public
void
setFdModelId
(
String
db
)
{
fdModelId
=
db
;
}
@Value
(
"${ekp.fdFlowId}"
)
public
void
setFdFlowId
(
String
db
)
{
fdFlowId
=
db
;
}
@Value
(
"${ekp.docStatus}"
)
public
void
setDocStatus
(
String
db
)
{
docStatus
=
db
;
}
@Value
(
"${ekp.docSubject}"
)
public
void
setDocSubject
(
String
db
)
{
docSubject
=
db
;
}
/**
* 多层级的VO对象,且包含上传功能的样例
* 注意key的书写格式,类似EL表达式的方式,属性关系用'.', 列表和数组关系用[],Map关系用["xxx"]
*/
public
static
void
testAddNewsInRestTemplate
()
throws
Exception
{
public
static
String
sendToEKP
(
EKPInteractiveParam
param
){
System
.
out
.
println
(
"开始推送EKP"
);
RestTemplate
yourRestTemplate
=
new
RestTemplate
();
TInsuranceSettlePushParam
formValues
=
new
TInsuranceSettlePushParam
();
String
jsonObject
=
new
ObjectMapper
().
writeValueAsString
(
formValues
);
//指向EKP的接口url
String
url
=
"http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel"
;
//把ModelingAppModelParameterAddForm转换成MultiValueMap
MultiValueMap
<
String
,
Object
>
wholeForm
=
new
LinkedMultiValueMap
<>();
wholeForm
.
add
(
"docSubject"
,
new
String
(
"接口发起流程"
.
getBytes
(
"UTF-8"
),
"ISO-8859-1"
)
);
wholeForm
.
add
(
"docCreator"
,
"{\"LoginName\":\"admin\"}"
);
wholeForm
.
add
(
"docStatus"
,
20
);
wholeForm
.
add
(
"fdModelId"
,
"181d73279372e5a55438a47d7436ab7e"
);
wholeForm
.
add
(
"fdFlowId"
,
"18267f206233f29cbd3c5ee425c9408a"
);
wholeForm
.
add
(
"formValues"
,
new
String
(
"{\"fd_3adfe6af71a1cc\":\"王五\", \"fd_3adfe658c6229e\":\"2019-03-26\", \"fd_3adfe6592b4158\":\"这里内容\"}"
.
getBytes
(
"UTF-8"
),
"ISO-8859-1"
)
);
//wholeForm.add("formValues", new String("{\"fd_3adfe6af71a1cc\":\"王五\", \"fd_3adfe658c6229e\":\"2019-03-26\", \"fd_3adfe6592b4158\":\"这里内容\"}".getBytes("UTF-8"),"ISO-8859-1") );
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
(
url
,
HttpMethod
.
POST
,
entity
,
String
.
class
);
String
body
=
obj
.
getBody
();
System
.
out
.
println
(
body
);
}
}
TInsuranceSettlePushParam
pushParam
=
InsuranceDetail2PushParam
(
param
);
try
{
String
formValues
=
new
ObjectMapper
().
writeValueAsString
(
pushParam
);
//指向EKP的接口url
//把ModelingAppModelParameterAddForm转换成MultiValueMap
JSONObject
loginName
=
new
JSONObject
();
loginName
.
append
(
"LoginName"
,
LoginName
);
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("docCreator", "{\"LoginName\":\"admin\"}");
wholeForm
.
add
(
"docCreator"
,
loginData
);
wholeForm
.
add
(
"docStatus"
,
docStatus
);
wholeForm
.
add
(
"fdModelId"
,
fdModelId
);
wholeForm
.
add
(
"fdFlowId"
,
fdFlowId
);
//wholeForm.add("formValues", new String(formValues.getBytes("UTF-8"),"ISO-8859-1"));
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
System
.
out
.
println
(
"交易开始"
);
ResponseEntity
<
String
>
obj
=
yourRestTemplate
.
exchange
(
url
,
HttpMethod
.
POST
,
entity
,
String
.
class
);
System
.
out
.
println
(
"交易结束"
);
System
.
out
.
println
(
"obj"
+
obj
);
String
body
=
obj
.
getBody
();
if
(
StringUtils
.
isBlank
(
body
)){
System
.
out
.
println
(
"交易失败"
+
body
);
return
body
;
}
else
{
System
.
out
.
println
(
"交易成功"
+
body
);
return
body
;
}
}
catch
(
Exception
e
){
log
.
info
(
e
.
toString
());
return
e
.
getMessage
();
}
}
public
static
TInsuranceSettlePushParam
InsuranceDetail2PushParam
(
EKPInteractiveParam
param
){
String
format
=
LocalDate
.
now
().
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd"
));
TInsuranceSettlePushParam
pushParam
=
new
TInsuranceSettlePushParam
();
//单据类型
pushParam
.
setFd_3adfe6af71a1cc
(
param
.
getSettleType
());
//项目编码
pushParam
.
setFd_3adfe658c6229e
(
param
.
getDeptNo
());
//项目名称
pushParam
.
setFd_3adfe6592b4158
(
param
.
getDeptName
());
//客户编码
pushParam
.
setFd_3adfe6598281e8
(
param
.
getCustomerCode
());
//客户名称
pushParam
.
setFd_3adfe7a2688902
(
param
.
getCustomerName
());
//发生日期
pushParam
.
setFd_3adfe67c24dace
(
format
);
//姓名
pushParam
.
setFd_3adfe65d759650
(
param
.
getEmpName
());
//身份证号
pushParam
.
setFd_3adfe65dbd9f68
(
param
.
getEmpIdcardNo
());
//发票号
pushParam
.
setFd_3adfe65e0cd094
(
param
.
getInvoiceNo
());
//险种
pushParam
.
setFd_3adfe65f6599e4
(
param
.
getInsuranceTypeName
());
//保险公司
pushParam
.
setFd_3adfe65ea04728
(
param
.
getInsuranceCompanyName
());
//保单号
pushParam
.
setFd_3adfe65e60e110
(
param
.
getPolicyNo
());
//保险开始日期
pushParam
.
setFd_3adfe6b7e0ede8
(
param
.
getPolicyStart
().
toString
());
//保险结束日期
pushParam
.
setFd_3adfe6b847bfe6
(
param
.
getPolicyEnd
().
toString
());
//购买标准
pushParam
.
setFd_3adfe6d55384c6
(
param
.
getBuyStandard
());
//实际保费
pushParam
.
setFd_3adfe6610c0d2c
(
param
.
getActualPremium
());
//医保
pushParam
.
setFd_3adfe66041a996
(
param
.
getMedicalQuota
());
//事故或残疾
pushParam
.
setFd_3adfe6609aa810
(
param
.
getDieDisableQuota
());
//预估保费
pushParam
.
setFd_3adfe6e30f2a3c
(
param
.
getEstimatePremium
());
//结算月
pushParam
.
setFd_3aea2f0180eccc
(
param
.
getSettleMonth
());
return
pushParam
;
}
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/Dept.java
View file @
13529104
...
...
@@ -14,7 +14,7 @@ import java.io.Serializable;
@Data
@Tag
(
name
=
"项目类"
)
public
class
Dept
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
2689686777914935788L
;
/**
* 项目编码
*/
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/EKP.java
0 → 100644
View file @
13529104
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
lombok.Data
;
import
org.springframework.beans.factory.annotation.Value
;
/**
* @author zhaji
* @description TODO
* @date 2022-08-08 17:59:20
*/
@Data
public
class
EKP
{
@Value
(
"${ekp.url}"
)
private
String
url
;
@Value
(
"${ekp.fdModelId}"
)
private
String
fdModelId
;
@Value
(
"${ekp.fdFlowId}"
)
private
String
fdFlowId
;
@Value
(
"${ekp.docStatus}"
)
private
String
docStatus
;
@Value
(
"${ekp.docSubject}"
)
private
String
docSubject
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/EKPInteractiveParam.java
0 → 100644
View file @
13529104
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
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
;
import
java.math.BigDecimal
;
import
java.time.LocalDate
;
import
java.util.Date
;
/**
* @author zhaji
* @description EKP交互类
* @date 2022-08-09 11:09:12
*/
@Data
public
class
EKPInteractiveParam
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
2689686777914935788L
;
/**
* 主键
*/
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@Schema
(
description
=
"主键"
)
private
String
id
;
/**
* 单据类型 (0、与薪资合并结算 1、单独结算)
*/
@Schema
(
description
=
"单据类型 (0、预估单 1、实缴单)"
)
private
Integer
settleType
;
/**
* 项目编码
*/
@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
invoiceNo
;
/**
* 发生日期
*/
@Schema
(
description
=
"发生日期"
)
private
Date
happenDate
;
/**
* 保单编号
*/
@Schema
(
description
=
"保单编号"
)
private
String
policyNo
;
/**
* 保险公司名称(冗余字段)
*/
@Schema
(
description
=
"保险公司名称"
)
private
String
insuranceCompanyName
;
/**
* 险种名称
*/
@Schema
(
description
=
"险种名称"
)
private
String
insuranceTypeName
;
/**
* 保单开始时间
*/
@Schema
(
description
=
"保单开始时间"
)
private
LocalDate
policyStart
;
/**
* 保单结束时间
*/
@Schema
(
description
=
"保单结束时间"
)
private
LocalDate
policyEnd
;
/**
* 购买标准
*/
@Schema
(
description
=
"购买标准"
)
private
String
buyStandard
;
/**
* 医疗额度
*/
@Schema
(
description
=
"医疗额度"
)
private
String
medicalQuota
;
/**
* 身故或残疾额度
*/
@Schema
(
description
=
"身故或残疾额度"
)
private
String
dieDisableQuota
;
/**
* 实际保费
*/
@Schema
(
description
=
"实际保费"
)
private
BigDecimal
actualPremium
;
/**
* 预估保费
*/
@Schema
(
description
=
"预估保费"
)
private
BigDecimal
estimatePremium
;
/**
* 结算月
*/
@Schema
(
description
=
"结算月"
)
private
String
settleMonth
;
/**
* 单据状态
*/
@Schema
(
description
=
"状态:1新增结算单,2作废结算信息,3更新保单信息"
)
private
Integer
interactiveType
;
}
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/TInsuranceSettlePushParam.java
View file @
13529104
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
insurances
.
vo
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.databind.annotation.JsonDeserialize
;
import
com.fasterxml.jackson.databind.annotation.JsonSerialize
;
import
com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer
;
import
com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
org.springframework.cglib.core.Local
;
import
java.math.BigDecimal
;
import
java.time.LocalDate
;
import
java.util.Date
;
/**
* @author zhaji
...
...
@@ -11,160 +18,200 @@ import java.time.LocalDate;
* @date 2022-08-05 10:32:16
*/
@Data
public
class
TInsuranceSettlePushParam
{
public
class
TInsuranceSettlePushParam
{
/**
* ID主键 36位
*/
private
String
fd_id
;
/**
* 单据类型 200 单选(
预估单,实缴单,
差异单)
* 单据类型 200 单选(
1,预估单,2,实缴单,3,
差异单)
*/
private
String
fd_3adfe6af71a1cc
;
@Schema
(
description
=
"单据类型"
)
private
Integer
fd_3adfe6af71a1cc
;
/**
* 项目编码 200
*/
@Schema
(
description
=
"项目编码"
)
private
String
fd_3adfe658c6229e
;
/**
* 项目名称 200
*/
@Schema
(
description
=
"项目名称"
)
private
String
fd_3adfe6592b4158
;
/**
* 单号 200
*/
@Schema
(
description
=
"单号"
)
private
String
fd_3adfe67a9f6364
;
/**
* 客户编码 200
*/
@Schema
(
description
=
"客户编码"
)
private
String
fd_3adfe6598281e8
;
/**
* 客户名称 200
*/
@Schema
(
description
=
"客户名称"
)
private
String
fd_3adfe7a2688902
;
/**
* 发生日期 "xxxx--xx--xx"
*/
private
LocalDate
fd_3adfe67c24dace
;
@Schema
(
description
=
"发生日期"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
private
String
fd_3adfe67c24dace
;
/**
* 姓名 200
*/
@Schema
(
description
=
"姓名"
)
private
String
fd_3adfe65d759650
;
/**
* 身份证号 200
*/
@Schema
(
description
=
"身份证号"
)
private
String
fd_3adfe65dbd9f68
;
/**
* 发票号 200
*/
@Schema
(
description
=
"发票号"
)
private
String
fd_3adfe65e0cd094
;
/**
* 险种 200
*/
@Schema
(
description
=
"险种"
)
private
String
fd_3adfe65f6599e4
;
/**
* 保险公司 200
*/
@Schema
(
description
=
"保险公司"
)
private
String
fd_3adfe65ea04728
;
/**
* 保单号 200
*/
@Schema
(
description
=
"保单号"
)
private
String
fd_3adfe65e60e110
;
/**
* 保险开始日期 "xxxx--xx--xx"
*/
private
LocalDate
fd_3adfe6b7e0ede8
;
@Schema
(
description
=
"保险开始日期"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
private
String
fd_3adfe6b7e0ede8
;
/**
* 保险结束日期 "xxxx--xx--xx"
*/
private
LocalDate
fd_3adfe6b847bfe6
;
@Schema
(
description
=
"保险结束日期"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
,
timezone
=
"GMT+8"
)
private
String
fd_3adfe6b847bfe6
;
/**
* 购买标准 精确到小数点后两位
*/
private
Double
fd_3adfe6d55384c6
;
@Schema
(
description
=
"购买标准"
)
private
String
fd_3adfe6d55384c6
;
/**
* 实际保费 精确到小数点后两位
*/
private
Double
fd_3adfe6610c0d2c
;
@Schema
(
description
=
"实际保费"
)
private
BigDecimal
fd_3adfe6610c0d2c
;
/**
* 医保 精确到小数点后两位
*/
private
Double
fd_3adfe66041a996
;
@Schema
(
description
=
"医保"
)
private
String
fd_3adfe66041a996
;
/**
* 事故或残疾 200
*/
@Schema
(
description
=
"事故或残疾"
)
private
String
fd_3adfe6609aa810
;
/**
*
应收
精确到小数点后两位
*
预估保费(应收)
精确到小数点后两位
*/
private
Double
fd_3adfe6e30f2a3c
;
@Schema
(
description
=
"预估保费"
)
private
BigDecimal
fd_3adfe6e30f2a3c
;
/**
*
应收 200 单选(已结算,结算中,未
结算)
*
结算状态 200 单选(1未结算,2结算中,3已
结算)
*/
@Schema
(
description
=
"结算状态"
)
private
String
fd_3adfe6ec6a8cbe
;
/**
* 收款状态 200 单选(
已收,未
收)
* 收款状态 200 单选(
1未收,2已
收)
*/
@Schema
(
description
=
"收款状态"
)
private
String
fd_3adfe6ef5dfaac
;
/**
* 收入结算单号 200
*/
@Schema
(
description
=
"收入结算单号"
)
private
String
fd_3adfe79fd04606
;
/**
* 收款认领单号 200
*/
@Schema
(
description
=
"收款认领单号"
)
private
String
fd_3adfe7a117f086
;
/**
* 应支出 精确到小数点后两位
*/
@Schema
(
description
=
"应支出"
)
private
Double
fd_3adfe6e3911ffe
;
/**
* 支出结算状态 200 单选(已结算,结算中,未结算)
*/
@Schema
(
description
=
"支出结算状态"
)
private
String
fd_3adfe6eda67236
;
/**
* 付款状态 200 单选(已收,未收)
*/
@Schema
(
description
=
"付款状态"
)
private
String
fd_3adfe6f05531ec
;
/**
* 支出结算单号 200
*/
@Schema
(
description
=
"支出结算单号"
)
private
String
fd_3adfe7a035849c
;
/**
* 付款单号 200
*/
@Schema
(
description
=
"付款单号"
)
private
String
fd_3adfe7a08eba96
;
/**
* 结算月份 200
*/
@Schema
(
description
=
"结算月份"
)
private
String
fd_3aea2f0180eccc
;
/**
* 状态 200
*/
@Schema
(
description
=
"状态1新增结算单,2作废结算信息,3更新保单信息"
)
private
String
fd_3af9197b31071c
;
}
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java
View file @
13529104
...
...
@@ -442,8 +442,8 @@ public class TInsuranceDetailController {
*/
@Operation
(
summary
=
"查询项目列表"
,
description
=
"查询项目列表"
)
@GetMapping
(
"/deptList"
)
public
R
getDeptList
()
{
return
tInsuranceDetailService
.
getDeptList
ByUser
();
public
R
getDeptList
(){
return
tInsuranceDetailService
.
getDeptList
();
}
/**
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceDetailServiceImpl.java
View file @
13529104
This diff is collapsed.
Click to expand it.
yifu-insurances/yifu-insurances-biz/src/main/resources/application-test.yml
View file @
13529104
...
...
@@ -15,3 +15,10 @@ spring:
username
:
root
password
:
yf_zsk
url
:
jdbc:mysql://192.168.1.65:22306/mvp_insurances?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
ekp
:
url
:
http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
fdModelId
:
'
181d73279372e5a55438a47d7436ab7e'
fdFlowId
:
'
18267f206233f29cbd3c5ee425c9408a'
docStatus
:
'
20'
LoginName
:
'
admin'
docSubject
:
'
接口发起流程'
\ No newline at end of file
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TApprovalRecord.java
View file @
13529104
...
...
@@ -39,9 +39,9 @@ import java.util.Date;
*/
@Data
@TableName
(
"t_approval_record"
)
@EqualsAndHashCode
(
callSuper
=
true
)
@EqualsAndHashCode
()
@Schema
(
description
=
"审批记录表"
)
public
class
TApprovalRecord
extends
BaseEntity
{
public
class
TApprovalRecord
{
/**
* 主键
...
...
@@ -60,8 +60,7 @@ public class TApprovalRecord extends BaseEntity {
/**
* 节点id
*/
@ExcelAttribute
(
name
=
"节点id"
,
isNotEmpty
=
true
,
errorInfo
=
"节点id不能为空"
,
maxLength
=
32
)
@NotBlank
(
message
=
"节点id不能为空"
)
@ExcelAttribute
(
name
=
"节点id"
,
maxLength
=
32
)
@Length
(
max
=
32
,
message
=
"节点id不能超过32个字符"
)
@ExcelProperty
(
"节点id"
)
private
String
nodeId
;
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @
13529104
...
...
@@ -17,7 +17,6 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
service
.
impl
;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.util.ArrayUtil
;
import
com.alibaba.excel.EasyExcel
;
import
com.alibaba.excel.ExcelWriter
;
import
com.alibaba.excel.context.AnalysisContext
;
...
...
@@ -32,13 +31,16 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TApprovalRecord
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandard
;
import
com.yifu.cloud.plus.v1.yifu.salary.mapper.TSalaryStandardMapper
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TApprovalRecordService
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryStandardService
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardExportVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardVo
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
javax.servlet.ServletOutputStream
;
...
...
@@ -58,6 +60,10 @@ import java.util.List;
@Log4j2
@Service
public
class
TSalaryStandardServiceImpl
extends
ServiceImpl
<
TSalaryStandardMapper
,
TSalaryStandard
>
implements
TSalaryStandardService
{
@Autowired
private
TApprovalRecordService
approvalRecordService
;
/**
* 标准薪酬工资表简单分页查询
*
...
...
@@ -234,15 +240,29 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
YifuUser
user
=
SecurityUtils
.
getUser
();
TSalaryStandard
tSalaryStandard
=
baseMapper
.
selectById
(
id
);
if
(
Common
.
isNotNull
(
tSalaryStandard
))
{
//新增流程进展明细
TApprovalRecord
tApprovalRecord
=
new
TApprovalRecord
();
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
auditFlag
))
{
tSalaryStandard
.
setStatus
(
CommonConstants
.
TWO_INT
);
tApprovalRecord
.
setApprovalResult
(
CommonConstants
.
ZERO_STRING
);
}
else
{
tSalaryStandard
.
setStatus
(
CommonConstants
.
FIVE_INT
);
tApprovalRecord
.
setApprovalResult
(
CommonConstants
.
ONE_STRING
);
}
if
(
Common
.
isNotNull
(
auditRemark
))
{
tSalaryStandard
.
setRemark
(
auditRemark
);
tApprovalRecord
.
setApprovalOpinion
(
auditRemark
);
}
tSalaryStandard
.
setRemark
(
auditRemark
);
tSalaryStandard
.
setAuditUser
(
user
.
getId
());
tSalaryStandard
.
setAuditTime
(
DateUtil
.
getCurrentDateTime
());
baseMapper
.
updateById
(
tSalaryStandard
);
tApprovalRecord
.
setSalaryId
(
tSalaryStandard
.
getId
());
tApprovalRecord
.
setApprovalMan
(
user
.
getId
());
tApprovalRecord
.
setApprovalManName
(
user
.
getNickname
());
tApprovalRecord
.
setApprovalTime
(
DateUtil
.
getCurrentDateTime
());
approvalRecordService
.
save
(
tApprovalRecord
);
}
return
R
.
ok
();
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentHeFeiVo.java
View file @
13529104
...
...
@@ -95,7 +95,7 @@ public class TPaymentHeFeiVo extends RowIndex implements Serializable {
* 社保缴纳月份empNo
*/
@Length
(
max
=
6
,
message
=
"社保缴纳月份不能超过6个字符"
)
@ExcelAttribute
(
name
=
"社保缴纳月份"
,
isNotEmpty
=
true
,
errorInfo
=
"社保缴纳月份不可为空"
,
maxLength
=
6
)
@ExcelAttribute
(
name
=
"社保缴纳月份"
,
isNotEmpty
=
true
,
errorInfo
=
"社保缴纳月份不可为空"
,
maxLength
=
6
,
isInteger
=
true
)
@Schema
(
description
=
"社保缴纳月份"
)
@ExcelProperty
(
"社保缴纳月份"
)
private
String
socialPayMonth
;
...
...
@@ -103,7 +103,7 @@ public class TPaymentHeFeiVo extends RowIndex implements Serializable {
* 社保生成月份
*/
@Length
(
max
=
6
,
message
=
"社保生成月份不能超过6个字符"
)
@ExcelAttribute
(
name
=
"社保生成月份"
,
isNotEmpty
=
true
,
errorInfo
=
"社保生成月份不可为空"
,
maxLength
=
6
)
@ExcelAttribute
(
name
=
"社保生成月份"
,
isNotEmpty
=
true
,
errorInfo
=
"社保生成月份不可为空"
,
maxLength
=
6
,
isInteger
=
true
)
@Schema
(
description
=
"社保生成月份"
)
@ExcelProperty
(
"社保生成月份"
)
private
String
socialCreateMonth
;
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoVo.java
View file @
13529104
...
...
@@ -38,6 +38,15 @@ import java.util.Date;
@Data
public
class
TPaymentInfoVo
extends
RowIndex
implements
Serializable
{
/**
* 主键
*/
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@Length
(
max
=
32
,
message
=
"主键 不能超过32 个字符"
)
@ExcelAttribute
(
name
=
"主键"
,
maxLength
=
32
)
@Schema
(
description
=
"主键"
)
@ExcelProperty
(
"主键"
)
private
String
id
;
/**
* 员工姓名
*/
...
...
@@ -115,7 +124,7 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
* 社保缴纳月份
*/
@Length
(
max
=
6
,
message
=
"社保缴纳月份 不能超过6 个字符"
)
@ExcelAttribute
(
name
=
"社保缴纳月份"
,
maxLength
=
6
)
@ExcelAttribute
(
name
=
"社保缴纳月份"
,
maxLength
=
6
,
isInteger
=
true
)
@Schema
(
description
=
"社保缴纳月份"
)
@ExcelProperty
(
"社保缴纳月份"
)
private
String
socialPayMonth
;
...
...
@@ -123,7 +132,7 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
* 社保生成月份
*/
@Length
(
max
=
6
,
message
=
"社保生成月份 不能超过6 个字符"
)
@ExcelAttribute
(
name
=
"社保生成月份"
,
maxLength
=
6
)
@ExcelAttribute
(
name
=
"社保生成月份"
,
maxLength
=
6
,
isInteger
=
true
)
@Schema
(
description
=
"社保生成月份"
)
@ExcelProperty
(
"社保生成月份"
)
private
String
socialCreateMonth
;
...
...
@@ -146,7 +155,7 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
* 公积金缴纳月份
*/
@Length
(
max
=
6
,
message
=
"公积金缴纳月份 不能超过6 个字符"
)
@ExcelAttribute
(
name
=
"公积金缴纳月份"
,
maxLength
=
6
)
@ExcelAttribute
(
name
=
"公积金缴纳月份"
,
maxLength
=
6
,
isInteger
=
true
)
@Schema
(
description
=
"公积金缴纳月份"
)
@ExcelProperty
(
"公积金缴纳月份"
)
private
String
providentPayMonth
;
...
...
@@ -154,7 +163,7 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
* 公积金生成月份
*/
@Length
(
max
=
6
,
message
=
"公积金生成月份 不能超过6 个字符"
)
@ExcelAttribute
(
name
=
"公积金生成月份"
,
maxLength
=
6
)
@ExcelAttribute
(
name
=
"公积金生成月份"
,
maxLength
=
6
,
isInteger
=
true
)
@Schema
(
description
=
"公积金生成月份"
)
@ExcelProperty
(
"公积金生成月份"
)
private
String
providentCreateMonth
;
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPaymentInfoImportLogController.java
View file @
13529104
...
...
@@ -19,14 +19,12 @@ package com.yifu.cloud.plus.v1.yifu.social.controller;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
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.RedisUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TPaymentInfoImportLogService
;
import
com.yifu.cloud.plus.v1.yifu.social.util.ServiceUtil
;
import
org.apache.commons.lang.StringUtils
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.security.SecurityRequirement
;
...
...
@@ -57,20 +55,16 @@ public class TPaymentInfoImportLogController {
@Operation
(
description
=
"导出社保导入日志"
)
@GetMapping
(
"/exportPaymentInfoLog"
)
public
void
exportPaymentInfoLog
(
HttpServletResponse
response
)
{
public
String
exportPaymentInfoLog
(
HttpServletResponse
response
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
String
key
=
user
.
getId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
CommonConstants
.
PAYMENT_SOCIAL_WAIT_EXPORT
;
String
importRandom
=
(
String
)
redisUtil
.
get
(
key
);
if
(
StringUtils
.
isBlank
(
importRandom
))
{
ServiceUtil
.
runTimeExceptionDiy
(
"当前社保数据还未导入完成或者数据不存在"
);
}
String
res
=
tPaymentInfoImportLogService
.
exportPaymentInfoLog
(
response
,
importRandom
);
if
(
Common
.
isNotNull
(
res
)){
ServiceUtil
.
runTimeExceptionDiy
(
res
);
return
importRandom
;
}
return
null
;
}
/**
* @description: 清空社保导入日志表
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.Void>
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
13529104
...
...
@@ -54,6 +54,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.InputStream
;
import
java.math.BigDecimal
;
import
java.text.DecimalFormat
;
import
java.util.*
;
import
com.alibaba.excel.EasyExcel
;
...
...
@@ -497,7 +498,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
// 处理第一个0位元素
final
List
<
TPaymentInfoVo
>
finalList
=
list
.
subList
(
0
,
1
);
CompletableFuture
<
List
<
ErrorMessage
>>
listCompletableFuture
=
CompletableFuture
.
supplyAsync
(()
->
executeImportSocialList
(
user
,
atomicLine
,
random
,
l
ist
,
areaMap
,
areaMap2
,
executeImportSocialList
(
user
,
atomicLine
,
random
,
finalL
ist
,
areaMap
,
areaMap2
,
paymentInfoPensionMap
,
paymentInfoBigMap
,
paymentInfoBirMap
,
paymentInfoMedicalMap
,
paymentInfoUnEmpMap
,
paymentInfoInjuryMap
,
CommonConstants
.
ONE_INT
,
errorMessageList
),
yfSocialImportThreadPoolExecutor
);
...
...
@@ -512,7 +513,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
List
<
TPaymentInfoVo
>
finalTempList
=
tempList
;
final
int
idx
=
i
-
partSize
+
2
;
CompletableFuture
.
supplyAsync
(()
->
executeImportSocialList
(
user
,
atomicLine
,
random
,
l
ist
,
areaMap
,
areaMap2
,
executeImportSocialList
(
user
,
atomicLine
,
random
,
finalTempL
ist
,
areaMap
,
areaMap2
,
paymentInfoPensionMap
,
paymentInfoBigMap
,
paymentInfoBirMap
,
paymentInfoMedicalMap
,
paymentInfoUnEmpMap
,
paymentInfoInjuryMap
,
idx
,
errorMessageList
),
yfSocialImportThreadPoolExecutor
);
...
...
@@ -538,7 +539,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
List
<
TPaymentInfoVo
>
finalTempList
=
tempList
;
int
finalLastIdx
=
lastIdx
+
1
;
CompletableFuture
<
List
<
ErrorMessage
>>
listCompletableFuture
=
CompletableFuture
.
supplyAsync
(()
->
executeImportSocialList
(
user
,
atomicLine
,
random
,
l
ist
,
areaMap
,
areaMap2
,
executeImportSocialList
(
user
,
atomicLine
,
random
,
finalTempL
ist
,
areaMap
,
areaMap2
,
paymentInfoPensionMap
,
paymentInfoBigMap
,
paymentInfoBirMap
,
paymentInfoMedicalMap
,
paymentInfoUnEmpMap
,
paymentInfoInjuryMap
,
finalLastIdx
,
errorMessageList
),
yfSocialImportThreadPoolExecutor
);
...
...
@@ -557,7 +558,9 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
while
(
computeFlag
);
String
importSuccessKey
=
user
.
getId
()
+
CommonConstants
.
DOWN_LINE_STRING
+
CommonConstants
.
PAYMENT_SOCIAL_WAIT_EXPORT
;
redisUtil
.
set
(
importSuccessKey
,
random
,
1800L
);
DecimalFormat
df
=
new
DecimalFormat
(
"0.00000"
);
String
maerialRatio
=
df
.
format
((
float
)
atomicLine
.
get
()/
list
.
size
());
redisUtil
.
set
(
importSuccessKey
,
maerialRatio
,
1800L
);
}
catch
(
Exception
e
)
{
log
.
error
(
"社保缴费库数据批量导入异常:"
+
e
);
...
...
@@ -1021,6 +1024,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
paymentInfo
.
setSocialSum
(
BigDecimalUtils
.
safeAdd
(
paymentInfo
.
getUnitSocialSum
(),
paymentInfo
.
getSocialSecurityPersonalSum
()));
paymentInfo
.
setSumAll
(
paymentInfo
.
getSocialSum
());
paymentInfo
.
setCreateBy
(
user
.
getId
());
paymentInfo
.
setCreateName
(
user
.
getNickname
());
if
(
null
!=
paymentInfo
&&
Common
.
isEmpty
(
paymentInfo
.
getSocialId
()))
{
paymentInfo
.
setSocialId
(
UUID
.
randomUUID
().
toString
());
}
...
...
@@ -1272,7 +1277,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
AreaVo
areaList
=
areaListR
.
getData
();
if
(
null
!=
areaList
&&
!
areaList
.
getSysAreaList
().
isEmpty
())
{
for
(
SysArea
area
:
areaList
.
getSysAreaList
())
{
areaMap
.
put
(
area
.
getAreaName
(),
Integer
.
toString
(
area
.
getId
()
));
areaMap
.
put
(
Integer
.
toString
(
area
.
getId
()),
area
.
getAreaName
(
));
}
}
}
...
...
@@ -1376,8 +1381,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
+
CommonConstants
.
DOWN_LINE_STRING
+
"公积金缴纳地不可为空!"
));
continue
;
}
if
(
null
!=
fundMap
||
null
!=
fundMapTemp
)
{
if
(
null
!=
fundMap
)
{
if
(
fundMap
.
size
()
>
CommonConstants
.
ZERO_INT
||
fundMapTemp
.
size
()
>
CommonConstants
.
ZERO_INT
)
{
if
(
fundMap
.
size
()
>
CommonConstants
.
ZERO_INT
)
{
fund
=
(
TProvidentFund
)
fundMap
.
get
(
infoVo
.
getEmpIdcard
());
//对身份证与人员姓名的对应关系进行校验
if
(
null
!=
fund
&&
!
fund
.
getEmpName
().
equals
(
infoVo
.
getEmpName
()))
{
...
...
@@ -1387,10 +1392,10 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
}
areaArray
=
infoVo
.
getProvidentPayAddr
().
split
(
CommonConstants
.
CENTER_SPLIT_LINE_STRING
);
fund
=
checkAddress
(
areaArray
,
areaMap
,
fund
);
fund
=
checkAddress
(
areaArray
,
areaMap
,
fund
);
if
(
null
==
fund
||
(
null
!=
fund
&&
!
ServiceUtil
.
checkMothForPaymentImport
(
fund
.
getProvidentStart
(),
infoVo
.
getProvidentPayMonth
(),
fund
.
getFundReduceDate
())))
{
if
(
null
!=
fundMapTemp
)
{
if
(
fundMapTemp
.
size
()
>
CommonConstants
.
ZERO_INT
)
{
fund
=
(
TProvidentFund
)
fundMapTemp
.
get
(
infoVo
.
getEmpIdcard
());
//对身份证与人员姓名的对应关系进行校验
if
(
null
!=
fund
&&
!
fund
.
getEmpName
().
equals
(
infoVo
.
getEmpName
()))
{
...
...
@@ -1406,7 +1411,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
for
(
TProvidentFund
f
:
fundListTemp
)
{
if
(
f
.
getEmpIdcard
().
equals
(
infoVo
.
getEmpIdcard
())
&&
ServiceUtil
.
checkMothForPaymentImport
(
f
.
getProvidentStart
(),
infoVo
.
getProvidentPayMonth
(),
f
.
getFundReduceDate
()))
{
fund
=
checkAddress
(
areaArray
,
areaMap
,
f
);
fund
=
checkAddress
(
areaArray
,
areaMap
,
f
);
if
(
null
!=
fund
)
{
break
;
}
...
...
@@ -1432,7 +1437,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//计算公积金合计,个人金额和单位金额一致
infoVo
.
setProvidentSum
(
BigDecimalUtils
.
safeAdd
(
infoVo
.
getUnitProvidentSum
(),
infoVo
.
getUnitProvidentSum
()));
// 判重
if
(
null
!=
paymentInfoMap
)
{
if
(
paymentInfoMap
.
size
()
>
CommonConstants
.
ZERO_INT
)
{
paymentInfo
=
(
TPaymentInfo
)
paymentInfoMap
.
get
(
infoVo
.
getProvidentPayAddr
()
+
CommonConstants
.
DOWN_LINE_STRING
+
infoVo
.
getEmpIdcard
().
trim
()
...
...
@@ -1849,6 +1854,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
//对身份证与人员姓名的对应关系进行校验
if
(
socialInfo
!=
null
&&
!
socialInfo
.
getEmpName
().
equals
(
infoVo
.
getEmpName
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
"姓名与身份证信息不一致,请核实后再次尝试!"
));
continue
;
}
if
(
socialInfo
!=
null
&&
socialInfo
.
getSocialStartDate
()
==
null
)
{
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
infoVo
.
getEmpIdcard
()
+
"的社保起缴日期为空!"
));
...
...
@@ -2104,6 +2110,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
payExists
.
setSocialSum
(
BigDecimalUtils
.
safeAdd
(
payExists
.
getUnitSocialSum
(),
payExists
.
getSocialSecurityPersonalSum
()));
payExists
.
setSumAll
(
payExists
.
getSocialSum
());
payExists
.
setCreateBy
(
user
.
getId
());
payExists
.
setCreateName
(
user
.
getNickname
());
if
(
null
!=
payExists
&&
Common
.
isEmpty
(
payExists
.
getSocialId
()))
{
payExists
.
setSocialId
(
UUID
.
randomUUID
().
toString
());
}
...
...
@@ -2230,12 +2238,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
if
(
areaArray
.
length
>=
CommonConstants
.
TWO_INT
)
{
if
(
null
!=
s
.
getFundProvince
())
{
if
(
areaArray
[
0
].
equals
(
areaMap
.
get
(
String
.
valueOf
(
s
.
getFundProvince
()
))))
{
if
(
areaArray
[
0
].
equals
(
areaMap
.
get
(
s
.
getFundProvince
(
))))
{
if
(
null
!=
s
.
getFundCity
())
{
if
(
areaArray
[
1
].
equals
(
areaMap
.
get
(
String
.
valueOf
(
s
.
getFundCity
()
))))
{
if
(
areaArray
[
1
].
equals
(
areaMap
.
get
(
s
.
getFundCity
(
))))
{
if
(
areaArray
.
length
>=
CommonConstants
.
THREE_INT
)
{
if
(
null
!=
s
.
getFundTown
()
&&
areaArray
[
CommonConstants
.
TWO_INT
].
equals
(
areaMap
.
get
(
String
.
valueOf
(
s
.
getFundTown
()
))))
{
areaMap
.
get
(
s
.
getFundTown
(
))))
{
return
s
;
}
}
else
{
...
...
@@ -2255,7 +2263,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
else
if
(
areaArray
.
length
==
1
)
{
if
(
null
!=
s
.
getFundProvince
()
&&
null
==
s
.
getFundCity
())
{
if
(
areaArray
[
0
].
equals
(
areaMap
.
get
(
String
.
valueOf
(
s
.
getFundProvince
()
))))
{
if
(
areaArray
[
0
].
equals
(
areaMap
.
get
(
s
.
getFundProvince
(
))))
{
return
s
;
}
}
else
{
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
View file @
13529104
...
...
@@ -32,7 +32,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil
;
import
com.yifu.cloud.plus.v1.yifu.social.constants.PreDispatchConstants
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.*
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.*
;
...
...
@@ -84,6 +83,9 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
@Autowired
private
TDispatchInfoService
dispatchInfoService
;
@Autowired
private
SysHouseHoldInfoMapper
sysHouseHoldInfoMapper
;
/**
* 预派单记录简单分页查询
*
...
...
@@ -577,7 +579,8 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
}
@Override
public
List
<
ErrorMessage
>
batchSavePreDisPatchAdd
(
List
<
TPreDispatchInfo
>
listInfo
,
YifuUser
user
,
String
socialHouse
,
String
fundHouse
,
String
departId
)
{
public
List
<
ErrorMessage
>
batchSavePreDisPatchAdd
(
List
<
TPreDispatchInfo
>
listInfo
,
YifuUser
user
,
String
socialHouse
,
String
fundHouse
,
String
departId
)
{
List
<
ErrorMessage
>
errorList
=
new
ArrayList
<>();
R
<
TSettleDomainSelectVo
>
domainR
=
archivesDaprUtil
.
getSettleDomainSelectVoById
(
departId
);
// 获取区域数据MAP
...
...
@@ -631,12 +634,8 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
info
.
setPreStatus
(
CommonConstants
.
ZERO_STRING
);
// 为验重添加到MAP
existsMap
.
put
(
info
.
getEmpIdcard
()
+
CommonConstants
.
DOWN_LINE_STRING
+
info
.
getPayAddress
(),
info
);
if
(
Common
.
isEmpty
(
info
.
getExceptionContent
()))
{
errorList
.
add
(
new
ErrorMessage
(
i
,
"保存成功!"
,
CommonConstants
.
GREEN
));
}
else
{
if
(!
Common
.
isEmpty
(
info
.
getExceptionContent
()))
{
info
.
setPreStatus
(
CommonConstants
.
ONE_STRING
);
errorList
.
add
(
new
ErrorMessage
(
i
,
"保存成功!"
+
info
.
getExceptionContent
(),
CommonConstants
.
RED
));
}
baseMapper
.
insert
(
info
);
}
...
...
@@ -705,12 +704,8 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
}
// 为验重添加到MAP
existsMap
.
put
(
info
.
getEmpIdcard
()
+
CommonConstants
.
DOWN_LINE_STRING
+
info
.
getPayAddress
(),
info
);
if
(
Common
.
isEmpty
(
info
.
getExceptionContent
()))
{
errorList
.
add
(
new
ErrorMessage
(
i
,
CommonConstants
.
SAVE_SUCCESS
,
CommonConstants
.
GREEN
));
}
else
{
if
(!
Common
.
isEmpty
(
info
.
getExceptionContent
()))
{
info
.
setPreStatus
(
CommonConstants
.
ONE_STRING
);
errorList
.
add
(
new
ErrorMessage
(
i
,
CommonConstants
.
SAVE_SUCCESS
+
info
.
getExceptionContent
(),
CommonConstants
.
RED
));
}
baseMapper
.
insert
(
info
);
}
...
...
@@ -978,11 +973,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
info
.
setContractEndAdd
(
info
.
getContractEnd
());
info
.
setContractStartAdd
(
info
.
getContractStart
());
baseMapper
.
updatePreDispatchInfoById
(
info
);
if
(
Common
.
isNotNull
(
info
.
getExceptionContent
())){
errorList
.
add
(
new
ErrorMessage
(
i
,
CommonConstants
.
SAVE_SUCCESS
+
info
.
getExceptionContent
(),
CommonConstants
.
RED
));
}
else
{
errorList
.
add
(
new
ErrorMessage
(
i
,
CommonConstants
.
SAVE_SUCCESS
,
CommonConstants
.
GREEN
));
}
}
private
static
boolean
isaBoolean
(
LocalDateTime
temp
,
LocalDateTime
now
)
{
...
...
@@ -1116,8 +1106,13 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
info
.
setContractTermAdd
(
Integer
.
toString
(
Common
.
getYearOfTime
(
info
.
getContractStart
(),
info
.
getContractEnd
())));
// 默认工时制 综合工时制2
info
.
setWorkingHoursAdd
(
CommonConstants
.
TWO_STRING
);
info
.
setSocialHouseAdd
(
socialHouse
);
info
.
setFundHouseAdd
(
fundHouse
);
SysHouseHoldInfo
sysHouseHoldInfo
=
sysHouseHoldInfoMapper
.
selectOne
(
Wrappers
.<
SysHouseHoldInfo
>
query
().
lambda
()
.
eq
(
SysHouseHoldInfo:
:
getName
,
socialHouse
).
eq
(
SysHouseHoldInfo:
:
getType
,
CommonConstants
.
ZERO_STRING
));
info
.
setSocialHouseAdd
(
sysHouseHoldInfo
.
getId
());
SysHouseHoldInfo
sysHouseHoldFund
=
sysHouseHoldInfoMapper
.
selectOne
(
Wrappers
.<
SysHouseHoldInfo
>
query
().
lambda
()
.
eq
(
SysHouseHoldInfo:
:
getName
,
fundHouse
).
eq
(
SysHouseHoldInfo:
:
getType
,
CommonConstants
.
ONE_STRING
));
info
.
setFundHouseAdd
(
sysHouseHoldFund
.
getId
());
}
/**
...
...
@@ -2207,7 +2202,8 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
Common
.
isNotNull
(
preInfo
.
getPensionStart
())){
importVo
.
setPensionStart
(
DateUtil
.
getFirstDay
(
preInfo
.
getPensionStart
()));
if
(
Common
.
isNotNull
(
preInfo
.
getPensionAddress
())){
importVo
.
setSocialHousehold
(
preInfo
.
getSocialHouseAdd
());
SysHouseHoldInfo
sysHouseHoldInfo
=
sysHouseHoldInfoMapper
.
selectById
(
preInfo
.
getSocialHouseAdd
());
importVo
.
setSocialHousehold
(
sysHouseHoldInfo
.
getName
());
}
SysBaseSetInfo
socialBaseSet
=
getSysBaseSetInfo
(
preInfo
.
getSocialProvince
(),
preInfo
.
getSocialCity
(),
preInfo
.
getSocialTown
(),
preInfo
.
getSocialHouseAdd
(),
CommonConstants
.
ZERO_STRING
);
...
...
@@ -2333,7 +2329,8 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
importVo
.
setProvidentPer
(
preInfo
.
getFundPersonalPer
());
}
if
(
Common
.
isNotNull
(
preInfo
.
getFundAddress
())){
importVo
.
setProvidentHousehold
(
preInfo
.
getFundHouseAdd
());
SysHouseHoldInfo
sysHouseHoldInfo
=
sysHouseHoldInfoMapper
.
selectById
(
preInfo
.
getFundHouseAdd
());
importVo
.
setProvidentHousehold
(
sysHouseHoldInfo
.
getName
());
}
}
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
13529104
...
...
@@ -197,10 +197,11 @@
a.SOCIAL_PAY_ADDR,
a.SOCIAL_PAY_MONTH,
a.SOCIAL_CREATE_MONTH,
a.CREATE_USER,
a.CREATE_BY,
a.UPDATE_TIME,
a.UPDATE_BY,
a.CREATE_NAME,
a.CREATE_TIME,
a.LAST_UPDATE_USER,
a.LAST_UPDATE_TIME,
a.LOCK_STATUS,
a.SUM_ALL,
a.PROVIDENT_PAY_MONTH,
...
...
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