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
9ce08dbb
Commit
9ce08dbb
authored
Oct 30, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-社保自动化相关提交
parent
c2e897ef
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
262 additions
and
18 deletions
+262
-18
TDispatchInfoPreVo.java
...fu/cloud/plus/v1/yifu/archives/vo/TDispatchInfoPreVo.java
+109
-0
TDispatchInfoPre.java
...fu/cloud/plus/v1/yifu/social/entity/TDispatchInfoPre.java
+109
-0
TDispatchInfoPreServiceImpl.java
...yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
+20
-18
TDispatchInfoPreMapper.xml
...-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
+24
-0
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TDispatchInfoPreVo.java
View file @
9ce08dbb
...
@@ -365,6 +365,115 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
...
@@ -365,6 +365,115 @@ public class TDispatchInfoPreVo extends RowIndex implements Serializable {
@Schema
(
description
=
"工伤基数"
)
@Schema
(
description
=
"工伤基数"
)
@ExcelProperty
(
"工伤基数"
)
@ExcelProperty
(
"工伤基数"
)
private
BigDecimal
workInjuryCardinal
;
private
BigDecimal
workInjuryCardinal
;
/**
* 养老基数上限
*/
@ExcelAttribute
(
name
=
"养老基数上限"
)
@Schema
(
description
=
"养老基数上限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"养老基数上限"
)
private
BigDecimal
upPersion
;
/**
* 医疗基数上限
*/
@ExcelAttribute
(
name
=
"医疗基数上限"
)
@Schema
(
description
=
"医疗基数上限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医疗基数上限"
)
private
BigDecimal
upMedical
;
/**
* 失业基数上限
*/
@ExcelAttribute
(
name
=
"失业基数上限"
)
@Schema
(
description
=
"失业基数上限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"失业基数上限"
)
private
BigDecimal
upUnemployment
;
/**
* 工伤基数上限
*/
@ExcelAttribute
(
name
=
"工伤基数上限"
)
@Schema
(
description
=
"工伤基数上限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"工伤基数上限"
)
private
BigDecimal
upInjury
;
/**
* 生育基数上限
*/
@ExcelAttribute
(
name
=
"生育基数上限"
)
@Schema
(
description
=
"生育基数上限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"生育基数上限"
)
private
BigDecimal
upBirth
;
/**
* 大病基数上限
*/
@ExcelAttribute
(
name
=
"大病基数上限"
)
@Schema
(
description
=
"大病基数上限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"大病基数上限"
)
private
BigDecimal
upBig
;
/**
* 养老基数下限
*/
@ExcelAttribute
(
name
=
"养老基数下限"
)
@Schema
(
description
=
"养老基数下限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"养老基数下限"
)
private
BigDecimal
lowerPersion
;
/**
* 医疗基数下限
*/
@ExcelAttribute
(
name
=
"医疗基数下限"
)
@Schema
(
description
=
"医疗基数下限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医疗基数下限"
)
private
BigDecimal
lowerMedical
;
/**
* 失业基数下限
*/
@ExcelAttribute
(
name
=
"失业基数下限"
)
@Schema
(
description
=
"失业基数下限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"失业基数下限"
)
private
BigDecimal
lowerUnemployment
;
/**
* 工伤基数下限
*/
@ExcelAttribute
(
name
=
"工伤基数下限"
)
@Schema
(
description
=
"工伤基数下限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"工伤基数下限"
)
private
BigDecimal
lowerInjury
;
/**
* 生育基数下限
*/
@ExcelAttribute
(
name
=
"生育基数下限"
)
@Schema
(
description
=
"生育基数下限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"生育基数下限"
)
private
BigDecimal
lowerBirth
;
/**
* 大病基数下限
*/
@ExcelAttribute
(
name
=
"大病基数下限"
)
@Schema
(
description
=
"大病基数下限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"大病基数下限"
)
private
BigDecimal
lowerBig
;
/**
/**
* 生育基数
* 生育基数
*/
*/
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfoPre.java
View file @
9ce08dbb
...
@@ -383,6 +383,115 @@ public class TDispatchInfoPre extends BaseEntity {
...
@@ -383,6 +383,115 @@ public class TDispatchInfoPre extends BaseEntity {
@ExcelProperty
(
"生育基数"
)
@ExcelProperty
(
"生育基数"
)
@Schema
(
description
=
"生育基数"
)
@Schema
(
description
=
"生育基数"
)
private
BigDecimal
birthCardinal
;
private
BigDecimal
birthCardinal
;
/**
* 养老基数上限
*/
@ExcelAttribute
(
name
=
"养老基数上限"
)
@Schema
(
description
=
"养老基数上限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"养老基数上限"
)
private
BigDecimal
upPersion
;
/**
* 医疗基数上限
*/
@ExcelAttribute
(
name
=
"医疗基数上限"
)
@Schema
(
description
=
"医疗基数上限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医疗基数上限"
)
private
BigDecimal
upMedical
;
/**
* 失业基数上限
*/
@ExcelAttribute
(
name
=
"失业基数上限"
)
@Schema
(
description
=
"失业基数上限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"失业基数上限"
)
private
BigDecimal
upUnemployment
;
/**
* 工伤基数上限
*/
@ExcelAttribute
(
name
=
"工伤基数上限"
)
@Schema
(
description
=
"工伤基数上限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"工伤基数上限"
)
private
BigDecimal
upInjury
;
/**
* 生育基数上限
*/
@ExcelAttribute
(
name
=
"生育基数上限"
)
@Schema
(
description
=
"生育基数上限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"生育基数上限"
)
private
BigDecimal
upBirth
;
/**
* 大病基数上限
*/
@ExcelAttribute
(
name
=
"大病基数上限"
)
@Schema
(
description
=
"大病基数上限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"大病基数上限"
)
private
BigDecimal
upBig
;
/**
* 养老基数下限
*/
@ExcelAttribute
(
name
=
"养老基数下限"
)
@Schema
(
description
=
"养老基数下限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"养老基数下限"
)
private
BigDecimal
lowerPersion
;
/**
* 医疗基数下限
*/
@ExcelAttribute
(
name
=
"医疗基数下限"
)
@Schema
(
description
=
"医疗基数下限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"医疗基数下限"
)
private
BigDecimal
lowerMedical
;
/**
* 失业基数下限
*/
@ExcelAttribute
(
name
=
"失业基数下限"
)
@Schema
(
description
=
"失业基数下限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"失业基数下限"
)
private
BigDecimal
lowerUnemployment
;
/**
* 工伤基数下限
*/
@ExcelAttribute
(
name
=
"工伤基数下限"
)
@Schema
(
description
=
"工伤基数下限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"工伤基数下限"
)
private
BigDecimal
lowerInjury
;
/**
* 生育基数下限
*/
@ExcelAttribute
(
name
=
"生育基数下限"
)
@Schema
(
description
=
"生育基数下限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"生育基数下限"
)
private
BigDecimal
lowerBirth
;
/**
* 大病基数下限
*/
@ExcelAttribute
(
name
=
"大病基数下限"
)
@Schema
(
description
=
"大病基数下限"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"大病基数下限"
)
private
BigDecimal
lowerBig
;
/**
/**
* 缴纳类型(0最低缴纳、1自定义缴纳、2最高缴纳)
* 缴纳类型(0最低缴纳、1自定义缴纳、2最高缴纳)
*/
*/
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
View file @
9ce08dbb
...
@@ -191,24 +191,26 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
...
@@ -191,24 +191,26 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
socialPreDetailService
.
remove
(
Wrappers
.<
TSocialPreDetail
>
lambdaQuery
()
socialPreDetailService
.
remove
(
Wrappers
.<
TSocialPreDetail
>
lambdaQuery
()
.
eq
(
TSocialPreDetail:
:
getRegisterId
,
preVo
.
getRegisterId
()));
.
eq
(
TSocialPreDetail:
:
getRegisterId
,
preVo
.
getRegisterId
()));
try
{
try
{
if
(
Common
.
isNotNull
(
preVo
)
&&
Common
.
isNotNull
(
preVo
.
getId
()))
{
// if (Common.isNotNull(preVo) && Common.isNotNull(preVo.getId())) {
//更新逻辑
// //更新逻辑
TDispatchInfoPre
pre
=
new
TDispatchInfoPre
();
// TDispatchInfoPre pre = new TDispatchInfoPre();
BeanUtils
.
copyProperties
(
preVo
,
pre
);
// BeanUtils.copyProperties(preVo, pre);
//时间格式转化
// //时间格式转化
if
(
Common
.
isNotNull
(
preVo
.
getExpectedCollectionTime
()))
{
// if (Common.isNotNull(preVo.getExpectedCollectionTime())) {
preVo
.
setExpectedCollectionTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
// preVo.setExpectedCollectionTime(DateUtil.parseDate(DateUtil.dateToString(
preVo
.
getExpectedCollectionTime
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
" 15:20"
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
// preVo.getExpectedCollectionTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT) + " 15:20", DateUtil.DATETIME_PATTERN_MINUTE));
pre
.
setExpectedCollectionTime
(
LocalDateTimeUtils
.
dateToLocalDateTime
(
preVo
.
getExpectedCollectionTime
()));
// pre.setExpectedCollectionTime(LocalDateTimeUtils.dateToLocalDateTime(preVo.getExpectedCollectionTime()));
}
// }
if
(
Common
.
isNotNull
(
preVo
.
getExpectedConfirmTime
()))
{
// if (Common.isNotNull(preVo.getExpectedConfirmTime())) {
preVo
.
setExpectedConfirmTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
// preVo.setExpectedConfirmTime(DateUtil.parseDate(DateUtil.dateToString(
preVo
.
getExpectedCollectionTime
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
" 09:00"
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
// preVo.getExpectedCollectionTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT) + " 09:00", DateUtil.DATETIME_PATTERN_MINUTE));
pre
.
setExpectedConfirmTime
(
LocalDateTimeUtils
.
dateToLocalDateTime
(
preVo
.
getExpectedConfirmTime
()));
// pre.setExpectedConfirmTime(LocalDateTimeUtils.dateToLocalDateTime(preVo.getExpectedConfirmTime()));
}
// }
baseMapper
.
updateById
(
pre
);
// baseMapper.updateById(pre);
}
// }
if
(
Common
.
isNotNull
(
preVo
)
&&
Common
.
isEmpty
(
preVo
.
getId
()))
{
if
(
Common
.
isNotNull
(
preVo
)
// && Common.isEmpty(preVo.getId())
)
{
//判断是否存在社保待购买信息
//判断是否存在社保待购买信息
TDispatchInfoPre
preExit
=
baseMapper
.
selectOne
(
Wrappers
.<
TDispatchInfoPre
>
query
().
lambda
()
TDispatchInfoPre
preExit
=
baseMapper
.
selectOne
(
Wrappers
.<
TDispatchInfoPre
>
query
().
lambda
()
.
eq
(
TDispatchInfoPre:
:
getRegisterId
,
preVo
.
getRegisterId
())
.
eq
(
TDispatchInfoPre:
:
getRegisterId
,
preVo
.
getRegisterId
())
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
View file @
9ce08dbb
...
@@ -70,6 +70,18 @@
...
@@ -70,6 +70,18 @@
<result
property=
"errorTime"
column=
"error_time"
/>
<result
property=
"errorTime"
column=
"error_time"
/>
<result
property=
"position"
column=
"position"
/>
<result
property=
"position"
column=
"position"
/>
<result
property=
"phone"
column=
"phone"
/>
<result
property=
"phone"
column=
"phone"
/>
<result
property=
"upPersion"
column=
"UP_PERSION"
/>
<result
property=
"upMedical"
column=
"UP_MEDICAL"
/>
<result
property=
"upUnemployment"
column=
"UP_UNEMPLOYMENT"
/>
<result
property=
"upInjury"
column=
"UP_INJURY"
/>
<result
property=
"upBirth"
column=
"UP_BIRTH"
/>
<result
property=
"upBig"
column=
"UP_BIG"
/>
<result
property=
"lowerPersion"
column=
"LOWER_PERSION"
/>
<result
property=
"lowerMedical"
column=
"LOWER_MEDICAL"
/>
<result
property=
"lowerUnemployment"
column=
"LOWER_UNEMPLOYMENT"
/>
<result
property=
"lowerInjury"
column=
"LOWER_INJURY"
/>
<result
property=
"lowerBirth"
column=
"LOWER_BIRTH"
/>
<result
property=
"lowerBig"
column=
"LOWER_BIG"
/>
</resultMap>
</resultMap>
<resultMap
id=
"tDispatchInfoPreExportMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPreExportVo"
>
<resultMap
id=
"tDispatchInfoPreExportMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPreExportVo"
>
...
@@ -139,6 +151,18 @@
...
@@ -139,6 +151,18 @@
a.CREATE_TIME,
a.CREATE_TIME,
a.DELETE_FLAG,error_info,error_time,a.DISPATCHER_ID,a.error_back_info,a.position,SOCIAL_FUND_ID,a.phone,
a.DELETE_FLAG,error_info,error_time,a.DISPATCHER_ID,a.error_back_info,a.position,SOCIAL_FUND_ID,a.phone,
a.SOCIAL_PROVINCE_ID,a.SOCIAL_CITY_ID,a.SOCIAL_TOWN_ID
a.SOCIAL_PROVINCE_ID,a.SOCIAL_CITY_ID,a.SOCIAL_TOWN_ID
,a.UP_PERSION,
a.UP_MEDICAL,
a.UP_UNEMPLOYMENT,
a.UP_INJURY,
a.UP_BIRTH,
a.UP_BIG,
a.LOWER_PERSION,
a.LOWER_MEDICAL,
a.LOWER_UNEMPLOYMENT,
a.LOWER_INJURY,
a.LOWER_BIRTH,
a.LOWER_BIG
</sql>
</sql>
<sql
id=
"tDispatchInfoPre_other_where"
>
<sql
id=
"tDispatchInfoPre_other_where"
>
<if
test=
"tDispatchInfoPre != null"
>
<if
test=
"tDispatchInfoPre != null"
>
...
...
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