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
c92d1552
You need to sign in or sign up before continuing.
Commit
c92d1552
authored
Aug 09, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
2c8763a3
89a9d0d5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
131 additions
and
139 deletions
+131
-139
TEmployeeInfoMapper.xml
...ves-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
+9
-2
ExcelUtil.java
...m/yifu.cloud.plus.v1/yifu/common/core/util/ExcelUtil.java
+23
-3
TSalaryStandardController.java
.../v1/yifu/salary/controller/TSalaryStandardController.java
+0
-14
TPreDispatchInfo.java
...fu/cloud/plus/v1/yifu/social/entity/TPreDispatchInfo.java
+12
-16
TPreDispatchReduceVo.java
...fu/cloud/plus/v1/yifu/social/vo/TPreDispatchReduceVo.java
+14
-14
TPreDispatchUpdateVo.java
...fu/cloud/plus/v1/yifu/social/vo/TPreDispatchUpdateVo.java
+8
-8
TPreDispatchInfoController.java
...v1/yifu/social/controller/TPreDispatchInfoController.java
+1
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+60
-80
TPreDispatchInfoServiceImpl.java
...yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
+4
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @
c92d1552
...
@@ -722,9 +722,16 @@
...
@@ -722,9 +722,16 @@
t_employee_contract_info x
t_employee_contract_info x
WHERE
WHERE
x.DELETE_FLAG = '0'
x.DELETE_FLAG = '0'
AND x.AUDIT_STATUS != '3'
AND (
AND x.IS_OBSOLETE = '0'
(
x.AUDIT_STATUS = '2'
AND x.IN_USE = '0'
AND x.IN_USE = '0'
)
OR (
x.AUDIT_STATUS = '1'
AND x.IN_USE = '1'
)
)
<if
test=
"checkVo != null"
>
<if
test=
"checkVo != null"
>
<if
test=
"checkVo.idCards != null"
>
<if
test=
"checkVo.idCards != null"
>
AND x.EMP_IDCARD in
AND x.EMP_IDCARD in
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/util/ExcelUtil.java
View file @
c92d1552
...
@@ -18,6 +18,7 @@ import java.time.LocalDate;
...
@@ -18,6 +18,7 @@ import java.time.LocalDate;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.time.format.DateTimeFormatter
;
import
java.time.format.DateTimeFormatter
;
import
java.util.*
;
import
java.util.*
;
import
java.util.regex.Pattern
;
/**
/**
* @Author fxj
* @Author fxj
...
@@ -266,7 +267,7 @@ public class ExcelUtil <T> implements Serializable {
...
@@ -266,7 +267,7 @@ public class ExcelUtil <T> implements Serializable {
//如果是需要从字典表取值数据的话在这里处理即可
//如果是需要从字典表取值数据的话在这里处理即可
if
(
Common
.
isNotNull
(
attr
.
readConverterExp
()))
{
if
(
Common
.
isNotNull
(
attr
.
readConverterExp
()))
{
tempStr
=
reverseByExp
(
c
,
attr
.
readConverterExp
());
tempStr
=
reverseByExp
(
c
,
attr
.
readConverterExp
());
if
(
Common
.
isEmpty
(
tempStr
)){
if
(
Common
.
isEmpty
(
tempStr
)){
errorMessageHashMap
=
initErrorMessage
(
errorMessageHashMap
,
new
ErrorMessage
(
rowNum
,
"未找到:"
+
c
+
"的字典数据"
),
errorTemp
);
errorMessageHashMap
=
initErrorMessage
(
errorMessageHashMap
,
new
ErrorMessage
(
rowNum
,
"未找到:"
+
c
+
"的字典数据"
),
errorTemp
);
continue
;
continue
;
...
@@ -689,13 +690,21 @@ public class ExcelUtil <T> implements Serializable {
...
@@ -689,13 +690,21 @@ public class ExcelUtil <T> implements Serializable {
return
errorInfo
(
attr
,
"_小于最小值"
,
i
);
return
errorInfo
(
attr
,
"_小于最小值"
,
i
);
}
}
}
else
{
}
else
{
if
(
Float
.
valueOf
(
c
).
intValue
()
<
attr
.
min
())
{
if
(
String
.
valueOf
(
Float
.
valueOf
(
c
).
intValue
()).
length
()
<
attr
.
min
())
{
return
errorInfo
(
attr
,
"_
小于最小值
"
,
i
);
return
errorInfo
(
attr
,
"_
长度小于"
+
Float
.
valueOf
(
attr
.
min
()).
intValue
()
+
"位
"
,
i
);
}
}
}
}
}
else
{
}
else
{
return
errorInfo
(
attr
,
"_必须为数字且最多两位小数"
,
i
);
return
errorInfo
(
attr
,
"_必须为数字且最多两位小数"
,
i
);
}
}
}
else
if
(
attr
.
min
()
==
0
)
{
if
(
Common
.
isNumber
(
c
))
{
if
(
attr
.
isFloat
()){
if
(
Float
.
valueOf
(
c
).
compareTo
(
attr
.
min
())
<
CommonConstants
.
ZERO_INT
)
{
return
errorInfo
(
attr
,
"_小于最小值"
,
i
);
}
}
}
}
}
}
}
return
null
;
return
null
;
...
@@ -821,6 +830,17 @@ public class ExcelUtil <T> implements Serializable {
...
@@ -821,6 +830,17 @@ public class ExcelUtil <T> implements Serializable {
}
}
//校验字段是否符合要求 返回错误信息
//校验字段是否符合要求 返回错误信息
error
=
validateUtil
(
c
,
attr
,
i
+
2
);
error
=
validateUtil
(
c
,
attr
,
i
+
2
);
if
(
null
==
error
&&
attr
.
isDate
()
&&
Common
.
isNotNull
(
c
))
{
c
.
replace
(
"/"
,
"-"
).
replace
(
CommonConstants
.
YEAR
,
"-"
)
.
replace
(
CommonConstants
.
MONTH
,
"-"
).
replace
(
CommonConstants
.
DAY
,
""
);
Pattern
pattern
=
Pattern
.
compile
(
"[0-9]*"
);
if
(
pattern
.
matcher
(
c
).
matches
())
{
StringBuilder
sb
=
new
StringBuilder
(
c
);
sb
.
insert
(
4
,
"-"
);
sb
.
insert
(
7
,
"-"
);
c
=
sb
.
toString
();
}
}
if
(
null
!=
error
)
{
if
(
null
!=
error
)
{
errorList
.
add
(
new
ErrorMessage
(
i
+
2
,
error
));
errorList
.
add
(
new
ErrorMessage
(
i
+
2
,
error
));
errorMessageHashMap
=
initErrorMessage
(
errorMessageHashMap
,
new
ErrorMessage
(
i
+
2
,
error
),
errorTemp
);
errorMessageHashMap
=
initErrorMessage
(
errorMessageHashMap
,
new
ErrorMessage
(
i
+
2
,
error
),
errorTemp
);
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java
View file @
c92d1552
...
@@ -31,7 +31,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
...
@@ -31,7 +31,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.List
;
/**
/**
...
@@ -62,19 +61,6 @@ public class TSalaryStandardController {
...
@@ -62,19 +61,6 @@ public class TSalaryStandardController {
return
new
R
<>(
tSalaryStandardService
.
getTSalaryStandardPage
(
page
,
tSalaryStandard
));
return
new
R
<>(
tSalaryStandardService
.
getTSalaryStandardPage
(
page
,
tSalaryStandard
));
}
}
/**
* 不分页查询
*
* @param tSalaryStandard 标准薪酬工资表
* @return
*/
@Operation
(
summary
=
"不分页查询"
,
description
=
"不分页查询"
)
@PostMapping
(
"/noPage"
)
//@PreAuthorize("@pms.hasPermission('salary_tsalarystandard_get')" )
public
R
<
List
<
TSalaryStandard
>>
getTSalaryStandardNoPage
(
@RequestBody
TSalaryStandardSearchVo
tSalaryStandard
)
{
return
R
.
ok
(
tSalaryStandardService
.
noPageDiy
(
tSalaryStandard
));
}
/**
/**
* 通过id查询标准薪酬工资表
* 通过id查询标准薪酬工资表
*
*
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPreDispatchInfo.java
View file @
c92d1552
...
@@ -27,13 +27,10 @@ import lombok.Data;
...
@@ -27,13 +27,10 @@ import lombok.Data;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
import
org.hibernate.validator.constraints.Length
;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.DecimalMax
;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.Size
;
import
javax.validation.constraints.Size
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.Set
;
...
@@ -228,14 +225,14 @@ public class TPreDispatchInfo extends BaseEntity {
...
@@ -228,14 +225,14 @@ public class TPreDispatchInfo extends BaseEntity {
*/
*/
@Schema
(
description
=
"实际工作地"
)
@Schema
(
description
=
"实际工作地"
)
@Length
(
max
=
20
,
message
=
"实际工作地不能超过20个字符"
)
@Length
(
max
=
20
,
message
=
"实际工作地不能超过20个字符"
)
@ExcelAttribute
(
name
=
"实际工作地"
)
@ExcelAttribute
(
name
=
"实际工作地"
,
maxLength
=
20
)
private
String
workingAddress
;
private
String
workingAddress
;
/**
/**
* 备注说明1
* 备注说明1
*/
*/
@Schema
(
description
=
"备注说明1"
)
@Schema
(
description
=
"备注说明1"
)
@Length
(
max
=
250
,
message
=
"备注说明1不能超过25
5
个字符"
)
@Length
(
max
=
250
,
message
=
"备注说明1不能超过25
0
个字符"
)
@ExcelAttribute
(
name
=
"备注说明1"
,
maxLength
=
250
)
@ExcelAttribute
(
name
=
"备注说明1"
,
maxLength
=
250
)
private
String
remarkOne
;
private
String
remarkOne
;
...
@@ -266,7 +263,7 @@ public class TPreDispatchInfo extends BaseEntity {
...
@@ -266,7 +263,7 @@ public class TPreDispatchInfo extends BaseEntity {
*/
*/
@Schema
(
description
=
"养老起缴月"
)
@Schema
(
description
=
"养老起缴月"
)
@Length
(
max
=
6
,
message
=
"养老起缴月不能超过6个字符"
)
@Length
(
max
=
6
,
message
=
"养老起缴月不能超过6个字符"
)
@ExcelAttribute
(
name
=
"养老起缴月"
,
maxLength
=
6
,
isInteger
=
true
)
@ExcelAttribute
(
name
=
"养老起缴月"
,
maxLength
=
6
,
min
=
6
,
isInteger
=
true
)
private
String
pensionStart
;
private
String
pensionStart
;
/**
/**
...
@@ -288,7 +285,7 @@ public class TPreDispatchInfo extends BaseEntity {
...
@@ -288,7 +285,7 @@ public class TPreDispatchInfo extends BaseEntity {
*/
*/
@Schema
(
description
=
"医疗起缴月"
)
@Schema
(
description
=
"医疗起缴月"
)
@Length
(
max
=
6
,
message
=
"医疗起缴月不能超过6个字符"
)
@Length
(
max
=
6
,
message
=
"医疗起缴月不能超过6个字符"
)
@ExcelAttribute
(
name
=
"医疗起缴月"
,
maxLength
=
6
,
isInteger
=
true
)
@ExcelAttribute
(
name
=
"医疗起缴月"
,
maxLength
=
6
,
min
=
6
,
isInteger
=
true
)
private
String
medicalStart
;
private
String
medicalStart
;
/**
/**
...
@@ -309,8 +306,7 @@ public class TPreDispatchInfo extends BaseEntity {
...
@@ -309,8 +306,7 @@ public class TPreDispatchInfo extends BaseEntity {
* 工伤起缴月
* 工伤起缴月
*/
*/
@Schema
(
description
=
"工伤起缴月"
)
@Schema
(
description
=
"工伤起缴月"
)
@Length
(
max
=
6
,
message
=
"工伤起缴月不能超过6个字符"
)
@ExcelAttribute
(
name
=
"工伤起缴月"
,
maxLength
=
6
,
min
=
6
,
isInteger
=
true
)
@ExcelAttribute
(
name
=
"工伤起缴月"
,
maxLength
=
6
,
isInteger
=
true
)
private
String
injuryStart
;
private
String
injuryStart
;
/**
/**
...
@@ -332,7 +328,7 @@ public class TPreDispatchInfo extends BaseEntity {
...
@@ -332,7 +328,7 @@ public class TPreDispatchInfo extends BaseEntity {
*/
*/
@Schema
(
description
=
"生育起缴月"
)
@Schema
(
description
=
"生育起缴月"
)
@Length
(
max
=
6
,
message
=
"生育起缴月不能超过6个字符"
)
@Length
(
max
=
6
,
message
=
"生育起缴月不能超过6个字符"
)
@ExcelAttribute
(
name
=
"生育起缴月"
,
maxLength
=
6
,
isInteger
=
true
)
@ExcelAttribute
(
name
=
"生育起缴月"
,
maxLength
=
6
,
min
=
6
,
isInteger
=
true
)
private
String
birthStart
;
private
String
birthStart
;
/**
/**
...
@@ -354,7 +350,7 @@ public class TPreDispatchInfo extends BaseEntity {
...
@@ -354,7 +350,7 @@ public class TPreDispatchInfo extends BaseEntity {
*/
*/
@Schema
(
description
=
"失业起缴月"
)
@Schema
(
description
=
"失业起缴月"
)
@Length
(
max
=
6
,
message
=
"失业起缴月不能超过6个字符"
)
@Length
(
max
=
6
,
message
=
"失业起缴月不能超过6个字符"
)
@ExcelAttribute
(
name
=
"失业起缴月"
,
maxLength
=
6
,
isInteger
=
true
)
@ExcelAttribute
(
name
=
"失业起缴月"
,
maxLength
=
6
,
min
=
6
,
isInteger
=
true
)
private
String
unemploymentStart
;
private
String
unemploymentStart
;
/**
/**
...
@@ -376,21 +372,21 @@ public class TPreDispatchInfo extends BaseEntity {
...
@@ -376,21 +372,21 @@ public class TPreDispatchInfo extends BaseEntity {
*/
*/
@Schema
(
description
=
"公积金起缴月"
)
@Schema
(
description
=
"公积金起缴月"
)
@Length
(
max
=
6
,
message
=
"公积金起缴月不能超过6个字符"
)
@Length
(
max
=
6
,
message
=
"公积金起缴月不能超过6个字符"
)
@ExcelAttribute
(
name
=
"公积金起缴月"
,
maxLength
=
6
,
isInteger
=
true
)
@ExcelAttribute
(
name
=
"公积金起缴月"
,
maxLength
=
6
,
min
=
6
,
isInteger
=
true
)
private
String
fundStart
;
private
String
fundStart
;
/**
/**
* 公积金个人比例
* 公积金个人比例
*/
*/
@Schema
(
description
=
"公积金个人比例"
)
@Schema
(
description
=
"公积金个人比例"
)
@ExcelAttribute
(
name
=
"公积金个人比例"
,
isFloat
=
true
,
max
=
"
99.99
"
)
@ExcelAttribute
(
name
=
"公积金个人比例"
,
isFloat
=
true
,
max
=
"
100.00
"
)
private
BigDecimal
fundPersonalPer
;
private
BigDecimal
fundPersonalPer
;
/**
/**
* 公积金企业比例
* 公积金企业比例
*/
*/
@Schema
(
description
=
"公积金企业比例"
)
@Schema
(
description
=
"公积金企业比例"
)
@ExcelAttribute
(
name
=
"公积金企业比例"
,
isFloat
=
true
,
max
=
"
99.99
"
)
@ExcelAttribute
(
name
=
"公积金企业比例"
,
isFloat
=
true
,
max
=
"
100.00
"
)
private
BigDecimal
fundCompanyPer
;
private
BigDecimal
fundCompanyPer
;
/**
/**
...
@@ -439,9 +435,9 @@ public class TPreDispatchInfo extends BaseEntity {
...
@@ -439,9 +435,9 @@ public class TPreDispatchInfo extends BaseEntity {
private
String
serviceType
;
private
String
serviceType
;
/**
/**
*
养老
城市
* 城市
*/
*/
@Schema
(
description
=
"
养老
城市"
)
@Schema
(
description
=
"城市"
)
private
String
pensionAddressReduce
;
private
String
pensionAddressReduce
;
/**
/**
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPreDispatchReduceVo.java
View file @
c92d1552
...
@@ -220,16 +220,16 @@ public class TPreDispatchReduceVo {
...
@@ -220,16 +220,16 @@ public class TPreDispatchReduceVo {
* 备注说明1
* 备注说明1
*/
*/
@Schema
(
description
=
"备注说明1"
)
@Schema
(
description
=
"备注说明1"
)
@Length
(
max
=
25
5
,
message
=
"备注说明1不能超过255
个字符"
)
@Length
(
max
=
25
0
,
message
=
"备注说明1不能超过250
个字符"
)
@ExcelAttribute
(
name
=
"备注说明1"
,
maxLength
=
25
5
)
@ExcelAttribute
(
name
=
"备注说明1"
,
maxLength
=
25
0
)
private
String
remarkOne
;
private
String
remarkOne
;
/**
/**
* 备注说明2
* 备注说明2
*/
*/
@Schema
(
description
=
"备注说明2"
)
@Schema
(
description
=
"备注说明2"
)
@Length
(
max
=
25
5
,
message
=
"备注说明2不能超过255
个字符"
)
@Length
(
max
=
25
0
,
message
=
"备注说明2不能超过250
个字符"
)
@ExcelAttribute
(
name
=
"备注说明2"
,
maxLength
=
25
5
)
@ExcelAttribute
(
name
=
"备注说明2"
,
maxLength
=
25
0
)
private
String
remarkTwo
;
private
String
remarkTwo
;
/**
/**
...
@@ -244,7 +244,7 @@ public class TPreDispatchReduceVo {
...
@@ -244,7 +244,7 @@ public class TPreDispatchReduceVo {
*/
*/
@Schema
(
description
=
"养老起缴月"
)
@Schema
(
description
=
"养老起缴月"
)
@Length
(
max
=
6
,
message
=
"养老起缴月不能超过6个字符"
)
@Length
(
max
=
6
,
message
=
"养老起缴月不能超过6个字符"
)
@ExcelAttribute
(
name
=
"养老起缴月"
,
maxLength
=
6
,
isInteger
=
true
)
@ExcelAttribute
(
name
=
"养老起缴月"
,
maxLength
=
6
,
min
=
6
,
isInteger
=
true
)
private
String
pensionStart
;
private
String
pensionStart
;
/**
/**
...
@@ -259,7 +259,7 @@ public class TPreDispatchReduceVo {
...
@@ -259,7 +259,7 @@ public class TPreDispatchReduceVo {
*/
*/
@Schema
(
description
=
"医疗起缴月"
)
@Schema
(
description
=
"医疗起缴月"
)
@Length
(
max
=
6
,
message
=
"医疗起缴月不能超过6个字符"
)
@Length
(
max
=
6
,
message
=
"医疗起缴月不能超过6个字符"
)
@ExcelAttribute
(
name
=
"医疗起缴月"
,
maxLength
=
6
,
isInteger
=
true
)
@ExcelAttribute
(
name
=
"医疗起缴月"
,
maxLength
=
6
,
min
=
6
,
isInteger
=
true
)
private
String
medicalStart
;
private
String
medicalStart
;
/**
/**
...
@@ -281,7 +281,7 @@ public class TPreDispatchReduceVo {
...
@@ -281,7 +281,7 @@ public class TPreDispatchReduceVo {
*/
*/
@Schema
(
description
=
"工伤起缴月"
)
@Schema
(
description
=
"工伤起缴月"
)
@Length
(
max
=
6
,
message
=
"工伤起缴月不能超过6个字符"
)
@Length
(
max
=
6
,
message
=
"工伤起缴月不能超过6个字符"
)
@ExcelAttribute
(
name
=
"工伤起缴月"
,
maxLength
=
6
,
isInteger
=
true
)
@ExcelAttribute
(
name
=
"工伤起缴月"
,
maxLength
=
6
,
min
=
6
,
isInteger
=
true
)
private
String
injuryStart
;
private
String
injuryStart
;
/**
/**
...
@@ -296,7 +296,7 @@ public class TPreDispatchReduceVo {
...
@@ -296,7 +296,7 @@ public class TPreDispatchReduceVo {
*/
*/
@Schema
(
description
=
"生育起缴月"
)
@Schema
(
description
=
"生育起缴月"
)
@Length
(
max
=
6
,
message
=
"生育起缴月不能超过6个字符"
)
@Length
(
max
=
6
,
message
=
"生育起缴月不能超过6个字符"
)
@ExcelAttribute
(
name
=
"生育起缴月"
,
maxLength
=
6
,
isInteger
=
true
)
@ExcelAttribute
(
name
=
"生育起缴月"
,
maxLength
=
6
,
min
=
6
,
isInteger
=
true
)
private
String
birthStart
;
private
String
birthStart
;
/**
/**
...
@@ -311,7 +311,7 @@ public class TPreDispatchReduceVo {
...
@@ -311,7 +311,7 @@ public class TPreDispatchReduceVo {
*/
*/
@Schema
(
description
=
"失业起缴月"
)
@Schema
(
description
=
"失业起缴月"
)
@Length
(
max
=
6
,
message
=
"失业起缴月不能超过6个字符"
)
@Length
(
max
=
6
,
message
=
"失业起缴月不能超过6个字符"
)
@ExcelAttribute
(
name
=
"失业起缴月"
,
maxLength
=
6
,
isInteger
=
true
)
@ExcelAttribute
(
name
=
"失业起缴月"
,
maxLength
=
6
,
min
=
6
,
isInteger
=
true
)
private
String
unemploymentStart
;
private
String
unemploymentStart
;
/**
/**
...
@@ -326,21 +326,21 @@ public class TPreDispatchReduceVo {
...
@@ -326,21 +326,21 @@ public class TPreDispatchReduceVo {
*/
*/
@Schema
(
description
=
"公积金起缴月"
)
@Schema
(
description
=
"公积金起缴月"
)
@Length
(
max
=
6
,
message
=
"公积金起缴月不能超过6个字符"
)
@Length
(
max
=
6
,
message
=
"公积金起缴月不能超过6个字符"
)
@ExcelAttribute
(
name
=
"公积金起缴月"
,
maxLength
=
6
,
isInteger
=
true
)
@ExcelAttribute
(
name
=
"公积金起缴月"
,
maxLength
=
6
,
min
=
6
,
isInteger
=
true
)
private
String
fundStart
;
private
String
fundStart
;
/**
/**
* 公积金个人比例
* 公积金个人比例
*/
*/
@Schema
(
description
=
"公积金个人比例"
)
@Schema
(
description
=
"公积金个人比例"
)
@ExcelAttribute
(
name
=
"公积金个人比例"
,
isFloat
=
true
,
max
=
"
99.99
"
)
@ExcelAttribute
(
name
=
"公积金个人比例"
,
isFloat
=
true
,
max
=
"
100.00
"
)
private
BigDecimal
fundPersonalPer
;
private
BigDecimal
fundPersonalPer
;
/**
/**
* 公积金企业比例
* 公积金企业比例
*/
*/
@Schema
(
description
=
"公积金企业比例"
)
@Schema
(
description
=
"公积金企业比例"
)
@ExcelAttribute
(
name
=
"公积金企业比例"
,
isFloat
=
true
,
max
=
"
99.99
"
)
@ExcelAttribute
(
name
=
"公积金企业比例"
,
isFloat
=
true
,
max
=
"
100.00
"
)
private
BigDecimal
fundCompanyPer
;
private
BigDecimal
fundCompanyPer
;
/**
/**
...
@@ -689,8 +689,8 @@ public class TPreDispatchReduceVo {
...
@@ -689,8 +689,8 @@ public class TPreDispatchReduceVo {
* 备注
* 备注
*/
*/
@Schema
(
description
=
"备注"
)
@Schema
(
description
=
"备注"
)
@Length
(
max
=
25
5
,
message
=
"备注不能超过255
个字符"
)
@Length
(
max
=
25
0
,
message
=
"备注不能超过250
个字符"
)
@ExcelAttribute
(
name
=
"备注"
,
maxLength
=
25
5
)
@ExcelAttribute
(
name
=
"备注"
,
maxLength
=
25
0
)
private
String
remark
;
private
String
remark
;
/**
/**
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPreDispatchUpdateVo.java
View file @
c92d1552
...
@@ -174,7 +174,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
...
@@ -174,7 +174,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 养老起缴月
* 养老起缴月
*/
*/
@Length
(
max
=
6
,
message
=
"养老起缴月不能超过6个字符"
)
@Length
(
max
=
6
,
message
=
"养老起缴月不能超过6个字符"
)
@ExcelAttribute
(
name
=
"养老起缴月"
,
maxLength
=
6
,
isInteger
=
true
)
@ExcelAttribute
(
name
=
"养老起缴月"
,
maxLength
=
6
,
min
=
6
,
isInteger
=
true
)
private
String
pensionStart
;
private
String
pensionStart
;
/**
/**
* 医疗城市
* 医疗城市
...
@@ -191,7 +191,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
...
@@ -191,7 +191,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 医疗起缴月
* 医疗起缴月
*/
*/
@Length
(
max
=
6
,
message
=
"医疗起缴月不能超过6个字符"
)
@Length
(
max
=
6
,
message
=
"医疗起缴月不能超过6个字符"
)
@ExcelAttribute
(
name
=
"医疗起缴月"
,
maxLength
=
6
,
isInteger
=
true
)
@ExcelAttribute
(
name
=
"医疗起缴月"
,
maxLength
=
6
,
min
=
6
,
isInteger
=
true
)
private
String
medicalStart
;
private
String
medicalStart
;
/**
/**
* 工伤城市
* 工伤城市
...
@@ -208,7 +208,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
...
@@ -208,7 +208,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 工伤起缴月
* 工伤起缴月
*/
*/
@Length
(
max
=
6
,
message
=
"工伤起缴月不能超过6个字符"
)
@Length
(
max
=
6
,
message
=
"工伤起缴月不能超过6个字符"
)
@ExcelAttribute
(
name
=
"工伤起缴月"
,
maxLength
=
6
,
isInteger
=
true
)
@ExcelAttribute
(
name
=
"工伤起缴月"
,
maxLength
=
6
,
min
=
6
,
isInteger
=
true
)
private
String
injuryStart
;
private
String
injuryStart
;
/**
/**
* 生育城市
* 生育城市
...
@@ -225,7 +225,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
...
@@ -225,7 +225,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 生育起缴月
* 生育起缴月
*/
*/
@Length
(
max
=
6
,
message
=
"生育起缴月不能超过6个字符"
)
@Length
(
max
=
6
,
message
=
"生育起缴月不能超过6个字符"
)
@ExcelAttribute
(
name
=
"生育起缴月"
,
maxLength
=
6
,
isInteger
=
true
)
@ExcelAttribute
(
name
=
"生育起缴月"
,
maxLength
=
6
,
min
=
6
,
isInteger
=
true
)
private
String
birthStart
;
private
String
birthStart
;
/**
/**
* 失业城市
* 失业城市
...
@@ -242,7 +242,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
...
@@ -242,7 +242,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 失业起缴月
* 失业起缴月
*/
*/
@Length
(
max
=
6
,
message
=
"失业起缴月不能超过6个字符"
)
@Length
(
max
=
6
,
message
=
"失业起缴月不能超过6个字符"
)
@ExcelAttribute
(
name
=
"失业起缴月"
,
maxLength
=
6
,
isInteger
=
true
)
@ExcelAttribute
(
name
=
"失业起缴月"
,
maxLength
=
6
,
min
=
6
,
isInteger
=
true
)
private
String
unemploymentStart
;
private
String
unemploymentStart
;
/**
/**
* 公积金城市
* 公积金城市
...
@@ -259,17 +259,17 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
...
@@ -259,17 +259,17 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
* 公积金起缴月
* 公积金起缴月
*/
*/
@Length
(
max
=
6
,
message
=
"公积金起缴月不能超过6个字符"
)
@Length
(
max
=
6
,
message
=
"公积金起缴月不能超过6个字符"
)
@ExcelAttribute
(
name
=
"公积金起缴月"
,
maxLength
=
6
,
isInteger
=
true
)
@ExcelAttribute
(
name
=
"公积金起缴月"
,
maxLength
=
6
,
min
=
6
,
isInteger
=
true
)
private
String
fundStart
;
private
String
fundStart
;
/**
/**
* 公积金个人比例
* 公积金个人比例
*/
*/
@ExcelAttribute
(
name
=
"公积金个人比例"
,
isFloat
=
true
,
max
=
"
99.99
"
)
@ExcelAttribute
(
name
=
"公积金个人比例"
,
isFloat
=
true
,
max
=
"
100.00
"
)
private
BigDecimal
fundPersonalPer
;
private
BigDecimal
fundPersonalPer
;
/**
/**
* 公积金企业比例
* 公积金企业比例
*/
*/
@ExcelAttribute
(
name
=
"公积金企业比例"
,
isFloat
=
true
,
max
=
"
99.99
"
)
@ExcelAttribute
(
name
=
"公积金企业比例"
,
isFloat
=
true
,
max
=
"
100.00
"
)
private
BigDecimal
fundCompanyPer
;
private
BigDecimal
fundCompanyPer
;
/**
/**
* 派单分公司
* 派单分公司
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPreDispatchInfoController.java
View file @
c92d1552
...
@@ -251,6 +251,7 @@ public class TPreDispatchInfoController {
...
@@ -251,6 +251,7 @@ public class TPreDispatchInfoController {
return
R
.
ok
(
errorInfo
);
return
R
.
ok
(
errorInfo
);
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
R
.
failed
(
PreDispatchConstants
.
DATA_IMPORT_ANALYSIS_ERROR
);
return
R
.
failed
(
PreDispatchConstants
.
DATA_IMPORT_ANALYSIS_ERROR
);
}
}
}
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
c92d1552
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
View file @
c92d1552
...
@@ -356,6 +356,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
...
@@ -356,6 +356,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
TDispatchImportVo
importVo
=
new
TDispatchImportVo
();
TDispatchImportVo
importVo
=
new
TDispatchImportVo
();
// 初始化派增的派单数据
// 初始化派增的派单数据
initDispatchAddVo
(
preInfo
,
importVo
);
initDispatchAddVo
(
preInfo
,
importVo
);
importVo
.
setRowIndex
(
CommonConstants
.
ONE_INT
);
List
<
TDispatchImportVo
>
importVoList
=
new
ArrayList
<>();
List
<
TDispatchImportVo
>
importVoList
=
new
ArrayList
<>();
importVoList
.
add
(
importVo
);
importVoList
.
add
(
importVo
);
// 如果档案地市空 只能用缴纳地封装,如果缴纳地有问题直接返回
// 如果档案地市空 只能用缴纳地封装,如果缴纳地有问题直接返回
...
@@ -562,8 +563,8 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
...
@@ -562,8 +563,8 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
tPreDispatchInfo
.
setFundAddress
(
tPreDispatchInfo
.
getFundAddressReduce
());
tPreDispatchInfo
.
setFundAddress
(
tPreDispatchInfo
.
getFundAddressReduce
());
}
}
// 合同开始截止时间 同步更新派单的合同时间
// 合同开始截止时间 同步更新派单的合同时间
tPreDispatchInfo
.
setContractEndAdd
(
tPreDispatchInfo
.
getContractEnd
());
//
tPreDispatchInfo.setContractEndAdd(tPreDispatchInfo.getContractEnd());
tPreDispatchInfo
.
setContractStartAdd
(
tPreDispatchInfo
.
getContractStart
());
//
tPreDispatchInfo.setContractStartAdd(tPreDispatchInfo.getContractStart());
// 没问题重置异常状态,有问题 在前面就返回了
// 没问题重置异常状态,有问题 在前面就返回了
tPreDispatchInfo
.
setExceptionContent
(
CommonConstants
.
EMPTY_STRING
);
tPreDispatchInfo
.
setExceptionContent
(
CommonConstants
.
EMPTY_STRING
);
tPreDispatchInfo
.
setPreStatus
(
CommonConstants
.
ZERO_STRING
);
tPreDispatchInfo
.
setPreStatus
(
CommonConstants
.
ZERO_STRING
);
...
@@ -2358,6 +2359,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
...
@@ -2358,6 +2359,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
importVo
=
new
TDispatchImportVo
();
importVo
=
new
TDispatchImportVo
();
// 初始化派增的派单数据
// 初始化派增的派单数据
initDispatchAddVo
(
pre
,
importVo
);
initDispatchAddVo
(
pre
,
importVo
);
importVo
.
setRowIndex
(
i
);
List
<
TDispatchImportVo
>
importVoList
=
new
ArrayList
<>();
List
<
TDispatchImportVo
>
importVoList
=
new
ArrayList
<>();
importVoList
.
add
(
importVo
);
importVoList
.
add
(
importVo
);
// 如果档案地市空 只能用缴纳地封装,如果缴纳地有问题直接返回
// 如果档案地市空 只能用缴纳地封装,如果缴纳地有问题直接返回
...
...
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