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
07e1e31c
Commit
07e1e31c
authored
Mar 24, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码优化-fxj
parent
b034bbcb
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
24 deletions
+15
-24
SysBaseSetInfo.java
...yifu/cloud/plus/v1/yifu/social/entity/SysBaseSetInfo.java
+7
-7
SysBaseSetSocialExportVo.java
...loud/plus/v1/yifu/social/vo/SysBaseSetSocialExportVo.java
+4
-12
SysBaseSetSocialInsertVo.java
...loud/plus/v1/yifu/social/vo/SysBaseSetSocialInsertVo.java
+4
-4
TForecastLibraryServiceImpl.java
...yifu/social/service/impl/TForecastLibraryServiceImpl.java
+0
-1
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/SysBaseSetInfo.java
View file @
07e1e31c
...
@@ -633,10 +633,10 @@ public class SysBaseSetInfo extends BaseEntity {
...
@@ -633,10 +633,10 @@ public class SysBaseSetInfo extends BaseEntity {
/**
/**
* 养工失补缴险种:养老、工伤、失业 - 补缴基数类型 0:最新基数,1:当期基数,2:自定义基数
* 养工失补缴险种:养老、工伤、失业 - 补缴基数类型 0:最新基数,1:当期基数,2:自定义基数
*/
*/
@ExcelAttribute
(
name
=
"养工失补缴险种 - 补缴基数类型 0:最新基数,1:当期基数
,2:自定义基数
"
)
@ExcelAttribute
(
name
=
"养工失补缴险种 - 补缴基数类型 0:最新基数,1:当期基数"
)
@Schema
(
description
=
"养工失补缴险种 - 补缴基数类型 0:最新基数,1:当期基数
,2:自定义基数
"
)
@Schema
(
description
=
"养工失补缴险种 - 补缴基数类型 0:最新基数,1:当期基数"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"养工失补缴险种 - 补缴基数类型 0:最新基数,1:当期基数
,2:自定义基数
"
)
@ExcelProperty
(
"养工失补缴险种 - 补缴基数类型 0:最新基数,1:当期基数"
)
private
String
baseTypePension
;
private
String
baseTypePension
;
/**
/**
...
@@ -676,12 +676,12 @@ public class SysBaseSetInfo extends BaseEntity {
...
@@ -676,12 +676,12 @@ public class SysBaseSetInfo extends BaseEntity {
private
Integer
overpayNumberMedical
;
private
Integer
overpayNumberMedical
;
/**
/**
* 医生大补缴险种:医疗、生育、大病 - 补缴基数类型 0:最新基数,1:当期基数
,2:自定义基数
* 医生大补缴险种:医疗、生育、大病 - 补缴基数类型 0:最新基数,1:当期基数
*/
*/
@ExcelAttribute
(
name
=
"医生大补缴险种 - 补缴基数类型 0:最新基数,1:当期基数
,2:自定义基数
"
)
@ExcelAttribute
(
name
=
"医生大补缴险种 - 补缴基数类型 0:最新基数,1:当期基数"
)
@Schema
(
description
=
"医生大补缴险种 - 补缴基数类型 0:最新基数,1:当期基数
,2:自定义基数
"
)
@Schema
(
description
=
"医生大补缴险种 - 补缴基数类型 0:最新基数,1:当期基数"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医生大补缴险种 - 补缴基数类型 0:最新基数,1:当期基数
,2:自定义基数
"
)
@ExcelProperty
(
"医生大补缴险种 - 补缴基数类型 0:最新基数,1:当期基数"
)
private
String
baseTypeMedical
;
private
String
baseTypeMedical
;
/**
/**
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SysBaseSetSocialExportVo.java
View file @
07e1e31c
...
@@ -2,20 +2,12 @@ package com.yifu.cloud.plus.v1.yifu.social.vo;
...
@@ -2,20 +2,12 @@ package com.yifu.cloud.plus.v1.yifu.social.vo;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
jdk.nashorn.internal.ir.annotations.Ignore
;
import
lombok.Data
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.Date
;
import
java.util.List
;
/**
/**
* @Author fxj
* @Author fxj
...
@@ -396,8 +388,8 @@ public class SysBaseSetSocialExportVo implements Serializable {
...
@@ -396,8 +388,8 @@ public class SysBaseSetSocialExportVo implements Serializable {
/**
/**
* 社保补缴基数类型 0:最新基数,1:当期基数,2:自定义基数
* 社保补缴基数类型 0:最新基数,1:当期基数,2:自定义基数
*/
*/
@ExcelAttribute
(
name
=
"社保补缴基数"
,
readConverterExp
=
"0=最新基数,1=当期基数
,2=自定义基数
"
)
@ExcelAttribute
(
name
=
"社保补缴基数"
,
readConverterExp
=
"0=最新基数,1=当期基数"
)
@Schema
(
description
=
"社保补缴基数 0:最新基数,1:当期基数
,2:自定义基数
"
)
@Schema
(
description
=
"社保补缴基数 0:最新基数,1:当期基数"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保补缴基数"
)
@ExcelProperty
(
"社保补缴基数"
)
private
String
baseTypePension
;
private
String
baseTypePension
;
...
@@ -442,8 +434,8 @@ public class SysBaseSetSocialExportVo implements Serializable {
...
@@ -442,8 +434,8 @@ public class SysBaseSetSocialExportVo implements Serializable {
/**
/**
* 医保补缴基数类型 0:最新基数,1:当期基数,2:自定义基数
* 医保补缴基数类型 0:最新基数,1:当期基数,2:自定义基数
*/
*/
@ExcelAttribute
(
name
=
"医保补缴基数"
,
readConverterExp
=
"0=最新基数,1=当期基数
,2=自定义基数
"
)
@ExcelAttribute
(
name
=
"医保补缴基数"
,
readConverterExp
=
"0=最新基数,1=当期基数"
)
@Schema
(
description
=
"医保补缴基数类型 0:最新基数,1:当期基数
,2:自定义基数
"
)
@Schema
(
description
=
"医保补缴基数类型 0:最新基数,1:当期基数"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保补缴基数"
)
@ExcelProperty
(
"医保补缴基数"
)
private
String
baseTypeMedical
;
private
String
baseTypeMedical
;
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SysBaseSetSocialInsertVo.java
View file @
07e1e31c
...
@@ -365,8 +365,8 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
...
@@ -365,8 +365,8 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/**
/**
* 社保补缴基数类型 0:最新基数,1:当期基数,2:自定义基数
* 社保补缴基数类型 0:最新基数,1:当期基数,2:自定义基数
*/
*/
@ExcelAttribute
(
name
=
"社保补缴基数"
,
readConverterExp
=
"0=最新基数,1=当期基数
,2=自定义基数
"
)
@ExcelAttribute
(
name
=
"社保补缴基数"
,
readConverterExp
=
"0=最新基数,1=当期基数"
)
@Schema
(
description
=
"社保补缴基数类型 0:最新基数,1:当期基数
,2:自定义基数
"
)
@Schema
(
description
=
"社保补缴基数类型 0:最新基数,1:当期基数"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保补缴基数"
)
@ExcelProperty
(
"社保补缴基数"
)
private
String
baseTypePension
;
private
String
baseTypePension
;
...
@@ -418,8 +418,8 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
...
@@ -418,8 +418,8 @@ public class SysBaseSetSocialInsertVo extends RowIndex implements Serializable {
/**
/**
* 医保补缴基数类型 0:最新基数,1:当期基数,2:自定义基数
* 医保补缴基数类型 0:最新基数,1:当期基数,2:自定义基数
*/
*/
@ExcelAttribute
(
name
=
"医保补缴基数"
,
readConverterExp
=
"0=最新基数,1=当期基数
,2=自定义基数
"
)
@ExcelAttribute
(
name
=
"医保补缴基数"
,
readConverterExp
=
"0=最新基数,1=当期基数"
)
@Schema
(
description
=
"医保补缴基数 0:最新基数,1:当期基数
,2:自定义基数
"
)
@Schema
(
description
=
"医保补缴基数 0:最新基数,1:当期基数"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医保补缴基数"
)
@ExcelProperty
(
"医保补缴基数"
)
private
String
baseTypeMedical
;
private
String
baseTypeMedical
;
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @
07e1e31c
...
@@ -25,7 +25,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
...
@@ -25,7 +25,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo
;
...
...
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