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
d9c53b3a
Commit
d9c53b3a
authored
Dec 19, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP-1.7.3-shuiyou' into MVP-1.7.3-shuiyou
parents
c14d7d5c
28d0d865
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
14 deletions
+15
-14
TSettleDomainMapper.xml
...ves-biz/src/main/resources/mapper/TSettleDomainMapper.xml
+1
-1
TSocialHouseholdInsertVo.java
...loud/plus/v1/yifu/social/vo/TSocialHouseholdInsertVo.java
+1
-1
SysHouseHoldInfoServiceImpl.java
...yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
+12
-12
TSocialfundHouseResServiceImpl.java
...u/social/service/impl/TSocialfundHouseResServiceImpl.java
+1
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml
View file @
d9c53b3a
...
@@ -320,7 +320,7 @@
...
@@ -320,7 +320,7 @@
FROM
FROM
t_settle_domain a
t_settle_domain a
<if
test=
"userId != null and userId.trim() != '-999'"
>
<if
test=
"userId != null and userId.trim() != '-999'"
>
LEFT JOIN t_cutsomer_data_permisson b ON b.SETTLE_DOMAIN_NO = a.DEPART_NO
LEFT JOIN t_cutsomer_data_permisson b ON b.SETTLE_DOMAIN_NO = a.DEPART_NO
and b.STATUS = '0'
</if>
</if>
WHERE a.DELETE_FLAG = '0'
WHERE a.DELETE_FLAG = '0'
/* 2023-6-12 11:12:15 hgw根据 */
/* 2023-6-12 11:12:15 hgw根据 */
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialHouseholdInsertVo.java
View file @
d9c53b3a
...
@@ -193,7 +193,7 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
...
@@ -193,7 +193,7 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
/**
/**
* 自动化配置状态 0 是 1 否
* 自动化配置状态 0 是 1 否
*/
*/
@ExcelAttribute
(
name
=
"是否自动办理"
)
@ExcelAttribute
(
name
=
"是否自动办理"
,
maxLength
=
1
,
isNotEmpty
=
true
)
@Schema
(
description
=
"是否自动办理"
)
@Schema
(
description
=
"是否自动办理"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"是否自动办理"
)
@ExcelProperty
(
"是否自动办理"
)
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
View file @
d9c53b3a
...
@@ -651,9 +651,20 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -651,9 +651,20 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_SAME_HOUSE
,
excel
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_SAME_HOUSE
,
excel
));
continue
;
continue
;
}
}
//判断户类型是否准确
if
(
Common
.
isNotNull
(
excel
.
getHouseType
())
&&
!
excel
.
getHouseType
().
equals
(
HouseConfigConstants
.
HOUSE_TYPE_ONE
)
&&
!
excel
.
getHouseType
().
equals
(
HouseConfigConstants
.
HOUSE_TYPE_TWO
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_ONE
,
excel
));
continue
;
}
//判断是否自动办理是否准确
if
(!
excel
.
getAutoStatus
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
!
excel
.
getAutoStatus
().
equals
(
CommonConstants
.
IS_FALSE
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_THREE
,
excel
));
continue
;
}
//是否自动办理,选择是时,社保和医保信息必须填写其中一个,否则导入不成功
//是否自动办理,选择是时,社保和医保信息必须填写其中一个,否则导入不成功
//选择否时,不做限制要求,可填可不填,导入时正常导入填写的字段
//选择否时,不做限制要求,可填可不填,导入时正常导入填写的字段
if
(
info
.
getAutoStatus
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
excel
.
getAutoStatus
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
if
(
excel
.
getAutoStatus
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
Common
.
isEmpty
(
excel
.
getSocialAccount
())
&&
Common
.
isEmpty
(
excel
.
getMediclAccount
())){
Common
.
isEmpty
(
excel
.
getSocialAccount
())
&&
Common
.
isEmpty
(
excel
.
getMediclAccount
())){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_TWO
,
excel
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_TWO
,
excel
));
continue
;
continue
;
...
@@ -664,17 +675,6 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
...
@@ -664,17 +675,6 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_FIVE
,
excel
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_FIVE
,
excel
));
continue
;
continue
;
}
}
//判断户类型是否准确
if
(
Common
.
isNotNull
(
excel
.
getHouseType
())
&&
!
excel
.
getHouseType
().
equals
(
HouseConfigConstants
.
HOUSE_TYPE_ONE
)
&&
!
excel
.
getHouseType
().
equals
(
HouseConfigConstants
.
HOUSE_TYPE_TWO
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_ONE
,
excel
));
continue
;
}
//判断是否自动办理是否准确
if
(!
excel
.
getAutoStatus
().
equals
(
CommonConstants
.
IS_TRUE
)
&&
!
excel
.
getAutoStatus
().
equals
(
CommonConstants
.
IS_FALSE
))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_THREE
,
excel
));
continue
;
}
if
((
Common
.
isNotNull
(
excel
.
getAuditUserName
())
&&
Common
.
isEmpty
(
userMap
.
get
(
excel
.
getAuditUserName
())))
if
((
Common
.
isNotNull
(
excel
.
getAuditUserName
())
&&
Common
.
isEmpty
(
userMap
.
get
(
excel
.
getAuditUserName
())))
||
(
Common
.
isNotNull
(
excel
.
getHandleUserName
())
&&
Common
.
isEmpty
(
userMap
.
get
(
excel
.
getHandleUserName
()))))
{
||
(
Common
.
isNotNull
(
excel
.
getHandleUserName
())
&&
Common
.
isEmpty
(
userMap
.
get
(
excel
.
getHandleUserName
()))))
{
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_FOUR
,
excel
));
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
HouseConfigConstants
.
ERROR_TEMPLATE_FOUR
,
excel
));
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialfundHouseResServiceImpl.java
View file @
d9c53b3a
...
@@ -109,6 +109,7 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
...
@@ -109,6 +109,7 @@ public class TSocialfundHouseResServiceImpl extends ServiceImpl<TSocialfundHouse
if
(
Common
.
isNotNull
(
searchVo
.
getAuthType
())){
if
(
Common
.
isNotNull
(
searchVo
.
getAuthType
())){
wrapper
.
eq
(
TSocialfundHouseRes:
:
getAuthType
,
searchVo
.
getAuthType
());
wrapper
.
eq
(
TSocialfundHouseRes:
:
getAuthType
,
searchVo
.
getAuthType
());
}
}
wrapper
.
last
(
CommonConstants
.
LAST_ONE_SQL
);
TSocialfundHouseRes
socialfundHouseRes
=
baseMapper
.
selectOne
(
wrapper
);
TSocialfundHouseRes
socialfundHouseRes
=
baseMapper
.
selectOne
(
wrapper
);
if
(
Common
.
isNotNull
(
socialfundHouseRes
))
{
if
(
Common
.
isNotNull
(
socialfundHouseRes
))
{
String
errorMessage
;
String
errorMessage
;
...
...
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