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
570ba99d
Commit
570ba99d
authored
Dec 06, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.3-shuiyou 减员日期
parent
44aed374
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
71 additions
and
21 deletions
+71
-21
TSocialDeadlineInfo.java
...cloud/plus/v1/yifu/social/entity/TSocialDeadlineInfo.java
+52
-20
TSocialSoldierPushServiceImpl.java
...fu/social/service/impl/TSocialSoldierPushServiceImpl.java
+8
-0
TSocialDeadlineInfoMapper.xml
...z/src/main/resources/mapper/TSocialDeadlineInfoMapper.xml
+11
-1
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialDeadlineInfo.java
View file @
570ba99d
...
...
@@ -85,37 +85,69 @@ public class TSocialDeadlineInfo extends BaseEntity {
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
town
;
/**
* 社保
起始日
* 社保
增员起始日期
*/
@ExcelAttribute
(
name
=
"社保
起始日"
,
isNotEmpty
=
true
,
errorInfo
=
"社保起始日
不能为空"
,
isDate
=
true
)
@NotBlank
(
message
=
"社保
起始日
不能为空"
)
@ExcelProperty
(
"社保
起始日
"
)
@Schema
(
description
=
"社保
起始日
"
)
@ExcelAttribute
(
name
=
"社保
增员起始日期"
,
isNotEmpty
=
true
,
errorInfo
=
"社保增员起始日期
不能为空"
,
isDate
=
true
)
@NotBlank
(
message
=
"社保
增员起始日期
不能为空"
)
@ExcelProperty
(
"社保
增员起始日期
"
)
@Schema
(
description
=
"社保
增员起始日期
"
)
private
Date
socialStartDate
;
/**
* 社保
截止日
* 社保
增员截止日期
*/
@ExcelAttribute
(
name
=
"社保
截止日"
,
isNotEmpty
=
true
,
errorInfo
=
"社保截止日
不能为空"
,
isDate
=
true
)
@NotBlank
(
message
=
"社保
截止日
不能为空"
)
@ExcelProperty
(
"社保
截止日
"
)
@Schema
(
description
=
"社保
截止日
"
)
@ExcelAttribute
(
name
=
"社保
增员截止日期"
,
isNotEmpty
=
true
,
errorInfo
=
"社保增员截止日期
不能为空"
,
isDate
=
true
)
@NotBlank
(
message
=
"社保
增员截止日期
不能为空"
)
@ExcelProperty
(
"社保
增员截止日期
"
)
@Schema
(
description
=
"社保
增员截止日期
"
)
private
Date
socialEndDate
;
/**
*
医疗起始日
*
社保减员起始日期
*/
@ExcelAttribute
(
name
=
"医疗起始日"
,
isNotEmpty
=
true
,
errorInfo
=
"医疗起始日不能为空"
,
isDate
=
true
)
@NotBlank
(
message
=
"医疗起始日不能为空"
)
@ExcelProperty
(
"医疗起始日"
)
@Schema
(
description
=
"医疗起始日"
)
@ExcelAttribute
(
name
=
"社保减员起始日期"
,
isNotEmpty
=
true
,
errorInfo
=
"社保减员起始日期不能为空"
,
isDate
=
true
)
@NotBlank
(
message
=
"社保减员起始日期不能为空"
)
@ExcelProperty
(
"社保减员起始日期"
)
@Schema
(
description
=
"社保减员起始日期"
)
private
Date
socialStartDateReduce
;
/**
* 社保减员截止日期
*/
@ExcelAttribute
(
name
=
"社保减员截止日期"
,
isNotEmpty
=
true
,
errorInfo
=
"社保减员截止日期不能为空"
,
isDate
=
true
)
@NotBlank
(
message
=
"社保减员截止日期不能为空"
)
@ExcelProperty
(
"社保减员截止日期"
)
@Schema
(
description
=
"社保减员截止日期"
)
private
Date
socialEndDateReduce
;
/**
* 医保增员起始日期
*/
@ExcelAttribute
(
name
=
"医保增员起始日期"
,
isNotEmpty
=
true
,
errorInfo
=
"医保增员起始日期不能为空"
,
isDate
=
true
)
@NotBlank
(
message
=
"医保增员起始日期不能为空"
)
@ExcelProperty
(
"医保增员起始日期"
)
@Schema
(
description
=
"医保增员起始日期"
)
private
Date
medicalStartDate
;
/**
* 医
疗截止日
* 医
保增员截止日期
*/
@ExcelAttribute
(
name
=
"医
疗截止日"
,
isNotEmpty
=
true
,
errorInfo
=
"医疗截止日
不能为空"
,
isDate
=
true
)
@NotBlank
(
message
=
"医
疗截止日
不能为空"
)
@ExcelProperty
(
"医
疗截止日
"
)
@Schema
(
description
=
"医
疗截止日
"
)
@ExcelAttribute
(
name
=
"医
保增员截止日期"
,
isNotEmpty
=
true
,
errorInfo
=
"医保增员截止日期
不能为空"
,
isDate
=
true
)
@NotBlank
(
message
=
"医
保增员截止日期
不能为空"
)
@ExcelProperty
(
"医
保增员截止日期
"
)
@Schema
(
description
=
"医
保增员截止日期
"
)
private
Date
medicalEndDate
;
/**
* 医保减员起始日期
*/
@ExcelAttribute
(
name
=
"医保减员起始日期"
,
isNotEmpty
=
true
,
errorInfo
=
"医保减员起始日期不能为空"
,
isDate
=
true
)
@NotBlank
(
message
=
"医保减员起始日期不能为空"
)
@ExcelProperty
(
"医保减员起始日期"
)
@Schema
(
description
=
"医保减员起始日期"
)
private
Date
medicalStartDateReduce
;
/**
* 医保减员截止日期
*/
@ExcelAttribute
(
name
=
"医保减员截止日期"
,
isNotEmpty
=
true
,
errorInfo
=
"医保减员截止日期不能为空"
,
isDate
=
true
)
@NotBlank
(
message
=
"医保减员截止日期不能为空"
)
@ExcelProperty
(
"医保减员截止日期"
)
@Schema
(
description
=
"医保减员截止日期"
)
private
Date
medicalEndDateReduce
;
/**
* 更新人
*/
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierPushServiceImpl.java
View file @
570ba99d
...
...
@@ -375,6 +375,10 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
if
(
socialSet
!=
null
)
{
Date
start
=
socialSet
.
getSocialStartDate
();
Date
end
=
socialSet
.
getSocialEndDate
();
if
(
"派减"
.
equals
(
vo
.
getType
()))
{
start
=
socialSet
.
getSocialStartDateReduce
();
end
=
socialSet
.
getSocialEndDateReduce
();
}
if
(
Common
.
isNotNull
(
start
)
&&
Common
.
isNotNull
(
end
))
{
if
(
nowTime
.
before
(
start
))
{
canPushType
=
0
;
...
...
@@ -424,6 +428,10 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
if
(
socialSet
!=
null
)
{
Date
start
=
socialSet
.
getMedicalStartDate
();
Date
end
=
socialSet
.
getMedicalEndDate
();
if
(
"派减"
.
equals
(
vo
.
getType
()))
{
start
=
socialSet
.
getMedicalStartDateReduce
();
end
=
socialSet
.
getMedicalEndDateReduce
();
}
if
(
Common
.
isNotNull
(
start
)
&&
Common
.
isNotNull
(
end
))
{
if
(
nowTime
.
before
(
start
))
{
canPushType
=
0
;
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialDeadlineInfoMapper.xml
View file @
570ba99d
...
...
@@ -41,6 +41,11 @@
<result
property=
"type"
column=
"TYPE"
/>
<result
property=
"socialStartDate"
column=
"SOCIAL_START_DATE"
/>
<result
property=
"medicalStartDate"
column=
"MEDICAL_START_DATE"
/>
<result
property=
"socialStartDateReduce"
column=
"SOCIAL_START_DATE_REDUCE"
/>
<result
property=
"medicalStartDateReduce"
column=
"MEDICAL_START_DATE_REDUCE"
/>
<result
property=
"socialEndDateReduce"
column=
"SOCIAL_END_DATE_REDUCE"
/>
<result
property=
"medicalEndDateReduce"
column=
"MEDICAL_END_DATE_REDUCE"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.ID,
...
...
@@ -57,7 +62,12 @@
a.UPDATE_NAME,
a.UPDATE_TIME,
a.STATUS,a.TYPE,
a.SOCIAL_START_DATE,a.MEDICAL_START_DATE
a.SOCIAL_START_DATE,
a.MEDICAL_START_DATE,
a.SOCIAL_START_DATE_REDUCE,
a.MEDICAL_START_DATE_REDUCE,
a.SOCIAL_END_DATE_REDUCE,
a.MEDICAL_END_DATE_REDUCE
</sql>
<sql
id=
"tSocialDeadlineInfo_where"
>
<if
test=
"tSocialDeadlineInfo != 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