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
96dd0a9e
Commit
96dd0a9e
authored
Dec 30, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码优化-户修改&导入提示语-fxj
parent
7cc64d1a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
8 deletions
+18
-8
ExcelUtil.java
...m/yifu/cloud/plus/v1/yifu/common/core/util/ExcelUtil.java
+8
-8
SysHouseHoldInfoServiceImpl.java
...yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
+10
-0
No files found.
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/ExcelUtil.java
View file @
96dd0a9e
...
...
@@ -290,7 +290,7 @@ public class ExcelUtil <T> implements Serializable {
if
(
Common
.
isNotNull
(
attr
.
readConverterExp
()))
{
tempStr
=
reverseByExp
(
c
,
attr
.
readConverterExp
());
if
(
Common
.
isEmpty
(
tempStr
)){
errorMessageHashMap
=
initErrorMessage
(
errorMessageHashMap
,
new
ErrorMessage
(
rowNum
,
attr
.
name
()+
"
未找到:"
+
c
+
"的字典数据"
),
errorTemp
);
errorMessageHashMap
=
initErrorMessage
(
errorMessageHashMap
,
new
ErrorMessage
(
rowNum
,
attr
.
name
()+
"
列不可填写:"
+
c
),
errorTemp
);
continue
;
}
else
{
c
=
tempStr
;
...
...
@@ -313,15 +313,15 @@ public class ExcelUtil <T> implements Serializable {
}
if
(
StringUtils
.
isEmpty
(
tempStr
)
&&
(
attr
.
isArea
()
||
attr
.
isDataId
()))
{
if
(
attr
.
isOrgan
())
{
errorMessageHashMap
=
initErrorMessage
(
errorMessageHashMap
,
new
ErrorMessage
(
rowNum
,
attr
.
name
()+
"未找到:"
+
c
+
"的单位或项目数据,请确认存在项目权限"
),
errorTemp
);
errorMessageHashMap
=
initErrorMessage
(
errorMessageHashMap
,
new
ErrorMessage
(
rowNum
,
attr
.
name
()+
"
列
未找到:"
+
c
+
"的单位或项目数据,请确认存在项目权限"
),
errorTemp
);
}
if
(
attr
.
isArea
())
{
errorMessageHashMap
=
initErrorMessage
(
errorMessageHashMap
,
new
ErrorMessage
(
rowNum
,
attr
.
name
()+
"未找到:"
+
c
+
"的区域数据"
),
errorTemp
);
errorMessageHashMap
=
initErrorMessage
(
errorMessageHashMap
,
new
ErrorMessage
(
rowNum
,
attr
.
name
()+
"
列
未找到:"
+
c
+
"的区域数据"
),
errorTemp
);
}
else
{
if
(
Common
.
isNotNull
(
attr
.
errorInfoImport
()))
{
errorMessageHashMap
=
initErrorMessage
(
errorMessageHashMap
,
new
ErrorMessage
(
rowNum
,
"数据'"
+
c
+
"':"
+
attr
.
errorInfoImport
()),
errorTemp
);
}
else
{
errorMessageHashMap
=
initErrorMessage
(
errorMessageHashMap
,
new
ErrorMessage
(
rowNum
,
attr
.
name
()+
"
未找到:"
+
c
+
"的字典数据"
),
errorTemp
);
errorMessageHashMap
=
initErrorMessage
(
errorMessageHashMap
,
new
ErrorMessage
(
rowNum
,
attr
.
name
()+
"
列不可填写:"
+
c
),
errorTemp
);
}
}
continue
;
...
...
@@ -904,19 +904,19 @@ public class ExcelUtil <T> implements Serializable {
}
if
(!
StringUtils
.
isNotBlank
(
tempStr
))
{
if
(
attr
.
isOrgan
())
{
errorList
.
add
(
new
ErrorMessage
(
i
+
2
,
"
未找到:"
+
c
+
"的单位或项目数据,请确认存在项目权限"
));
errorList
.
add
(
new
ErrorMessage
(
i
+
2
,
attr
.
name
()+
"列
未找到:"
+
c
+
"的单位或项目数据,请确认存在项目权限"
));
errorMessageHashMap
=
initErrorMessage
(
errorMessageHashMap
,
new
ErrorMessage
(
i
+
2
,
"未找到:"
+
c
+
"的单位或项目数据,请确认存在项目权限"
),
errorTemp
);
}
if
(
attr
.
isArea
())
{
errorList
.
add
(
new
ErrorMessage
(
i
+
2
,
"
未找到:"
+
c
+
"的区域数据"
));
errorList
.
add
(
new
ErrorMessage
(
i
+
2
,
attr
.
name
()+
"列
未找到:"
+
c
+
"的区域数据"
));
errorMessageHashMap
=
initErrorMessage
(
errorMessageHashMap
,
new
ErrorMessage
(
i
+
2
,
"未找到:"
+
c
+
"的区域数据"
),
errorTemp
);
}
else
{
if
(
Common
.
isNotNull
(
attr
.
errorInfoImport
()))
{
errorList
.
add
(
new
ErrorMessage
(
i
+
2
,
"数据'"
+
c
+
"':"
+
attr
.
errorInfoImport
()));
errorMessageHashMap
=
initErrorMessage
(
errorMessageHashMap
,
new
ErrorMessage
(
i
+
2
,
"数据'"
+
c
+
"':"
+
attr
.
errorInfoImport
()),
errorTemp
);
}
else
{
errorList
.
add
(
new
ErrorMessage
(
i
+
2
,
"未找到:"
+
c
+
"的字典数据"
));
errorMessageHashMap
=
initErrorMessage
(
errorMessageHashMap
,
new
ErrorMessage
(
i
+
2
,
"未找到:
"
+
c
+
"的字典数据"
),
errorTemp
);
errorList
.
add
(
new
ErrorMessage
(
i
+
2
,
attr
.
name
()+
"列不可填写:"
+
c
));
errorMessageHashMap
=
initErrorMessage
(
errorMessageHashMap
,
new
ErrorMessage
(
i
+
2
,
attr
.
name
()+
"列不可填写:
"
+
c
+
"的字典数据"
),
errorTemp
);
}
}
continue
;
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
View file @
96dd0a9e
...
...
@@ -506,6 +506,16 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
sysHouseHoldInfoFailResService
.
removeById
(
hold
.
getId
());
}
}
//处理省市县空的情况
if
(
Common
.
isEmpty
(
hold
.
getProvince
())){
hold
.
setProvince
(
CommonConstants
.
EMPTY_STRING
);
}
if
(
Common
.
isEmpty
(
hold
.
getCity
())){
hold
.
setCity
(
CommonConstants
.
EMPTY_STRING
);
}
if
(
Common
.
isEmpty
(
hold
.
getTown
())){
hold
.
setTown
(
CommonConstants
.
EMPTY_STRING
);
}
int
res
=
baseMapper
.
updateById
(
hold
);
if
(
res
>=
0
){
//设置不记录更新日志字段
...
...
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