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
43349642
Commit
43349642
authored
Feb 16, 2023
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
派单查询导出新增 公积金缴纳比例 公积金缴纳基数
parent
835b4e8f
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
44 additions
and
21 deletions
+44
-21
Dockerfile
yifu-insurances/yifu-insurances-biz/Dockerfile
+1
-1
Dockerfile
yifu-order/yifu-order-biz/Dockerfile
+1
-1
Dockerfile
yifu-salary/yifu-salary-biz/Dockerfile
+1
-1
SocialHandleExportVo.java
...fu/cloud/plus/v1/yifu/social/vo/SocialHandleExportVo.java
+8
-7
TDispatchInfoExportVo.java
...u/cloud/plus/v1/yifu/social/vo/TDispatchInfoExportVo.java
+28
-8
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+2
-2
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+3
-1
No files found.
yifu-insurances/yifu-insurances-biz/Dockerfile
View file @
43349642
...
...
@@ -8,7 +8,7 @@ ARG JAR_FILE=target/yifu-insurances-biz.jar
COPY
${JAR_FILE} app.jar
EXPOSE
500
2
EXPOSE
500
5
ENV
TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
...
...
yifu-order/yifu-order-biz/Dockerfile
View file @
43349642
...
...
@@ -8,7 +8,7 @@ ARG JAR_FILE=target/yifu-order-biz.jar
COPY
${JAR_FILE} app.jar
EXPOSE
500
2
EXPOSE
500
6
ENV
TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
...
...
yifu-salary/yifu-salary-biz/Dockerfile
View file @
43349642
...
...
@@ -8,7 +8,7 @@ ARG JAR_FILE=target/yifu-salary-biz.jar
COPY
${JAR_FILE} app.jar
EXPOSE
500
2
EXPOSE
500
3
ENV
TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialHandleExportVo.java
View file @
43349642
...
...
@@ -33,9 +33,10 @@ public class SocialHandleExportVo implements Serializable {
/**
* 社保办理状态 0 未办理 1 全部办理成功(原-已办理) 2 全部办理失败(原-办理失败) 3已派减 4办理中 (20210609派单拆分新增fxj) 5部分办理失败 6 派减办理中 7 派减部分办理失败
* 0 未办理 1 全部办理成功(原-已办理) 2 全部办理失败(原-办理失败) 3 部分办理成功 4 办理中
*/
@Schema
(
description
=
"社保办理状态"
)
@ExcelAttribute
(
name
=
"社保办理状态"
,
readConverterExp
=
"0=未办理,1=全部办理成功,2=全部办理失败,3=
已派减,4=办理中,5=部分办理失败,6=派减办理中,7=派减部分办理失败
"
,
needExport
=
true
)
@ExcelAttribute
(
name
=
"社保办理状态"
,
readConverterExp
=
"0=未办理,1=全部办理成功,2=全部办理失败,3=
部分办理成功,4=办理中
"
,
needExport
=
true
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保办理状态"
)
private
String
socialHandleStatus
;
...
...
@@ -43,7 +44,7 @@ public class SocialHandleExportVo implements Serializable {
/**
* 养老办理状态:0待办理1办理成功2办理失败3已派减4派减失败
*/
@ExcelAttribute
(
name
=
"养老状态"
,
maxLength
=
1
,
readConverterExp
=
"0=
待办理,1=办理成功,2=办理失败,3=已派减,4=派减失败
,null=——"
,
needExport
=
true
)
@ExcelAttribute
(
name
=
"养老状态"
,
maxLength
=
1
,
readConverterExp
=
"0=
派增待办理,1=派增办理成功,2=派增办理失败,3=派增已派减,4=派减失败,5=派减待办理
,null=——"
,
needExport
=
true
)
@Schema
(
description
=
"养老办理状态:0待办理1办理成功2办理失败3已派减"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"养老状态"
)
...
...
@@ -51,7 +52,7 @@ public class SocialHandleExportVo implements Serializable {
/**
* 医疗办理状态:0待办理1办理成功2办理失败3已派减4派减失败
*/
@ExcelAttribute
(
name
=
"医疗状态"
,
maxLength
=
1
,
readConverterExp
=
"0=
待办理,1=办理成功,2=办理失败,3=已派减,4=派减失败
,null=——"
,
needExport
=
true
)
@ExcelAttribute
(
name
=
"医疗状态"
,
maxLength
=
1
,
readConverterExp
=
"0=
派增待办理,1=派增办理成功,2=派增办理失败,3=派增已派减,4=派减失败,5=派减待办理
,null=——"
,
needExport
=
true
)
@Schema
(
description
=
"医疗办理状态:0待办理1办理成功2办理失败3已派减"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医疗状态"
)
...
...
@@ -59,7 +60,7 @@ public class SocialHandleExportVo implements Serializable {
/**
* 失业办理状态:0待办理1办理成功2办理失败3已派减4派减失败
*/
@ExcelAttribute
(
name
=
"失业状态"
,
maxLength
=
1
,
readConverterExp
=
"0=
待办理,1=办理成功,2=办理失败,3=已派减,4=派减失败
,null=——"
,
needExport
=
true
)
@ExcelAttribute
(
name
=
"失业状态"
,
maxLength
=
1
,
readConverterExp
=
"0=
派增待办理,1=派增办理成功,2=派增办理失败,3=派增已派减,4=派减失败,5=派减待办理
,null=——"
,
needExport
=
true
)
@Schema
(
description
=
"失业办理状态:0待办理1办理成功2办理失败3已派减"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"失业状态"
)
...
...
@@ -67,7 +68,7 @@ public class SocialHandleExportVo implements Serializable {
/**
* 工伤办理状态:0待办理1办理成功2办理失败3已派减4派减失败
*/
@ExcelAttribute
(
name
=
"工伤状态"
,
maxLength
=
1
,
readConverterExp
=
"0=
待办理,1=办理成功,2=办理失败,3=已派减,4=派减失败
,null=——"
,
needExport
=
true
)
@ExcelAttribute
(
name
=
"工伤状态"
,
maxLength
=
1
,
readConverterExp
=
"0=
派增待办理,1=派增办理成功,2=派增办理失败,3=派增已派减,4=派减失败,5=派减待办理
,null=——"
,
needExport
=
true
)
@Schema
(
description
=
"工伤办理状态:0待办理1办理成功2办理失败3已派减"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"工伤状态"
)
...
...
@@ -75,7 +76,7 @@ public class SocialHandleExportVo implements Serializable {
/**
* 生育办理状态:0待办理1办理成功2办理失败3已派减4派减失败
*/
@ExcelAttribute
(
name
=
"生育状态"
,
maxLength
=
1
,
readConverterExp
=
"0=
待办理,1=办理成功,2=办理失败,3=已派减,4=派减失败
,null=——"
,
needExport
=
true
)
@ExcelAttribute
(
name
=
"生育状态"
,
maxLength
=
1
,
readConverterExp
=
"0=
派增待办理,1=派增办理成功,2=派增办理失败,3=派增已派减,4=派减失败,5=派减待办理
,null=——"
,
needExport
=
true
)
@Schema
(
description
=
"生育办理状态:0待办理1办理成功2办理失败3已派减"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"生育状态"
)
...
...
@@ -83,7 +84,7 @@ public class SocialHandleExportVo implements Serializable {
/**
* 大病办理状态:0待办理1办理成功2办理失败3已派减4派减失败
*/
@ExcelAttribute
(
name
=
"大病状态"
,
maxLength
=
1
,
readConverterExp
=
"0=
待办理,1=办理成功,2=办理失败,3=已派减,4=派减失败
,null=——"
,
needExport
=
true
)
@ExcelAttribute
(
name
=
"大病状态"
,
maxLength
=
1
,
readConverterExp
=
"0=
派增待办理,1=派增办理成功,2=派增办理失败,3=派增已派减,4=派减失败,5=派减待办理
,null=——"
,
needExport
=
true
)
@Schema
(
description
=
"大病办理状态:0待办理1办理成功2办理失败3已派减"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"大病状态"
)
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoExportVo.java
View file @
43349642
...
...
@@ -26,6 +26,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import
lombok.Data
;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.NotBlank
;
import
java.math.BigDecimal
;
import
java.time.LocalDateTime
;
import
java.util.Date
;
...
...
@@ -267,6 +268,26 @@ public class TDispatchInfoExportVo {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"公积金办理时间"
)
private
Date
fundHandleTime
;
/**
* 公积金缴纳基数
*/
@NotBlank
(
message
=
"公积金缴纳基数不能为空"
)
@ExcelAttribute
(
name
=
"公积金缴纳基数"
,
isNotEmpty
=
true
,
errorInfo
=
"公积金缴纳基数不能为空"
)
@Schema
(
description
=
"公积金缴纳基数"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"公积金缴纳基数"
)
private
BigDecimal
unitProvidengCardinal
;
/**
* 公积金缴纳比例
*/
@ExcelAttribute
(
name
=
"公积金缴纳比例"
)
@Schema
(
description
=
"公积金缴纳比例"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"公积金缴纳比例"
)
private
BigDecimal
unitProvidentPer
;
/**
* 养老基数
*/
...
...
@@ -374,43 +395,43 @@ public class TDispatchInfoExportVo {
@ExcelProperty
(
"申请编码"
)
private
String
applyNo
;
@ExcelAttribute
(
name
=
"社保办理状态"
,
readConverterExp
=
"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
;
@ExcelAttribute
(
name
=
"养老办理状态"
,
readConverterExp
=
"0=待办理,1=办理成功,2=办理失败,3=已派减"
)
//
@ExcelAttribute(name = "养老办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
@Schema
(
description
=
"养老办理状态:0待办理1办理成功2办理失败3已派减"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"养老办理状态"
)
private
String
pensionHandle
;
@ExcelAttribute
(
name
=
"医疗办理状态"
,
readConverterExp
=
"0=待办理,1=办理成功,2=办理失败,3=已派减"
)
//
@ExcelAttribute(name = "医疗办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
@Schema
(
description
=
"医疗办理状态:0待办理1办理成功2办理失败3已派减"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医疗办理状态"
)
private
String
medicalHandle
;
@ExcelAttribute
(
name
=
"失业办理状态"
,
readConverterExp
=
"0=待办理,1=办理成功,2=办理失败,3=已派减"
)
//
@ExcelAttribute(name = "失业办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
@Schema
(
description
=
"失业办理状态:0待办理1办理成功2办理失败3已派减"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"失业办理状态"
)
private
String
unemployHandle
;
@ExcelAttribute
(
name
=
"工伤办理状态"
,
readConverterExp
=
"0=待办理,1=办理成功,2=办理失败,3=已派减"
)
//
@ExcelAttribute(name = "工伤办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
@Schema
(
description
=
"工伤办理状态:0待办理1办理成功2办理失败3已派减"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"工伤办理状态"
)
private
String
workInjuryHandle
;
@ExcelAttribute
(
name
=
"生育办理状态"
,
readConverterExp
=
"0=待办理,1=办理成功,2=办理失败,3=已派减"
)
//
@ExcelAttribute(name = "生育办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
@Schema
(
description
=
"生育办理状态:0待办理1办理成功2办理失败3已派减"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"生育办理状态"
)
private
String
birthHandle
;
@ExcelAttribute
(
name
=
"大病办理状态"
,
readConverterExp
=
"0=待办理,1=办理成功,2=办理失败,3=已派减"
)
//
@ExcelAttribute(name = "大病办理状态", readConverterExp = "0=待办理,1=办理成功,2=办理失败,3=已派减")
@Schema
(
description
=
"大病办理状态:0待办理1办理成功2办理失败3已派减"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"大病办理状态"
)
...
...
@@ -449,5 +470,4 @@ public class TDispatchInfoExportVo {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"公积金办理备注"
)
private
String
fundHandleRemark
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
43349642
...
...
@@ -2807,8 +2807,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
temp
.
deleteCharAt
(
temp
.
length
()-
1
);
}
dispatch
.
setDispatchItem
(
temp
.
toString
());
dispatch
.
setBelongUnitName
(
s
ocialFund
.
getUnit
Name
());
dispatch
.
setBelongUnit
(
s
ocialFund
.
getUnit
Id
());
dispatch
.
setBelongUnitName
(
s
etInfoVo
.
getCustomer
Name
());
dispatch
.
setBelongUnit
(
s
etInfoVo
.
getCustomer
Id
());
if
(
Common
.
isNotNull
(
empVo
)){
dispatch
.
setEmpMobile
(
empVo
.
getEmpPhone
());
dispatch
.
setEmpNational
(
empVo
.
getEmpNational
());
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
43349642
...
...
@@ -793,7 +793,9 @@
s.UNIT_BIGAILMENT_CARDINAL,
s.UNIT_WORK_INJURY_CARDINAL,
s.UNIT_BIRTH_CARDINAL,
c.PROVIDENT_HOUSEHOLD_NAME
c.PROVIDENT_HOUSEHOLD_NAME,
c.UNIT_PROVIDENG_CARDINAL,
c.UNIT_PROVIDENT_PER
from t_dispatch_info a
left join t_social_info s on s.id=a.SOCIAL_ID
...
...
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