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
5530b3fd
Commit
5530b3fd
authored
Sep 25, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.15' into MVP1.7.15
parents
9b6eafeb
c7041602
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
114 additions
and
47 deletions
+114
-47
ChecksUtil.java
...n/java/com/yifu/cloud/plus/v1/check/utils/ChecksUtil.java
+1
-0
TSocialHouseholdExportVo.java
...loud/plus/v1/yifu/social/vo/TSocialHouseholdExportVo.java
+8
-0
TSocialHouseholdUpdateVo.java
...loud/plus/v1/yifu/social/vo/TSocialHouseholdUpdateVo.java
+3
-3
HouseConfigConstants.java
...d/plus/v1/yifu/social/constants/HouseConfigConstants.java
+2
-0
SysHouseHoldInfoServiceImpl.java
...yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
+93
-38
SysHouseHoldInfoMapper.xml
...-biz/src/main/resources/mapper/SysHouseHoldInfoMapper.xml
+7
-6
No files found.
yifu-check/yifu-check-api/src/main/java/com/yifu/cloud/plus/v1/check/utils/ChecksUtil.java
View file @
5530b3fd
...
...
@@ -174,6 +174,7 @@ public class ChecksUtil {
checkBankNo
.
setCardType
(
getJsonElementValue
(
resJson
.
getAsJsonObject
().
get
(
"cardType"
)));
checkBankNo
.
setResult
(
getJsonElementValue
(
resJson
.
getAsJsonObject
().
get
(
ChecksConstants
.
RESULT
)));
checkBankNo
.
setMessage
(
message
);
checkBankNo
.
setIdNum
(
idNum
);
checkBankNo
.
setRemark
(
getJsonElementValue
(
resJson
.
getAsJsonObject
().
get
(
ChecksConstants
.
REMARK
)));
checkBankNo
.
setType
(
CommonConstants
.
ONE_STRING
);
checkBankNo
.
setName
(
name
);
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialHouseholdExportVo.java
View file @
5530b3fd
...
...
@@ -151,6 +151,14 @@ public class TSocialHouseholdExportVo implements Serializable {
@ExcelProperty
(
"医保-单位编号"
)
private
String
customerNoYsd
;
/**
* 是否自动生成解除劳动合同书 0否1是(是的话,走单个推送,因为税友的减员接口没有批量附件的字段)
*/
@ExcelAttribute
(
name
=
"是否需要《解除劳动合同证明书》"
)
@Schema
(
description
=
"是否需要《解除劳动合同证明书》"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"是否需要《解除劳动合同证明书》"
)
private
String
isAutoLeaveDoc
;
/**
* 社保-登录账户
*/
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialHouseholdUpdateVo.java
View file @
5530b3fd
...
...
@@ -192,10 +192,10 @@ public class TSocialHouseholdUpdateVo extends RowIndex implements Serializable {
/**
* 是否自动生成解除劳动合同书 0否1是(是的话,走单个推送,因为税友的减员接口没有批量附件的字段)
*/
@ExcelAttribute
(
name
=
"是否
自动生成解除劳动合同书"
,
errorInfo
=
"是否自动生成解除劳动合同书
不能为空"
)
@Schema
(
description
=
"是否
自动生成解除劳动合同书
"
)
@ExcelAttribute
(
name
=
"是否
需要《解除劳动合同证明书》"
,
errorInfo
=
"是否需要《解除劳动合同证明书》
不能为空"
)
@Schema
(
description
=
"是否
需要《解除劳动合同证明书》
"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"是否
自动生成解除劳动合同书 0否1是
"
)
@ExcelProperty
(
"是否
需要《解除劳动合同证明书》
"
)
private
String
isAutoLeaveDoc
;
/**
* 自动化配置状态 0 是 1 否
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/HouseConfigConstants.java
View file @
5530b3fd
...
...
@@ -74,4 +74,6 @@ public class HouseConfigConstants {
public
static
final
String
IS_SINGLE_NO
=
"批量"
;
public
static
final
String
ERROR_TEMPLATE_TWENTY_TWO
=
"是否自动生成解除劳动合同书只能为【是】或者【否】"
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
View file @
5530b3fd
...
...
@@ -60,10 +60,7 @@ import javax.servlet.http.HttpServletResponse;
import
java.io.InputStream
;
import
java.net.URL
;
import
java.net.URLEncoder
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.*
;
import
java.util.regex.Matcher
;
import
java.util.regex.Pattern
;
...
...
@@ -936,23 +933,47 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
household
.
setHouseType
(
excel
.
getHouseType
().
equals
(
HouseConfigConstants
.
HOUSE_TYPE_ONE
)
?
"1"
:
"0"
);
household
.
setAuditUser
(
null
==
auditUser
.
getUserId
()
?
""
:
auditUser
.
getUserId
());
household
.
setHandleUser
(
null
==
handlerUser
.
getUserId
()
?
""
:
handlerUser
.
getUserId
());
if
(
Common
.
isNotNull
(
excel
.
getRosterAutoFlagYgs
())){
household
.
setRosterAutoFlagYgs
(
excel
.
getRosterAutoFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
if
(
Common
.
isNotNull
(
excel
.
getDataFlagYgs
())){
household
.
setDataFlagYgs
(
excel
.
getDataFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
if
(
Common
.
isNotNull
(
excel
.
getIsSingle
())){
household
.
setIsSingle
(
excel
.
getIsSingle
().
equals
(
HouseConfigConstants
.
IS_SINGLE_NO
)
?
"0"
:
"1"
);
}
if
(
Common
.
isNotNull
(
excel
.
getRosterAutoFlagYsd
())){
household
.
setRosterAutoFlagYsd
(
excel
.
getRosterAutoFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
if
(
Common
.
isNotNull
(
excel
.
getDataFlagYsd
())){
household
.
setDataFlagYsd
(
excel
.
getDataFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
if
(
Common
.
isNotNull
(
excel
.
getIsSingleYsd
())){
household
.
setIsSingleYsd
(
excel
.
getIsSingleYsd
().
equals
(
HouseConfigConstants
.
IS_SINGLE_NO
)
?
"0"
:
"1"
);
//如果社保自动化为是时,才更新 推送类型、是否生成花名册、是否仅补缴生成材料、
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
household
.
getAutoStatus
())){
if
(
Common
.
isNotNull
(
excel
.
getRosterAutoFlagYgs
())){
household
.
setRosterAutoFlagYgs
(
excel
.
getRosterAutoFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
if
(
CommonConstants
.
ONE_STRING
.
equals
(
household
.
getRosterAutoFlagYgs
())){
if
(
Common
.
isNotNull
(
excel
.
getDataFlagYgs
())){
household
.
setDataFlagYgs
(
excel
.
getDataFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
}
else
{
household
.
setDataFlagYgs
(
null
);
}
if
(
Common
.
isNotNull
(
excel
.
getIsSingle
())){
household
.
setIsSingle
(
excel
.
getIsSingle
().
equals
(
HouseConfigConstants
.
IS_SINGLE_NO
)
?
"0"
:
"1"
);
}
}
else
{
household
.
setRosterAutoFlagYgs
(
null
);
household
.
setDataFlagYgs
(
null
);
household
.
setIsSingle
(
null
);
}
//如果医保自动化为是时,才更新 推送类型、是否生成花名册、是否仅补缴生成材料、
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
household
.
getAutoStatusYsd
())){
if
(
Common
.
isNotNull
(
excel
.
getRosterAutoFlagYsd
())){
household
.
setRosterAutoFlagYsd
(
excel
.
getRosterAutoFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
if
(
CommonConstants
.
ONE_STRING
.
equals
(
household
.
getRosterAutoFlagYsd
())){
if
(
Common
.
isNotNull
(
excel
.
getDataFlagYsd
())){
household
.
setDataFlagYsd
(
excel
.
getDataFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
}
else
{
household
.
setDataFlagYsd
(
null
);
}
if
(
Common
.
isNotNull
(
excel
.
getIsSingleYsd
())){
household
.
setIsSingleYsd
(
excel
.
getIsSingleYsd
().
equals
(
HouseConfigConstants
.
IS_SINGLE_NO
)
?
"0"
:
"1"
);
}
}
else
{
household
.
setRosterAutoFlagYsd
(
null
);
household
.
setDataFlagYsd
(
null
);
household
.
setIsSingleYsd
(
null
);
}
household
.
setOrganId
(
dicMap
.
get
(
household
.
getOrganName
()));
...
...
@@ -962,6 +983,8 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
this
.
saveAuditUserOrHandleUser
(
household
,
CommonConstants
.
ONE_STRING
);
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
SAVE_SUCCESS
,
excel
));
}
// 把errorMessageList 按 rowIndex 升序
errorMessageList
.
sort
(
Comparator
.
comparingInt
(
ErrorMessage:
:
getLineNum
));
}
...
...
@@ -1074,6 +1097,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_TWENTY_ONE
,
excel
));
continue
;
}
//判断是否自动办理是否准确
if
(
Common
.
isNotNull
(
excel
.
getAutoStatus
())
&&
!
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getAutoStatus
())
...
...
@@ -1087,7 +1111,13 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_THREE_TWO
,
excel
));
continue
;
}
//判断是否自动生成解除劳动合同书 0否1是 为空
if
(
Common
.
isNotNull
(
excel
.
getIsAutoLeaveDoc
())
&&
!
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getIsAutoLeaveDoc
())
&&
!
CommonConstants
.
IS_FALSE
.
equals
(
excel
.
getIsAutoLeaveDoc
()))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_TWENTY_TWO
,
excel
));
continue
;
}
//判断推送类型是否准确
if
(
Common
.
isNotNull
(
excel
.
getIsSingle
())
&&
!
HouseConfigConstants
.
IS_SINGLE_NO
.
equals
(
excel
.
getIsSingle
())
...
...
@@ -1232,6 +1262,8 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
updateHouseInfo
(
excel
,
info
,
userMap
);
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
CommonConstants
.
UPDATE_SUCCESS
,
excel
));
}
// 把errorMessageList 按 rowIndex 升序
errorMessageList
.
sort
(
Comparator
.
comparingInt
(
ErrorMessage:
:
getLineNum
));
}
/**
...
...
@@ -1272,24 +1304,47 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if
(
Common
.
isNotNull
(
excel
.
getAutoStatusYsd
()))
{
info
.
setAutoStatusYsd
(
excel
.
getAutoStatusYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"0"
:
"1"
);
}
if
(
Common
.
isNotNull
(
excel
.
getIsSingle
()))
{
info
.
setIsSingle
(
excel
.
getIsSingle
().
equals
(
HouseConfigConstants
.
IS_SINGLE_NO
)
?
"0"
:
"1"
);
}
if
(
Common
.
isNotNull
(
excel
.
getIsSingleYsd
()))
{
info
.
setIsSingleYsd
(
excel
.
getIsSingleYsd
().
equals
(
HouseConfigConstants
.
IS_SINGLE_NO
)
?
"0"
:
"1"
);
}
if
(
Common
.
isNotNull
(
excel
.
getRosterAutoFlagYgs
()))
{
info
.
setRosterAutoFlagYgs
(
excel
.
getRosterAutoFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
if
(
Common
.
isNotNull
(
excel
.
getRosterAutoFlagYsd
()))
{
info
.
setRosterAutoFlagYsd
(
excel
.
getRosterAutoFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
if
(
Common
.
isNotNull
(
excel
.
getDataFlagYgs
()))
{
info
.
setDataFlagYgs
(
excel
.
getDataFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
info
.
getAutoStatus
())){
if
(
Common
.
isNotNull
(
excel
.
getIsSingle
()))
{
info
.
setIsSingle
(
excel
.
getIsSingle
().
equals
(
HouseConfigConstants
.
IS_SINGLE_NO
)
?
"0"
:
"1"
);
}
if
(
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getRosterAutoFlagYgs
())){
if
(
Common
.
isNotNull
(
excel
.
getDataFlagYgs
()))
{
info
.
setDataFlagYgs
(
excel
.
getDataFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
}
else
{
info
.
setDataFlagYgs
(
null
);
}
if
(
Common
.
isNotNull
(
excel
.
getRosterAutoFlagYgs
()))
{
info
.
setRosterAutoFlagYgs
(
excel
.
getRosterAutoFlagYgs
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
}
else
{
info
.
setIsSingle
(
null
);
info
.
setDataFlagYgs
(
null
);
info
.
setRosterAutoFlagYgs
(
null
);
}
if
(
Common
.
isNotNull
(
excel
.
getDataFlagYsd
()))
{
info
.
setDataFlagYsd
(
excel
.
getDataFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
info
.
getAutoStatusYsd
())){
if
(
Common
.
isNotNull
(
excel
.
getRosterAutoFlagYsd
()))
{
info
.
setRosterAutoFlagYsd
(
excel
.
getRosterAutoFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
if
(
Common
.
isNotNull
(
excel
.
getIsSingleYsd
()))
{
info
.
setIsSingleYsd
(
excel
.
getIsSingleYsd
().
equals
(
HouseConfigConstants
.
IS_SINGLE_NO
)
?
"0"
:
"1"
);
}
if
(
CommonConstants
.
IS_TRUE
.
equals
(
excel
.
getRosterAutoFlagYsd
())){
if
(
Common
.
isNotNull
(
excel
.
getDataFlagYsd
()))
{
info
.
setDataFlagYsd
(
excel
.
getDataFlagYsd
().
equals
(
CommonConstants
.
IS_TRUE
)
?
"1"
:
"0"
);
}
}
else
{
info
.
setDataFlagYsd
(
null
);
}
}
else
{
info
.
setRosterAutoFlagYsd
(
null
);
info
.
setIsSingleYsd
(
null
);
info
.
setDataFlagYsd
(
null
);
}
if
(
Common
.
isNotNull
(
excel
.
getOrganName
()))
{
info
.
setOrganName
(
excel
.
getOrganName
());
}
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/SysHouseHoldInfoMapper.xml
View file @
5530b3fd
...
...
@@ -244,12 +244,13 @@
if(a.IS_SIGN = '0','是','否') isSign,
if(a.AUTO_STATUS = '0','启用','禁用') autoStatus,
if(a.AUTO_STATUS_YSD = '0','启用','禁用') autoStatusYsd,
if(a.IS_SINGLE = '0','批量','单个') isSingle,
if(a.IS_SINGLE_YSD = '0','批量','单个') isSingleYsd,
if(a.ROSTER_AUTO_FLAG_YGS = '0','否','是') rosterAutoFlagYgs,
if(a.ROSTER_AUTO_FLAG_YSD = '0','否','是') rosterAutoFlagYsd,
if(a.DATA_FLAG_YGS = '0','否','是') dataFlagYgs,
if(a.DATA_FLAG_YSD = '0','否','是') dataFlagYsd
case when a.IS_SINGLE = '0' then '批量' when a.IS_SINGLE = '1' then '单个' else '' end isSingle,
case when a.IS_SINGLE_YSD = '0' then '批量' when a.IS_SINGLE_YSD = '1' then '单个' else '' end isSingleYsd,
case when a.ROSTER_AUTO_FLAG_YGS = '0' then '否' when a.ROSTER_AUTO_FLAG_YGS = '1' then '是' else '' end rosterAutoFlagYgs,
case when a.ROSTER_AUTO_FLAG_YSD = '0' then '否' when a.ROSTER_AUTO_FLAG_YSD = '1' then '是' else '' end rosterAutoFlagYsd,
case when a.DATA_FLAG_YGS = '0' then '否' when a.DATA_FLAG_YGS = '1' then '是' else '' end dataFlagYgs,
case when a.DATA_FLAG_YSD = '0' then '否' when a.DATA_FLAG_YSD = '1' then '是' else '' end dataFlagYsd,
case when a.IS_AUTO_LEAVE_DOC = '0' then '否' when a.IS_AUTO_LEAVE_DOC = '1' then '是' else '' end isAutoLeaveDoc
FROM sys_house_hold_info a
LEFT JOIN sys_area a1 on a1.id=a.PROVINCE
LEFT JOIN sys_area a2 on a2.id=a.CITY
...
...
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