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
2899b863
Commit
2899b863
authored
Oct 24, 2023
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
权限导入&派单增加学校专业及首次至缴纳地时间
parent
56f6b1fc
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
259 additions
and
27 deletions
+259
-27
TEmployeeInfo.java
...ifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
+3
-0
UpProjectSocialFundVo.java
...cloud/plus/v1/yifu/archives/vo/UpProjectSocialFundVo.java
+16
-0
TCutsomerDataPermissonServiceImpl.java
...hives/service/impl/TCutsomerDataPermissonServiceImpl.java
+7
-6
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+6
-0
TEmployeeInfoMapper.xml
...ves-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
+2
-0
TDispatchInfo.java
.../yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java
+30
-0
TSocialInfo.java
...om/yifu/cloud/plus/v1/yifu/social/entity/TSocialInfo.java
+10
-0
SocialHandleExportVo.java
...fu/cloud/plus/v1/yifu/social/vo/SocialHandleExportVo.java
+32
-0
TDispatchAuditExportVo.java
.../cloud/plus/v1/yifu/social/vo/TDispatchAuditExportVo.java
+27
-0
TDispatchImportVo.java
.../yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java
+30
-0
TDispatchInfoExportVo.java
...u/cloud/plus/v1/yifu/social/vo/TDispatchInfoExportVo.java
+28
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+13
-1
TSocialfundHouseResServiceImpl.java
...u/social/service/impl/TSocialfundHouseResServiceImpl.java
+20
-15
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+31
-4
TSocialInfoMapper.xml
...ocial-biz/src/main/resources/mapper/TSocialInfoMapper.xml
+4
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
View file @
2899b863
...
@@ -16,7 +16,9 @@
...
@@ -16,7 +16,9 @@
*/
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
entity
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
entity
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.format.DateTimeFormat
;
import
com.alibaba.excel.annotation.format.DateTimeFormat
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
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
;
...
@@ -25,6 +27,7 @@ import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
...
@@ -25,6 +27,7 @@ import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
import
org.hibernate.validator.constraints.Length
;
import
javax.validation.constraints.Max
;
import
javax.validation.constraints.Max
;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.NotNull
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/UpProjectSocialFundVo.java
View file @
2899b863
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
lombok.Data
;
import
org.hibernate.validator.constraints.Length
;
import
java.io.Serializable
;
import
java.io.Serializable
;
...
@@ -53,5 +57,17 @@ public class UpProjectSocialFundVo implements Serializable {
...
@@ -53,5 +57,17 @@ public class UpProjectSocialFundVo implements Serializable {
String
detailId
;
String
detailId
;
String
contactAddress
;
String
contactAddress
;
String
highEducation
;
String
highEducation
;
/**
* 学校
*/
@Schema
(
description
=
"学校"
)
private
String
schoolName
;
/**
* 专业
*/
@Schema
(
description
=
"专业"
)
private
String
major
;
// 是否更新学历标识
String
flag
;
String
flag
;
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TCutsomerDataPermissonServiceImpl.java
View file @
2899b863
...
@@ -185,6 +185,7 @@ public class TCutsomerDataPermissonServiceImpl extends ServiceImpl<TCutsomerData
...
@@ -185,6 +185,7 @@ public class TCutsomerDataPermissonServiceImpl extends ServiceImpl<TCutsomerData
data
.
setRowIndex
(
rowIndex
+
1
);
data
.
setRowIndex
(
rowIndex
+
1
);
ErrorMessage
errorMessage
=
util1
.
checkEntity
(
data
,
data
.
getRowIndex
());
ErrorMessage
errorMessage
=
util1
.
checkEntity
(
data
,
data
.
getRowIndex
());
if
(
Common
.
isNotNull
(
errorMessage
)){
if
(
Common
.
isNotNull
(
errorMessage
)){
errorMessage
.
setData
(
data
);
errorMessageList
.
add
(
errorMessage
);
errorMessageList
.
add
(
errorMessage
);
}
else
{
}
else
{
cachedDataList
.
add
(
data
);
cachedDataList
.
add
(
data
);
...
@@ -255,24 +256,24 @@ public class TCutsomerDataPermissonServiceImpl extends ServiceImpl<TCutsomerData
...
@@ -255,24 +256,24 @@ public class TCutsomerDataPermissonServiceImpl extends ServiceImpl<TCutsomerData
user
=
res
.
getData
();
user
=
res
.
getData
();
userMap
.
put
(
user
.
getUsername
(),
user
);
userMap
.
put
(
user
.
getUsername
(),
user
);
}
else
{
}
else
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
USER_FAIL
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
USER_FAIL
,
excel
));
continue
;
continue
;
}
}
}
}
if
(
Common
.
isEmpty
(
user
.
getDeptName
())){
if
(
Common
.
isEmpty
(
user
.
getDeptName
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"对应登录账号无部门信息,请完善后导入"
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"对应登录账号无部门信息,请完善后导入"
,
excel
));
continue
;
continue
;
}
}
// 项目信息验证
// 项目信息验证
domain
=
domainMap
.
get
(
excel
.
getSettleDomainNo
());
domain
=
domainMap
.
get
(
excel
.
getSettleDomainNo
());
if
(
Common
.
isEmpty
(
domain
)){
if
(
Common
.
isEmpty
(
domain
)){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SETTLE_DOMAIN_NOT_EXIST
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SETTLE_DOMAIN_NOT_EXIST
,
excel
));
continue
;
continue
;
}
}
// 重复校验
// 重复校验
temp
=
existMap
.
get
(
excel
.
getUserLoginName
()+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getSettleDomainNo
());
temp
=
existMap
.
get
(
excel
.
getUserLoginName
()+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getSettleDomainNo
());
if
(
Common
.
isNotNull
(
temp
)){
if
(
Common
.
isNotNull
(
temp
)){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"对应账号的权限已存在,请勿重复导入"
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"对应账号的权限已存在,请勿重复导入"
,
excel
));
continue
;
continue
;
}
else
{
}
else
{
exist
=
baseMapper
.
selectOne
(
Wrappers
.<
TCutsomerDataPermisson
>
query
().
lambda
()
exist
=
baseMapper
.
selectOne
(
Wrappers
.<
TCutsomerDataPermisson
>
query
().
lambda
()
...
@@ -280,7 +281,7 @@ public class TCutsomerDataPermissonServiceImpl extends ServiceImpl<TCutsomerData
...
@@ -280,7 +281,7 @@ public class TCutsomerDataPermissonServiceImpl extends ServiceImpl<TCutsomerData
.
eq
(
TCutsomerDataPermisson:
:
getUserLoginName
,
excel
.
getUserLoginName
())
.
eq
(
TCutsomerDataPermisson:
:
getUserLoginName
,
excel
.
getUserLoginName
())
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
exist
)){
if
(
Common
.
isNotNull
(
exist
)){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"对应账号的权限已存在,请勿重复导入"
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"对应账号的权限已存在,请勿重复导入"
,
excel
));
continue
;
continue
;
}
}
}
}
...
@@ -299,7 +300,7 @@ public class TCutsomerDataPermissonServiceImpl extends ServiceImpl<TCutsomerData
...
@@ -299,7 +300,7 @@ public class TCutsomerDataPermissonServiceImpl extends ServiceImpl<TCutsomerData
insertExcel
(
permission
);
insertExcel
(
permission
);
// 加入map 验证当前表单数据是否重复
// 加入map 验证当前表单数据是否重复
existMap
.
put
(
excel
.
getUserLoginName
()+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getSettleDomainNo
(),
excel
.
getSettleDomainNo
());
existMap
.
put
(
excel
.
getUserLoginName
()+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getSettleDomainNo
(),
excel
.
getSettleDomainNo
());
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SAVE_SUCCESS
,
CommonConstants
.
GREEN
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SAVE_SUCCESS
,
CommonConstants
.
GREEN
,
excel
));
// 清理缓存
// 清理缓存
redisUtil
.
remove
(
CacheConstants
.
WXHR_SETTLE_DOMAIN_VOS_BY_USERID
+
"_"
+
user
.
getUserId
());
redisUtil
.
remove
(
CacheConstants
.
WXHR_SETTLE_DOMAIN_VOS_BY_USERID
+
"_"
+
user
.
getUserId
());
redisUtil
.
remove
(
CacheConstants
.
WXHR_SETTLE_DOMAIN_NOS_BY_USERID
+
"_"
+
user
.
getUserId
());
redisUtil
.
remove
(
CacheConstants
.
WXHR_SETTLE_DOMAIN_NOS_BY_USERID
+
"_"
+
user
.
getUserId
());
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
2899b863
...
@@ -1418,6 +1418,12 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
...
@@ -1418,6 +1418,12 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if
(
Common
.
isNotNull
(
vo
.
getHighEducation
()))
{
if
(
Common
.
isNotNull
(
vo
.
getHighEducation
()))
{
employee
.
setHignEducation
(
vo
.
getHighEducation
());
employee
.
setHignEducation
(
vo
.
getHighEducation
());
}
}
if
(
Common
.
isNotNull
(
vo
.
getSchoolName
())){
employee
.
setSchool
(
vo
.
getSchoolName
());
}
if
(
Common
.
isNotNull
(
vo
.
getMajor
())){
employee
.
setMajor
(
vo
.
getMajor
());
}
}
}
tEmployeeInfoMapper
.
updateSocialInfoById
(
employee
);
tEmployeeInfoMapper
.
updateSocialInfoById
(
employee
);
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @
2899b863
...
@@ -1140,6 +1140,8 @@
...
@@ -1140,6 +1140,8 @@
<if
test=
"tEmployeeInfo.socialStatus != null"
>
SOCIAL_STATUS=#{tEmployeeInfo.socialStatus},
</if>
<if
test=
"tEmployeeInfo.socialStatus != null"
>
SOCIAL_STATUS=#{tEmployeeInfo.socialStatus},
</if>
<if
test=
"tEmployeeInfo.fundStatus != null"
>
FUND_STATUS=#{tEmployeeInfo.fundStatus},
</if>
<if
test=
"tEmployeeInfo.fundStatus != null"
>
FUND_STATUS=#{tEmployeeInfo.fundStatus},
</if>
<if
test=
"tEmployeeInfo.hignEducation != null"
>
HIGN_EDUCATION=#{tEmployeeInfo.hignEducation},
</if>
<if
test=
"tEmployeeInfo.hignEducation != null"
>
HIGN_EDUCATION=#{tEmployeeInfo.hignEducation},
</if>
<if
test=
"tEmployeeInfo.school != null"
>
SCHOOL=#{tEmployeeInfo.school},
</if>
<if
test=
"tEmployeeInfo.major != null"
>
MAJOR=#{tEmployeeInfo.major},
</if>
<if
test=
"tEmployeeInfo.contactAddress != null"
>
CONTACT_ADDRESS=#{tEmployeeInfo.contactAddress},
</if>
<if
test=
"tEmployeeInfo.contactAddress != null"
>
CONTACT_ADDRESS=#{tEmployeeInfo.contactAddress},
</if>
<if
test=
"tEmployeeInfo.isCollege != null"
>
IS_COLLEGE='1',
</if>
<if
test=
"tEmployeeInfo.isCollege != null"
>
IS_COLLEGE='1',
</if>
<if
test=
"tEmployeeInfo.fileProvince != null"
>
a.FILE_PROVINCE=#{tEmployeeInfo.fileProvince},
</if>
<if
test=
"tEmployeeInfo.fileProvince != null"
>
a.FILE_PROVINCE=#{tEmployeeInfo.fileProvince},
</if>
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java
View file @
2899b863
...
@@ -626,6 +626,36 @@ public class TDispatchInfo extends BaseEntity {
...
@@ -626,6 +626,36 @@ public class TDispatchInfo extends BaseEntity {
@Schema
(
description
=
"学历"
,
name
=
"contractName"
)
@Schema
(
description
=
"学历"
,
name
=
"contractName"
)
private
String
educationName
;
private
String
educationName
;
/**
* 学校
*/
@ExcelAttribute
(
name
=
"学校"
,
isNotEmpty
=
false
)
@Length
(
max
=
50
,
message
=
"学校不能超过50个字符"
)
@Schema
(
description
=
"学校:派增只做记录"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"学校"
)
private
String
schoolName
;
/**
* 专业
*/
@ExcelAttribute
(
name
=
"专业"
,
isNotEmpty
=
false
)
@Length
(
max
=
50
,
message
=
"学校不能超过50个字符"
)
@Schema
(
description
=
"专业:派增只做记录"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"专业"
)
private
String
major
;
/**
* 首次至缴纳地时间
*/
@ExcelAttribute
(
name
=
"首次至缴纳地时间"
,
isNotEmpty
=
false
,
isDate
=
true
)
@Length
(
max
=
50
,
message
=
"学校不能超过50个字符"
)
@Schema
(
description
=
"首次至缴纳地时间"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"首次至缴纳地时间"
)
private
Date
firstPayTime
;
/**
/**
* 试用期(单位月)
* 试用期(单位月)
*/
*/
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialInfo.java
View file @
2899b863
...
@@ -955,4 +955,14 @@ public class TSocialInfo extends BaseEntity {
...
@@ -955,4 +955,14 @@ public class TSocialInfo extends BaseEntity {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"个人社保合计"
)
@ExcelProperty
(
"个人社保合计"
)
private
BigDecimal
personalSocialSum
;
private
BigDecimal
personalSocialSum
;
/**
* 首次至缴纳地时间
*/
@ExcelAttribute
(
name
=
"首次至缴纳地时间"
,
isNotEmpty
=
false
,
isDate
=
true
)
@Length
(
max
=
50
,
message
=
"学校不能超过50个字符"
)
@Schema
(
description
=
"首次至缴纳地时间"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"首次至缴纳地时间"
)
private
Date
firstPayTime
;
}
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialHandleExportVo.java
View file @
2899b863
...
@@ -4,13 +4,16 @@ import com.alibaba.excel.annotation.ExcelProperty;
...
@@ -4,13 +4,16 @@ import com.alibaba.excel.annotation.ExcelProperty;
import
com.alibaba.excel.annotation.format.DateTimeFormat
;
import
com.alibaba.excel.annotation.format.DateTimeFormat
;
import
com.alibaba.excel.annotation.write.style.ContentStyle
;
import
com.alibaba.excel.annotation.write.style.ContentStyle
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
import
com.alibaba.excel.annotation.write.style.HeadFontStyle
;
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.common.core.constant.ExcelAttributeConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
lombok.Data
;
import
org.hibernate.validator.constraints.Length
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.Date
;
/**
/**
* @Author fxj
* @Author fxj
...
@@ -435,4 +438,33 @@ public class SocialHandleExportVo implements Serializable {
...
@@ -435,4 +438,33 @@ public class SocialHandleExportVo implements Serializable {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"是否已导出"
)
@ExcelProperty
(
"是否已导出"
)
private
String
exportSocialFlag
;
private
String
exportSocialFlag
;
/**
* 学校
*/
@ExcelAttribute
(
name
=
"学校"
,
isNotEmpty
=
false
)
@Schema
(
description
=
"学校:派增只做记录"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"学校"
)
private
String
schoolName
;
/**
* 专业
*/
@ExcelAttribute
(
name
=
"专业"
,
isNotEmpty
=
false
)
@Length
(
max
=
50
,
message
=
"学校不能超过50个字符"
)
@Schema
(
description
=
"专业:派增只做记录"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"专业"
)
private
String
major
;
/**
* 首次至缴纳地时间
*/
@DateTimeFormat
(
"yyyy-MM-dd"
)
@ExcelAttribute
(
name
=
"首次至缴纳地时间"
,
isNotEmpty
=
false
,
isDate
=
true
)
@Schema
(
description
=
"首次至缴纳地时间"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"首次至缴纳地时间"
)
private
Date
firstPayTime
;
}
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchAuditExportVo.java
View file @
2899b863
...
@@ -350,5 +350,32 @@ public class TDispatchAuditExportVo {
...
@@ -350,5 +350,32 @@ public class TDispatchAuditExportVo {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"个人公积金缴纳比例"
)
@ExcelProperty
(
"个人公积金缴纳比例"
)
private
BigDecimal
personalProvidentPer
;
private
BigDecimal
personalProvidentPer
;
/**
* 学校
*/
@ExcelAttribute
(
name
=
"学校"
,
isNotEmpty
=
false
)
@Schema
(
description
=
"学校:派增只做记录"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"学校"
)
private
String
schoolName
;
/**
* 专业
*/
@ExcelAttribute
(
name
=
"专业"
,
isNotEmpty
=
false
)
@Length
(
max
=
50
,
message
=
"学校不能超过50个字符"
)
@Schema
(
description
=
"专业:派增只做记录"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"专业"
)
private
String
major
;
/**
* 首次至缴纳地时间
*/
@DateTimeFormat
(
"yyyy-MM-dd"
)
@ExcelAttribute
(
name
=
"首次至缴纳地时间"
,
isNotEmpty
=
false
,
isDate
=
true
)
@Schema
(
description
=
"首次至缴纳地时间"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"首次至缴纳地时间"
)
private
Date
firstPayTime
;
}
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchImportVo.java
View file @
2899b863
...
@@ -280,6 +280,36 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
...
@@ -280,6 +280,36 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
@ExcelProperty
(
value
=
"学历"
)
@ExcelProperty
(
value
=
"学历"
)
private
String
educationName
;
private
String
educationName
;
/**
* 学校
*/
@ExcelAttribute
(
name
=
"学校"
,
isNotEmpty
=
false
)
@Length
(
max
=
50
,
message
=
"学校不能超过50个字符"
)
@Schema
(
description
=
"学校:派增只做记录"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"学校"
)
private
String
schoolName
;
/**
* 专业
*/
@ExcelAttribute
(
name
=
"专业"
,
isNotEmpty
=
false
)
@Length
(
max
=
50
,
message
=
"学校不能超过50个字符"
)
@Schema
(
description
=
"专业:派增只做记录"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"专业"
)
private
String
major
;
/**
* 首次至缴纳地时间
*/
@ExcelAttribute
(
name
=
"首次至缴纳地时间"
,
isNotEmpty
=
false
,
isDate
=
true
)
@Length
(
max
=
50
,
message
=
"学校不能超过50个字符"
)
@Schema
(
description
=
"首次至缴纳地时间"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"首次至缴纳地时间"
)
private
Date
firstPayTime
;
/**
/**
* 备案基数
* 备案基数
*/
*/
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoExportVo.java
View file @
2899b863
...
@@ -476,4 +476,32 @@ public class TDispatchInfoExportVo {
...
@@ -476,4 +476,32 @@ public class TDispatchInfoExportVo {
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"公积金办理备注"
)
@ExcelProperty
(
"公积金办理备注"
)
private
String
fundHandleRemark
;
private
String
fundHandleRemark
;
/**
* 学校
*/
@ExcelAttribute
(
name
=
"学校"
,
isNotEmpty
=
false
)
@Schema
(
description
=
"学校:派增只做记录"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"学校"
)
private
String
schoolName
;
/**
* 专业
*/
@ExcelAttribute
(
name
=
"专业"
,
isNotEmpty
=
false
)
@Schema
(
description
=
"专业:派增只做记录"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"专业"
)
private
String
major
;
/**
* 首次至缴纳地时间
*/
@DateTimeFormat
(
"yyyy-MM-dd"
)
@ExcelAttribute
(
name
=
"首次至缴纳地时间"
,
isNotEmpty
=
false
,
isDate
=
true
)
@Schema
(
description
=
"首次至缴纳地时间"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
value
=
"首次至缴纳地时间"
)
private
Date
firstPayTime
;
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
2899b863
...
@@ -738,7 +738,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -738,7 +738,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
Common
.
isNotNull
(
socialFund
)
&&
Common
.
isNotNull
(
socialFund
.
getId
())){
if
(
Common
.
isNotNull
(
socialFund
)
&&
Common
.
isNotNull
(
socialFund
.
getId
())){
forecastLibraryService
.
updateForecastLibaryByDispatch
(
null
,
null
,
socialFund
);
forecastLibraryService
.
updateForecastLibaryByDispatch
(
null
,
null
,
socialFund
);
}
}
// 同步更新人员档案和项目档案的社保公积金状态
// 同步更新人员档案和项目档案的社保公积金状态
学历信息
updateDocSocialFund
(
social
,
fund
,
socialFund
,
empVoMap
,
excel
);
updateDocSocialFund
(
social
,
fund
,
socialFund
,
empVoMap
,
excel
);
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SAVE_SUCCESS
,
CommonConstants
.
GREEN
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SAVE_SUCCESS
,
CommonConstants
.
GREEN
));
...
@@ -848,6 +848,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -848,6 +848,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
else
{
else
{
vo
.
setHighEducation
(
""
);
vo
.
setHighEducation
(
""
);
}
}
if
(
Common
.
isNotNull
(
excel
.
getSchoolName
())){
vo
.
setSchoolName
(
excel
.
getSchoolName
());
}
if
(
Common
.
isNotNull
(
excel
.
getMajor
())){
vo
.
setMajor
(
excel
.
getMajor
());
}
}
}
}
}
}
}
...
@@ -1320,6 +1326,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1320,6 +1326,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dispatch
.
setBelongUnit
(
excel
.
getCustomerId
());
dispatch
.
setBelongUnit
(
excel
.
getCustomerId
());
dispatch
.
setBelongUnitName
(
excel
.
getCustomerName
());
dispatch
.
setBelongUnitName
(
excel
.
getCustomerName
());
dispatch
.
setEducationName
(
excel
.
getEducationName
());
dispatch
.
setEducationName
(
excel
.
getEducationName
());
dispatch
.
setSchoolName
(
excel
.
getSchoolName
());
dispatch
.
setMajor
(
excel
.
getMajor
());
dispatch
.
setFirstPayTime
(
excel
.
getFirstPayTime
());
dispatch
.
setIdCardProvince
(
excel
.
getIdCardProvince
());
dispatch
.
setIdCardProvince
(
excel
.
getIdCardProvince
());
dispatch
.
setIdCardCity
(
excel
.
getIdCardCity
());
dispatch
.
setIdCardCity
(
excel
.
getIdCardCity
());
dispatch
.
setIdCardTown
(
excel
.
getIdCardTown
());
dispatch
.
setIdCardTown
(
excel
.
getIdCardTown
());
...
@@ -1598,6 +1607,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -1598,6 +1607,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
social
.
setHandleStatus
(
CommonConstants
.
ZERO_STRING
);
social
.
setHandleStatus
(
CommonConstants
.
ZERO_STRING
);
social
.
setDeleteFlag
(
CommonConstants
.
ZERO_STRING
);
social
.
setDeleteFlag
(
CommonConstants
.
ZERO_STRING
);
social
.
setTrustRemark
(
excel
.
getTrustRemark
());
social
.
setTrustRemark
(
excel
.
getTrustRemark
());
social
.
setFirstPayTime
(
excel
.
getFirstPayTime
());
List
<
Date
>
lstDate
=
new
ArrayList
<>();
List
<
Date
>
lstDate
=
new
ArrayList
<>();
if
(
Common
.
isNotNull
(
excel
.
getPensionStart
()))
{
if
(
Common
.
isNotNull
(
excel
.
getPensionStart
()))
{
lstDate
.
add
(
excel
.
getPensionStart
());
lstDate
.
add
(
excel
.
getPensionStart
());
...
@@ -2125,6 +2135,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -2125,6 +2135,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
emp
.
setEmpPhone
(
excel
.
getEmpMobile
());
emp
.
setEmpPhone
(
excel
.
getEmpMobile
());
emp
.
setEmpRegisType
(
excel
.
getEmpRegisType
());
emp
.
setEmpRegisType
(
excel
.
getEmpRegisType
());
emp
.
setHignEducation
(
excel
.
getEducationName
());
emp
.
setHignEducation
(
excel
.
getEducationName
());
emp
.
setMajor
(
excel
.
getMajor
());
emp
.
setSchool
(
excel
.
getSchoolName
());
emp
.
setContractStatus
(
CommonConstants
.
ZERO_INT
);
emp
.
setContractStatus
(
CommonConstants
.
ZERO_INT
);
emp
.
setDeleteFlag
(
CommonConstants
.
ZERO_STRING
);
emp
.
setDeleteFlag
(
CommonConstants
.
ZERO_STRING
);
emp
.
setFileSource
(
CommonConstants
.
ONE_STRING
);
emp
.
setFileSource
(
CommonConstants
.
ONE_STRING
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialfundHouseResServiceImpl.java
View file @
2899b863
...
@@ -216,6 +216,7 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
...
@@ -216,6 +216,7 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
data
.
setRowIndex
(
rowIndex
+
1
);
data
.
setRowIndex
(
rowIndex
+
1
);
ErrorMessage
errorMessage
=
util1
.
checkEntity
(
data
,
data
.
getRowIndex
());
ErrorMessage
errorMessage
=
util1
.
checkEntity
(
data
,
data
.
getRowIndex
());
if
(
Common
.
isNotNull
(
errorMessage
)){
if
(
Common
.
isNotNull
(
errorMessage
)){
errorMessage
.
setData
(
data
);
errorMessageList
.
add
(
errorMessage
);
errorMessageList
.
add
(
errorMessage
);
}
else
{
}
else
{
cachedDataList
.
add
(
data
);
cachedDataList
.
add
(
data
);
...
@@ -276,26 +277,26 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
...
@@ -276,26 +277,26 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
user
=
res
.
getData
();
user
=
res
.
getData
();
userMap
.
put
(
user
.
getUsername
(),
user
);
userMap
.
put
(
user
.
getUsername
(),
user
);
}
else
{
}
else
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"无有效状态的用户信息!"
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"无有效状态的用户信息!"
,
excel
));
continue
;
continue
;
}
}
}
}
if
(
Common
.
isEmpty
(
user
.
getDeptName
())){
if
(
Common
.
isEmpty
(
user
.
getDeptName
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"对应登录账号无部门信息,请完善后导入"
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"对应登录账号无部门信息,请完善后导入"
,
excel
));
continue
;
continue
;
}
}
// 户验证
// 户验证
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
excel
.
getType
())){
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
excel
.
getType
())){
baseSet
=
socialBaseSetMap
.
get
(
excel
.
getHouseHold
());
baseSet
=
socialBaseSetMap
.
get
(
excel
.
getHouseHold
());
if
(
Common
.
isEmpty
(
baseSet
)){
if
(
Common
.
isEmpty
(
baseSet
)){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"未找到对应社保户数据!"
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"未找到对应社保户数据!"
,
excel
));
continue
;
continue
;
}
}
}
}
if
(
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getType
())){
if
(
CommonConstants
.
ONE_STRING
.
equals
(
excel
.
getType
())){
baseSet
=
fundBaseSetMap
.
get
(
excel
.
getHouseHold
());
baseSet
=
fundBaseSetMap
.
get
(
excel
.
getHouseHold
());
if
(
Common
.
isEmpty
(
baseSet
)){
if
(
Common
.
isEmpty
(
baseSet
)){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"未找到对应公积金户数据!"
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"未找到对应公积金户数据!"
,
excel
));
continue
;
continue
;
}
}
}
}
...
@@ -304,16 +305,17 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
...
@@ -304,16 +305,17 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
+
CommonConstants
.
DOWN_LINE_STRING
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getHouseHold
());
+
excel
.
getHouseHold
());
if
(
Common
.
isNotNull
(
temp
)){
if
(
Common
.
isNotNull
(
temp
)){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"对应账号的权限已存在,请勿重复导入"
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"对应账号的权限已存在,请勿重复导入"
,
excel
));
continue
;
continue
;
}
else
{
}
else
{
exist
=
baseMapper
.
selectOne
(
Wrappers
.<
TSocialfundHouseRes
>
query
().
lambda
()
exist
=
baseMapper
.
selectOne
(
Wrappers
.<
TSocialfundHouseRes
>
query
().
lambda
()
.
eq
(
TSocialfundHouseRes:
:
getFundHousehold
,
excel
.
getHouseHold
())
.
eq
(
TSocialfundHouseRes:
:
getFundHousehold
,
excel
.
getHouseHold
())
.
eq
(
TSocialfundHouseRes:
:
getHouseNameType
,
excel
.
getType
())
.
eq
(
TSocialfundHouseRes:
:
getHouseNameType
,
excel
.
getType
())
.
eq
(
TSocialfundHouseRes:
:
getUserId
,
user
.
getUserId
())
.
eq
(
TSocialfundHouseRes:
:
getUserId
,
user
.
getUserId
())
.
eq
(
TSocialfundHouseRes:
:
getAuthType
,
CommonConstants
.
ZERO_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
exist
)){
if
(
Common
.
isNotNull
(
exist
)){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"对应账号的权限已存在,请勿重复导入"
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"对应账号的权限已存在,请勿重复导入"
,
excel
));
continue
;
continue
;
}
}
}
}
...
@@ -333,7 +335,7 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
...
@@ -333,7 +335,7 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
existMap
.
put
(
excel
.
getUserLoginName
()
existMap
.
put
(
excel
.
getUserLoginName
()
+
CommonConstants
.
DOWN_LINE_STRING
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getHouseHold
(),
excel
.
getHouseHold
());
+
excel
.
getHouseHold
(),
excel
.
getHouseHold
());
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SAVE_SUCCESS
,
CommonConstants
.
GREEN
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SAVE_SUCCESS
,
CommonConstants
.
GREEN
,
excel
));
}
}
}
}
/**
/**
...
@@ -371,7 +373,7 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
...
@@ -371,7 +373,7 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
ExcelUtil
<
SocialAuthHandleImportVo
>
util1
=
new
ExcelUtil
<>(
SocialAuthHandleImportVo
.
class
);
ExcelUtil
<
SocialAuthHandleImportVo
>
util1
=
new
ExcelUtil
<>(
SocialAuthHandleImportVo
.
class
);
Map
<
String
,
SysBaseSetInfo
>
baseSetInfoMap
=
new
HashMap
<>();
Map
<
String
,
SysBaseSetInfo
>
baseSetInfoMap
=
new
HashMap
<>();
List
<
SysBaseSetInfo
>
setInfos
=
baseSetInfoService
.
list
(
Wrappers
.<
SysBaseSetInfo
>
query
().
lambda
()
List
<
SysBaseSetInfo
>
setInfos
=
baseSetInfoService
.
list
(
Wrappers
.<
SysBaseSetInfo
>
query
().
lambda
()
.
eq
(
SysBaseSetInfo:
:
getBaseType
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
SysBaseSetInfo:
:
getBaseType
,
type
)
.
eq
(
SysBaseSetInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
SysBaseSetInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
groupBy
(
SysBaseSetInfo:
:
getDepartName
,
SysBaseSetInfo:
:
getProvince
,
SysBaseSetInfo:
:
getCity
,
SysBaseSetInfo:
:
getTown
));
.
groupBy
(
SysBaseSetInfo:
:
getDepartName
,
SysBaseSetInfo:
:
getProvince
,
SysBaseSetInfo:
:
getCity
,
SysBaseSetInfo:
:
getTown
));
if
(
Common
.
isNotNull
(
setInfos
)){
if
(
Common
.
isNotNull
(
setInfos
)){
...
@@ -404,6 +406,7 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
...
@@ -404,6 +406,7 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
data
.
setRowIndex
(
rowIndex
+
1
);
data
.
setRowIndex
(
rowIndex
+
1
);
ErrorMessage
errorMessage
=
util1
.
checkEntity
(
data
,
data
.
getRowIndex
());
ErrorMessage
errorMessage
=
util1
.
checkEntity
(
data
,
data
.
getRowIndex
());
if
(
Common
.
isNotNull
(
errorMessage
)){
if
(
Common
.
isNotNull
(
errorMessage
)){
errorMessage
.
setData
(
data
);
errorMessageList
.
add
(
errorMessage
);
errorMessageList
.
add
(
errorMessage
);
}
else
{
}
else
{
cachedDataList
.
add
(
data
);
cachedDataList
.
add
(
data
);
...
@@ -462,26 +465,26 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
...
@@ -462,26 +465,26 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
user
=
res
.
getData
();
user
=
res
.
getData
();
userMap
.
put
(
user
.
getUsername
(),
user
);
userMap
.
put
(
user
.
getUsername
(),
user
);
}
else
{
}
else
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"无有效状态的用户信息!"
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"无有效状态的用户信息!"
,
excel
));
continue
;
continue
;
}
}
}
}
if
(
Common
.
isEmpty
(
user
.
getDeptName
())){
if
(
Common
.
isEmpty
(
user
.
getDeptName
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"对应登录账号无部门信息,请完善后导入"
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"对应登录账号无部门信息,请完善后导入"
,
excel
));
continue
;
continue
;
}
}
// 户验证
// 户验证
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
type
)){
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
type
)){
baseSet
=
baseSetInfoMap
.
get
(
excel
.
getHouseHold
());
baseSet
=
baseSetInfoMap
.
get
(
excel
.
getHouseHold
());
if
(
Common
.
isEmpty
(
baseSet
)){
if
(
Common
.
isEmpty
(
baseSet
)){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"未找到对应社保户数据!"
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"未找到对应社保户数据!"
,
excel
));
continue
;
continue
;
}
}
}
}
if
(
CommonConstants
.
ONE_STRING
.
equals
(
type
)){
if
(
CommonConstants
.
ONE_STRING
.
equals
(
type
)){
baseSet
=
baseSetInfoMap
.
get
(
excel
.
getHouseHold
());
baseSet
=
baseSetInfoMap
.
get
(
excel
.
getHouseHold
());
if
(
Common
.
isEmpty
(
baseSet
)){
if
(
Common
.
isEmpty
(
baseSet
)){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"未找到对应公积金户数据!"
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"未找到对应公积金户数据!"
,
excel
));
continue
;
continue
;
}
}
}
}
...
@@ -490,7 +493,7 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
...
@@ -490,7 +493,7 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
+
CommonConstants
.
DOWN_LINE_STRING
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getHouseHold
());
+
excel
.
getHouseHold
());
if
(
Common
.
isNotNull
(
temp
)){
if
(
Common
.
isNotNull
(
temp
)){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"对应账号的权限已存在,请勿重复导入"
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"对应账号的权限已存在,请勿重复导入"
,
excel
));
continue
;
continue
;
}
else
{
}
else
{
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
type
)){
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
type
)){
...
@@ -498,16 +501,18 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
...
@@ -498,16 +501,18 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
.
eq
(
TSocialfundHouseRes:
:
getSocialHousehold
,
excel
.
getHouseHold
())
.
eq
(
TSocialfundHouseRes:
:
getSocialHousehold
,
excel
.
getHouseHold
())
.
eq
(
TSocialfundHouseRes:
:
getUserId
,
user
.
getUserId
())
.
eq
(
TSocialfundHouseRes:
:
getUserId
,
user
.
getUserId
())
.
eq
(
TSocialfundHouseRes:
:
getHouseNameType
,
type
)
.
eq
(
TSocialfundHouseRes:
:
getHouseNameType
,
type
)
.
eq
(
TSocialfundHouseRes:
:
getAuthType
,
CommonConstants
.
ONE_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
else
{
}
else
{
exist
=
baseMapper
.
selectOne
(
Wrappers
.<
TSocialfundHouseRes
>
query
().
lambda
()
exist
=
baseMapper
.
selectOne
(
Wrappers
.<
TSocialfundHouseRes
>
query
().
lambda
()
.
eq
(
TSocialfundHouseRes:
:
getFundHousehold
,
excel
.
getHouseHold
())
.
eq
(
TSocialfundHouseRes:
:
getFundHousehold
,
excel
.
getHouseHold
())
.
eq
(
TSocialfundHouseRes:
:
getUserId
,
user
.
getUserId
())
.
eq
(
TSocialfundHouseRes:
:
getUserId
,
user
.
getUserId
())
.
eq
(
TSocialfundHouseRes:
:
getHouseNameType
,
type
)
.
eq
(
TSocialfundHouseRes:
:
getHouseNameType
,
type
)
.
eq
(
TSocialfundHouseRes:
:
getAuthType
,
CommonConstants
.
ONE_STRING
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
}
}
if
(
Common
.
isNotNull
(
exist
)){
if
(
Common
.
isNotNull
(
exist
)){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"对应账号的权限已存在,请勿重复导入"
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
"对应账号的权限已存在,请勿重复导入"
,
excel
));
continue
;
continue
;
}
}
}
}
...
@@ -527,7 +532,7 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
...
@@ -527,7 +532,7 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
existMap
.
put
(
excel
.
getUserLoginName
()
existMap
.
put
(
excel
.
getUserLoginName
()
+
CommonConstants
.
DOWN_LINE_STRING
+
CommonConstants
.
DOWN_LINE_STRING
+
excel
.
getHouseHold
(),
excel
.
getUserLoginName
());
+
excel
.
getHouseHold
(),
excel
.
getUserLoginName
());
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SAVE_SUCCESS
,
CommonConstants
.
GREEN
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SAVE_SUCCESS
,
CommonConstants
.
GREEN
,
excel
));
}
}
}
}
}
}
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
2899b863
...
@@ -99,6 +99,10 @@
...
@@ -99,6 +99,10 @@
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"orderId"
column=
"ORDER_ID"
/>
<result
property=
"orderId"
column=
"ORDER_ID"
/>
<result
property=
"schoolName"
column=
"SCHOOL_NAME"
/>
<result
property=
"major"
column=
"MAJOR"
/>
<result
property=
"firstPayTime"
column=
"FIRST_PAY_TIME"
/>
</resultMap>
</resultMap>
<resultMap
id=
"dispatchPageMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPageVo"
extends=
"tDispatchInfoMap"
>
<resultMap
id=
"dispatchPageMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPageVo"
extends=
"tDispatchInfoMap"
>
<result
property=
"providentHouseholdName"
column=
"PROVIDENT_HOUSEHOLD_NAME"
/>
<result
property=
"providentHouseholdName"
column=
"PROVIDENT_HOUSEHOLD_NAME"
/>
...
@@ -163,6 +167,10 @@
...
@@ -163,6 +167,10 @@
<result
property=
"unitWorkInjuryCardinal"
column=
"UNIT_WORK_INJURY_CARDINAL"
/>
<result
property=
"unitWorkInjuryCardinal"
column=
"UNIT_WORK_INJURY_CARDINAL"
/>
<result
property=
"unitBirthCardinal"
column=
"UNIT_BIRTH_CARDINAL"
/>
<result
property=
"unitBirthCardinal"
column=
"UNIT_BIRTH_CARDINAL"
/>
<result
property=
"empMobile"
column=
"EMP_MOBILE"
/>
<result
property=
"empMobile"
column=
"EMP_MOBILE"
/>
<result
property=
"schoolName"
column=
"SCHOOL_NAME"
/>
<result
property=
"major"
column=
"MAJOR"
/>
<result
property=
"firstPayTime"
column=
"FIRST_PAY_TIME"
/>
</resultMap>
</resultMap>
<resultMap
id=
"fundSupplementaryMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.FundSupplementaryExportVo"
>
<resultMap
id=
"fundSupplementaryMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.FundSupplementaryExportVo"
>
...
@@ -327,6 +335,10 @@
...
@@ -327,6 +335,10 @@
<result
property=
"personalProvidentCardinal"
column=
"PERSONAL_PROVIDENT_CARDINAL"
/>
<result
property=
"personalProvidentCardinal"
column=
"PERSONAL_PROVIDENT_CARDINAL"
/>
<result
property=
"unitProvidentPer"
column=
"UNIT_PROVIDENT_PER"
/>
<result
property=
"unitProvidentPer"
column=
"UNIT_PROVIDENT_PER"
/>
<result
property=
"personalProvidentPer"
column=
"PERSONAL_PROVIDENT_PER"
/>
<result
property=
"personalProvidentPer"
column=
"PERSONAL_PROVIDENT_PER"
/>
<result
property=
"schoolName"
column=
"SCHOOL_NAME"
/>
<result
property=
"major"
column=
"MAJOR"
/>
<result
property=
"firstPayTime"
column=
"FIRST_PAY_TIME"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
...
@@ -403,7 +415,10 @@
...
@@ -403,7 +415,10 @@
a.ID_CARD_TOWN,
a.ID_CARD_TOWN,
a.ID_CARD_ADDRESS,
a.ID_CARD_ADDRESS,
a.APPLY_NO,
a.APPLY_NO,
a.ORDER_ID
a.ORDER_ID,
a.SCHOOL_NAME,
a.MAJOR,
a.FIRST_PAY_TIME
</sql>
</sql>
<sql
id=
"tDispatchInfo_where"
>
<sql
id=
"tDispatchInfo_where"
>
<if
test=
"tDispatchInfo != null"
>
<if
test=
"tDispatchInfo != null"
>
...
@@ -934,7 +949,10 @@
...
@@ -934,7 +949,10 @@
c.PROVIDENT_HOUSEHOLD_NAME,
c.PROVIDENT_HOUSEHOLD_NAME,
c.UNIT_PROVIDENG_CARDINAL,
c.UNIT_PROVIDENG_CARDINAL,
c.UNIT_PROVIDENT_PER,
c.UNIT_PROVIDENT_PER,
a.EMP_MOBILE
a.EMP_MOBILE,
a.SCHOOL_NAME,
a.MAJOR,
a.FIRST_PAY_TIME
from t_dispatch_info a
from t_dispatch_info a
left join t_social_info s on s.id=a.SOCIAL_ID
left join t_social_info s on s.id=a.SOCIAL_ID
...
@@ -991,7 +1009,10 @@
...
@@ -991,7 +1009,10 @@
c.PROVIDENT_START,
c.PROVIDENT_START,
c.PERSONAL_PROVIDENT_CARDINAL,
c.PERSONAL_PROVIDENT_CARDINAL,
c.UNIT_PROVIDENT_PER,
c.UNIT_PROVIDENT_PER,
c.PERSONAL_PROVIDENT_PER
c.PERSONAL_PROVIDENT_PER,
a.SCHOOL_NAME,
a.MAJOR,
a.FIRST_PAY_TIME
from t_dispatch_info a
from t_dispatch_info a
left join t_social_info b on a.SOCIAL_ID = b.ID
left join t_social_info b on a.SOCIAL_ID = b.ID
left join t_provident_fund c on a.FUND_ID = C.ID
left join t_provident_fund c on a.FUND_ID = C.ID
...
@@ -1075,6 +1096,9 @@
...
@@ -1075,6 +1096,9 @@
<result
property=
"birthStart"
column=
"BIRTH_START"
/>
<result
property=
"birthStart"
column=
"BIRTH_START"
/>
<result
property=
"bigailmentStart"
column=
"BIGAILMENT_START"
/>
<result
property=
"bigailmentStart"
column=
"BIGAILMENT_START"
/>
<result
property=
"exportSocialFlag"
column=
"EXPORT_SOCIAL_FLAG"
/>
<result
property=
"exportSocialFlag"
column=
"EXPORT_SOCIAL_FLAG"
/>
<result
property=
"schoolName"
column=
"SCHOOL_NAME"
/>
<result
property=
"major"
column=
"MAJOR"
/>
<result
property=
"firstPayTime"
column=
"FIRST_PAY_TIME"
/>
</resultMap>
</resultMap>
<resultMap
id=
"fundHandleMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.FundHandleExportVo"
>
<resultMap
id=
"fundHandleMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.FundHandleExportVo"
>
...
@@ -1160,7 +1184,10 @@
...
@@ -1160,7 +1184,10 @@
s.PERSONAL_BIGAILMENT_MONEY,
s.PERSONAL_BIGAILMENT_MONEY,
a.TRUST_REMARK,
a.TRUST_REMARK,
a.REDUCE_REASON,
a.REDUCE_REASON,
'1' as EXPORT_SOCIAL_FLAG
'1' as EXPORT_SOCIAL_FLAG,
a.SCHOOL_NAME,
a.MAJOR,
a.FIRST_PAY_TIME
FROM t_dispatch_info a
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
left join t_social_info s on a.SOCIAL_ID = s.id
<include
refid=
"where_getSocialRecordRoster"
/>
<include
refid=
"where_getSocialRecordRoster"
/>
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialInfoMapper.xml
View file @
2899b863
...
@@ -134,6 +134,8 @@
...
@@ -134,6 +134,8 @@
<result
property=
"upperLimit"
column=
"UPPER_LIMIT"
/>
<result
property=
"upperLimit"
column=
"UPPER_LIMIT"
/>
<result
property=
"unitSocialSum"
column=
"UNIT_SOCIAL_SUM"
/>
<result
property=
"unitSocialSum"
column=
"UNIT_SOCIAL_SUM"
/>
<result
property=
"personalSocialSum"
column=
"PERSONAL_SOCIAL_SUM"
/>
<result
property=
"personalSocialSum"
column=
"PERSONAL_SOCIAL_SUM"
/>
<result
property=
"firstPayTime"
column=
"FIRST_PAY_TIME"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
a.ID,
a.ID,
...
@@ -236,7 +238,8 @@
...
@@ -236,7 +238,8 @@
a.UPDATE_TIME,
a.UPDATE_TIME,
a.PAY_POLICY,
a.PAY_POLICY,
a.LOWER_LIMIT,
a.LOWER_LIMIT,
a.UPPER_LIMIT,a.UNIT_SOCIAL_SUM,a.PERSONAL_SOCIAL_SUM
a.UPPER_LIMIT,a.UNIT_SOCIAL_SUM,a.PERSONAL_SOCIAL_SUM,
a.FIRST_PAY_TIME
</sql>
</sql>
<sql
id=
"tSocialInfo_where"
>
<sql
id=
"tSocialInfo_where"
>
<if
test=
"tSocialInfo != null"
>
<if
test=
"tSocialInfo != 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