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
0ddedeba
Commit
0ddedeba
authored
Aug 08, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
模糊搜索
parent
a1172bf7
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
63 additions
and
14 deletions
+63
-14
TEmployeeContractInfo.java
...d/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
+3
-4
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+2
-6
TSocialFundInfoExportVo.java
...cloud/plus/v1/yifu/social/vo/TSocialFundInfoExportVo.java
+44
-0
TForecastLibraryServiceImpl.java
...yifu/social/service/impl/TForecastLibraryServiceImpl.java
+7
-3
TSocialFundInfoMapper.xml
...l-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
+7
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractInfo.java
View file @
0ddedeba
...
...
@@ -17,10 +17,7 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
entity
;
import
com.alibaba.excel.annotation.format.DateTimeFormat
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.*
;
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.ExcelAttributeConstants
;
...
...
@@ -156,6 +153,7 @@ public class TEmployeeContractInfo extends BaseEntity {
@Length
(
max
=
50
,
message
=
"合同编码不能超过50个字符"
)
@ExcelAttribute
(
name
=
"合同编码"
,
maxLength
=
50
)
@Schema
(
description
=
"合同编码"
,
name
=
"contractNo"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
contractNo
;
/**
* 备注
...
...
@@ -230,6 +228,7 @@ public class TEmployeeContractInfo extends BaseEntity {
@Length
(
max
=
50
,
message
=
"档案柜号不能超过50个字符"
)
@ExcelAttribute
(
name
=
"档案柜号"
,
maxLength
=
50
)
@Schema
(
description
=
"档案柜号"
,
name
=
"fileCabinetNo"
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
fileCabinetNo
;
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
0ddedeba
...
...
@@ -570,12 +570,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
@Override
public
R
<
String
>
filingContract
(
TEmployeeContractInfo
tEmployeeContractInfo
)
{
if
(
tEmployeeContractInfo
!=
null
)
{
if
(
Common
.
isEmpty
(
tEmployeeContractInfo
.
getContractNo
())
||
Common
.
isEmpty
(
tEmployeeContractInfo
.
getFileCabinetNo
()))
{
return
R
.
failed
(
"合同编号、档案柜号必填!"
);
}
if
(
tEmployeeContractInfo
.
getContractNo
().
length
()
>
50
||
tEmployeeContractInfo
.
getFileCabinetNo
().
length
()
>
50
)
{
if
((
Common
.
isNotNull
(
tEmployeeContractInfo
.
getContractNo
())
&&
tEmployeeContractInfo
.
getContractNo
().
length
()
>
50
)
||
(
Common
.
isNotNull
(
tEmployeeContractInfo
.
getFileCabinetNo
())
&&
tEmployeeContractInfo
.
getFileCabinetNo
().
length
()
>
50
))
{
return
R
.
failed
(
"合同编号、档案柜号不可超过50字!"
);
}
//档案柜存在就自动归档
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialFundInfoExportVo.java
View file @
0ddedeba
...
...
@@ -25,6 +25,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.Size
;
import
java.io.Serializable
;
...
...
@@ -480,4 +481,47 @@ public class TSocialFundInfoExportVo extends RowIndex implements Serializable {
@ExcelProperty
(
"委托备注"
)
private
String
trustRemark
;
/**
* 养老办理状态:0待办理1办理成功2办理失败3已派减
*/
@ExcelAttribute
(
name
=
"养老办理状态"
,
readConverterExp
=
"0=待办理,1=办理成功,2=办理失败,3=已派减"
)
@Schema
(
description
=
"养老办理状态:0待办理1办理成功2办理失败3已派减"
)
@ExcelProperty
(
"养老办理状态"
)
private
String
pensionHandle
;
/**
* 医疗办理状态:0待办理1办理成功2办理失败3已派减
*/
@ExcelAttribute
(
name
=
"医疗办理状态"
,
readConverterExp
=
"0=待办理,1=办理成功,2=办理失败,3=已派减"
)
@Schema
(
description
=
"医疗办理状态:0待办理1办理成功2办理失败3已派减"
)
@ExcelProperty
(
"医疗办理状态"
)
private
String
medicalHandle
;
/**
* 失业办理状态:0待办理1办理成功2办理失败3已派减
*/
@ExcelAttribute
(
name
=
"失业办理状态"
,
readConverterExp
=
"0=待办理,1=办理成功,2=办理失败,3=已派减"
)
@Schema
(
description
=
"失业办理状态:0待办理1办理成功2办理失败3已派减"
)
@ExcelProperty
(
"失业办理状态"
)
private
String
unemployHandle
;
/**
* 工伤办理状态:0待办理1办理成功2办理失败3已派减
*/
@ExcelAttribute
(
name
=
"工伤办理状态"
,
readConverterExp
=
"0=待办理,1=办理成功,2=办理失败,3=已派减"
)
@Schema
(
description
=
"工伤办理状态:0待办理1办理成功2办理失败3已派减"
)
@ExcelProperty
(
"工伤办理状态"
)
private
String
workInjuryHandle
;
/**
* 生育办理状态:0待办理1办理成功2办理失败3已派减
*/
@ExcelAttribute
(
name
=
"生育办理状态"
,
readConverterExp
=
"0=待办理,1=办理成功,2=办理失败,3=已派减"
)
@Schema
(
description
=
"生育办理状态:0待办理1办理成功2办理失败3已派减"
)
@ExcelProperty
(
"生育办理状态"
)
private
String
birthHandle
;
/**
* 大病办理状态:0待办理1办理成功2办理失败3已派减
*/
@ExcelAttribute
(
name
=
"大病办理状态"
,
readConverterExp
=
"0=待办理,1=办理成功,2=办理失败,3=已派减"
)
@Schema
(
description
=
"大病办理状态:0待办理1办理成功2办理失败3已派减"
)
@ExcelProperty
(
"大病办理状态"
)
private
String
bigailmentHandle
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TForecastLibraryServiceImpl.java
View file @
0ddedeba
...
...
@@ -288,11 +288,15 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
}
if
(
Common
.
isNotNull
(
library
.
getId
()))
{
baseMapper
.
updateById
(
library
);
isSaveAndUpdate
=
true
;
}
else
{
library
.
setCreateTime
(
LocalDateTime
.
now
());
baseMapper
.
insert
(
library
);
if
(
BigDecimal
.
ZERO
.
compareTo
(
BigDecimalUtils
.
isNullToZero
(
library
.
getUnitSocialSum
()))
!=
CommonConstants
.
ZERO_INT
||
BigDecimal
.
ZERO
.
compareTo
(
BigDecimalUtils
.
isNullToZero
(
library
.
getUnitFundSum
()))
!=
CommonConstants
.
ZERO_INT
)
{
library
.
setCreateTime
(
LocalDateTime
.
now
());
baseMapper
.
insert
(
library
);
isSaveAndUpdate
=
true
;
}
}
isSaveAndUpdate
=
true
;
}
if
(
isSaveAndUpdate
)
{
return
R
.
ok
(
null
,
"执行成功!"
);
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @
0ddedeba
...
...
@@ -1021,7 +1021,13 @@
a.UNIT_FUND_SUM UNIT_FUND_SUM2,
a.PERSONAL_FUND_SUM PERSONAL_FUND_SUM2,
ifnull(a.UNIT_FUND_SUM,0) + ifnull(a.PERSONAL_FUND_SUM,0) FUND_SUM,
a.TRUST_REMARK
a.TRUST_REMARK,
a.PENSION_HANDLE,
a.MEDICAL_HANDLE,
a.UNEMPLOY_HANDLE,
a.WORK_INJURY_HANDLE,
a.BIRTH_HANDLE,
a.BIGAILMENT_HANDLE
from t_social_fund_info a
left join t_dispatch_info d on a.DISPATCH_ID=d.ID
<where>
...
...
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