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
06c36333
Commit
06c36333
authored
Nov 17, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
商险接口修改
parent
d1aa4635
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
13 deletions
+15
-13
TDispatchInfoExportVo.java
...u/cloud/plus/v1/yifu/social/vo/TDispatchInfoExportVo.java
+4
-4
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+11
-9
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoExportVo.java
View file @
06c36333
...
...
@@ -186,7 +186,7 @@ public class TDispatchInfoExportVo {
@ExcelProperty
(
"公积金停缴日期"
)
private
Date
fundReduceDate
;
@ExcelAttribute
(
name
=
"社保审核状态"
,
readConverterExp
=
"0=
待审核,1=审核通过,2=审核不通过
"
)
@ExcelAttribute
(
name
=
"社保审核状态"
,
readConverterExp
=
"0=
未提交,1=待审核,2=审核通过,3=审核不通过,4=已办结
"
)
@Schema
(
description
=
"社保审核状态:1待审核2审核通过3审核不通过4已办结"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保审核状态"
)
...
...
@@ -230,7 +230,7 @@ public class TDispatchInfoExportVo {
/**
* 审核状态(0待审核/1已审核)
*/
@ExcelAttribute
(
name
=
"公积金审核状态"
,
readConverterExp
=
"0=
待审核,1=审核通过,2=审核不通过
"
)
@ExcelAttribute
(
name
=
"公积金审核状态"
,
readConverterExp
=
"0=
未提交,1=待审核,2=审核通过,3=审核不通过,4=已办结
"
)
@Schema
(
description
=
"公积金审核状态:(0待审核/1已审核)"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"公积金审核状态"
)
...
...
@@ -374,8 +374,8 @@ public class TDispatchInfoExportVo {
@ExcelProperty
(
"申请编码"
)
private
String
applyNo
;
@ExcelAttribute
(
name
=
"社保办理状态"
,
readConverterExp
=
"0=待办理,1=办理成功,2=办理失败,3=部分办理
成功
,4=办理中"
)
@Schema
(
description
=
"社保办理状态 0 待办理 1 办理成功 2 办理失败 3 部分办理
成功
4 办理中"
)
@ExcelAttribute
(
name
=
"社保办理状态"
,
readConverterExp
=
"0=待办理,1=办理成功,2=办理失败,3=部分办理
失败
,4=办理中"
)
@Schema
(
description
=
"社保办理状态 0 待办理 1 办理成功 2 办理失败 3 部分办理
失败
4 办理中"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保办理状态"
)
private
String
socialHandleStatus
;
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
06c36333
...
...
@@ -119,6 +119,7 @@
<result
property=
"unemployHandle"
column=
"UNEMPLOY_HANDLE"
/>
<result
property=
"workInjuryHandle"
column=
"WORK_INJURY_HANDLE"
/>
<result
property=
"birthHandle"
column=
"BIRTH_HANDLE"
/>
<result
property=
"fundReduceDate"
column=
"FUND_REDUCE_DATE"
/>
<result
property=
"bigailmentHandle"
column=
"BIGAILMENT_HANDLE"
/>
<result
property=
"fundHandleStatus"
column=
"FUND_HANDLE_STATUS"
/>
<result
property=
"createName"
column=
"CREATE_NAME"
/>
...
...
@@ -603,12 +604,12 @@
a.SOCIAL_HOUSEHOLD_NAME,
a.PROVIDENT_HOUSEHOLD_NAME,
a.SOCIAL_HANDLE_STATUS,
s.
PENSION_HANDLE,
s.
MEDICAL_HANDLE,
s.
UNEMPLOY_HANDLE,
s.
WORK_INJURY_HANDLE,
s.
BIRTH_HANDLE,
s.
BIGAILMENT_HANDLE,
if(a.TYPE='0',s.PENSION_HANDLE,a.SOCIAL_HANDLE_STATUS) as
PENSION_HANDLE,
if(a.TYPE='0',s.MEDICAL_HANDLE,a.SOCIAL_HANDLE_STATUS) as
MEDICAL_HANDLE,
if(a.TYPE='0',s.UNEMPLOY_HANDLE,a.SOCIAL_HANDLE_STATUS) as
UNEMPLOY_HANDLE,
if(a.TYPE='0',s.WORK_INJURY_HANDLE,a.SOCIAL_HANDLE_STATUS) as
WORK_INJURY_HANDLE,
if(a.TYPE='0',s.BIRTH_HANDLE,a.SOCIAL_HANDLE_STATUS) as
BIRTH_HANDLE,
if(a.TYPE='0',s.BIGAILMENT_HANDLE,a.SOCIAL_HANDLE_STATUS) as
BIGAILMENT_HANDLE,
a.FUND_HANDLE_STATUS,
a.CREATE_NAME,
a.ORGAN_NAME,
...
...
@@ -627,15 +628,16 @@
a.AUDIT_TIME,
a.FUND_HANDLE_REMARK,
a.SOCIAL_HANDLE_REMARK,
a.FUND_REDUCE_DATE,
c.PROVIDENT_START,
c.AUDIT_STATUS
as FUND_AUDIT_STATUS,
if(a.FUND_ID = NULL,'',a.STATUS)
as FUND_AUDIT_STATUS,
c.AUDIT_USER as FUND_AUDIT_USER,
c.HANDLE_USER as FUND_HANDLE_USER,
c.HANDLE_TIME as FUND_HANDLE_TIME,
s.AUDIT_USER as AUDIT_USER_NAME,
s.
AUDIT_STATUS,
if(a.SOCIAL_ID =NULL,'',a.STATUS) as
AUDIT_STATUS,
s.SOCIAL_START_DATE,
s
.SOCIAL_REDUCE_DATE,
a
.SOCIAL_REDUCE_DATE,
s.RECORD_BASE,
s.HANDLE_USER,
s.HANDLE_TIME,
...
...
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