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
194b049f
Commit
194b049f
authored
Aug 12, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
c163d78d
8ae61757
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
8 deletions
+9
-8
EKPUtil.java
.../com/yifu/cloud/plus/v1/yifu/insurances/util/EKPUtil.java
+2
-1
EKPInteractiveParam.java
...cloud/plus/v1/yifu/insurances/vo/EKPInteractiveParam.java
+2
-2
TDispatchInfoExportVo.java
...u/cloud/plus/v1/yifu/social/vo/TDispatchInfoExportVo.java
+3
-3
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+2
-2
No files found.
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/EKPUtil.java
View file @
194b049f
...
@@ -140,6 +140,7 @@ public class EKPUtil {
...
@@ -140,6 +140,7 @@ public class EKPUtil {
public
static
TInsuranceSettlePushParam
InsuranceDetail2PushParam
(
EKPInteractiveParam
param
){
public
static
TInsuranceSettlePushParam
InsuranceDetail2PushParam
(
EKPInteractiveParam
param
){
String
format
=
LocalDate
.
now
().
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd"
));
String
format
=
LocalDate
.
now
().
format
(
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd"
));
TInsuranceSettlePushParam
pushParam
=
new
TInsuranceSettlePushParam
();
TInsuranceSettlePushParam
pushParam
=
new
TInsuranceSettlePushParam
();
param
.
setHappenDate
(
format
);
//ekpId
//ekpId
if
(
null
!=
param
.
getId
()
&&
null
!=
param
.
getDefaultSettleId
()){
if
(
null
!=
param
.
getId
()
&&
null
!=
param
.
getDefaultSettleId
()){
pushParam
.
setFd_3afa8a70006bea
(
param
.
getId
()+
CommonConstants
.
DOWN_LINE_STRING
+
param
.
getDefaultSettleId
());
pushParam
.
setFd_3afa8a70006bea
(
param
.
getId
()+
CommonConstants
.
DOWN_LINE_STRING
+
param
.
getDefaultSettleId
());
...
@@ -181,7 +182,7 @@ public class EKPUtil {
...
@@ -181,7 +182,7 @@ public class EKPUtil {
pushParam
.
setFd_3adfe7a2688902
(
CommonConstants
.
EMPTY_STRING
);
pushParam
.
setFd_3adfe7a2688902
(
CommonConstants
.
EMPTY_STRING
);
}
}
//发生日期
//发生日期
pushParam
.
setFd_3adfe67c24dace
(
format
);
pushParam
.
setFd_3adfe67c24dace
(
param
.
getHappenDate
()
);
//姓名
//姓名
pushParam
.
setFd_3adfe65d759650
(
param
.
getEmpName
());
pushParam
.
setFd_3adfe65d759650
(
param
.
getEmpName
());
if
(
null
!=
param
.
getEmpName
()){
if
(
null
!=
param
.
getEmpName
()){
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/EKPInteractiveParam.java
View file @
194b049f
...
@@ -85,7 +85,7 @@ public class EKPInteractiveParam implements Serializable {
...
@@ -85,7 +85,7 @@ public class EKPInteractiveParam implements Serializable {
* 发生日期
* 发生日期
*/
*/
@Schema
(
description
=
"发生日期"
)
@Schema
(
description
=
"发生日期"
)
private
Date
happenDate
;
private
String
happenDate
;
/**
/**
* 保单编号
* 保单编号
...
@@ -156,7 +156,7 @@ public class EKPInteractiveParam implements Serializable {
...
@@ -156,7 +156,7 @@ public class EKPInteractiveParam implements Serializable {
/**
/**
* 单据状态
* 单据状态
*/
*/
@Schema
(
description
=
"状态:1新增结算单,2更新
保单信息,3作废结算
信息"
)
@Schema
(
description
=
"状态:1新增结算单,2更新
结算单信息,3作废结算单
信息"
)
private
Integer
interactiveType
;
private
Integer
interactiveType
;
}
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoExportVo.java
View file @
194b049f
...
@@ -41,7 +41,7 @@ public class TDispatchInfoExportVo {
...
@@ -41,7 +41,7 @@ public class TDispatchInfoExportVo {
@ExcelAttribute
(
name
=
"申请编码"
,
maxLength
=
30
)
@ExcelAttribute
(
name
=
"申请编码"
,
maxLength
=
30
)
@Schema
(
description
=
"申请编码"
)
@Schema
(
description
=
"申请编码"
)
@ExcelProperty
(
"申请编码"
)
@ExcelProperty
(
"申请编码"
)
private
String
dispatchCode
;
private
String
applyNo
;
@ExcelAttribute
(
name
=
"员工编码"
,
maxLength
=
30
)
@ExcelAttribute
(
name
=
"员工编码"
,
maxLength
=
30
)
@Schema
(
description
=
"员工编码"
)
@Schema
(
description
=
"员工编码"
)
...
@@ -103,8 +103,8 @@ public class TDispatchInfoExportVo {
...
@@ -103,8 +103,8 @@ public class TDispatchInfoExportVo {
@ExcelProperty
(
"公积金户"
)
@ExcelProperty
(
"公积金户"
)
private
String
providentHouseholdName
;
private
String
providentHouseholdName
;
@ExcelAttribute
(
name
=
"审核状态"
,
readConverterExp
=
"1=待审核,2=审核通过,3=审核不通过"
)
@ExcelAttribute
(
name
=
"审核状态"
,
readConverterExp
=
"1=待审核,2=审核通过,3=审核不通过
,4=已办结
"
)
@Schema
(
description
=
"审核状态:1待审核2审核通过3审核不通过"
)
@Schema
(
description
=
"审核状态:1待审核2审核通过3审核不通过
4已办结
"
)
@ExcelProperty
(
"审核状态"
)
@ExcelProperty
(
"审核状态"
)
private
String
status
;
private
String
status
;
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
194b049f
...
@@ -103,7 +103,7 @@
...
@@ -103,7 +103,7 @@
<!-- 派单导出vo -->
<!-- 派单导出vo -->
<resultMap
id=
"exportMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoExportVo"
>
<resultMap
id=
"exportMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoExportVo"
>
<id
property=
"id"
column=
"ID"
/>
<id
property=
"id"
column=
"ID"
/>
<result
property=
"
dispatchCode"
column=
"DISPATCH_CODE
"
/>
<result
property=
"
applyNo"
column=
"APPLY_NO
"
/>
<result
property=
"empNo"
column=
"EMP_NO"
/>
<result
property=
"empNo"
column=
"EMP_NO"
/>
<result
property=
"empName"
column=
"EMP_NAME"
/>
<result
property=
"empName"
column=
"EMP_NAME"
/>
<result
property=
"empIdcard"
column=
"EMP_IDCARD"
/>
<result
property=
"empIdcard"
column=
"EMP_IDCARD"
/>
...
@@ -436,7 +436,7 @@
...
@@ -436,7 +436,7 @@
<select
id=
"exportDispatch"
resultMap=
"exportMap"
>
<select
id=
"exportDispatch"
resultMap=
"exportMap"
>
select
select
a.ID,
a.ID,
a.
DISPATCH_CODE
,
a.
APPLY_NO
,
a.EMP_NO,
a.EMP_NO,
a.EMP_NAME,
a.EMP_NAME,
a.EMP_IDCARD,
a.EMP_IDCARD,
...
...
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