Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
邬吉朋
relation
Commits
cab07481
Commit
cab07481
authored
Aug 14, 2025
by
zhuxiang
Browse files
Merge remote-tracking branch 'origin/dev' into dev
parents
e4591ddf
a53d553e
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/main/java/com/platform/model/entity/CasesEntity.java
View file @
cab07481
...
...
@@ -42,4 +42,7 @@ public class CasesEntity {
private
String
templateId
;
private
Boolean
drawFlag
;
@TableField
(
"login_name"
)
private
String
loginName
;
}
src/main/java/com/platform/service/impl/AnalysisServiceImpl.java
View file @
cab07481
package
com.platform.service.impl
;
import
com.alibaba.fastjson.JSON
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.google.common.collect.Maps
;
import
com.platform.exception.BusinessException
;
import
com.platform.model.entity.ExcelDataEntity
;
...
...
@@ -141,15 +142,29 @@ public class AnalysisServiceImpl implements AnalysisService {
//保存excel数据,判断是否使用默认模板
if
(!
ObjectUtils
.
isEmpty
(
ExcelTemplate
)
&&
!
filterIndex
.
isEmpty
())
{
List
<
ExcelDataEntity
>
afterDeduplication
=
Lists
.
newArrayList
();
List
<
ExcelDataEntity
>
afterDeduplication1
=
Lists
.
newArrayList
();
deduplicationData
(
excelDataMap
,
excelData
,
filterIndex
);
//excelDataMap中的value传给afterDeduplication
excelDataMap
.
forEach
(
(
key
,
excelDatum
)
->
afterDeduplication
.
add
(
excelDatum
)
);
excelDataService
.
saveBatch
(
afterDeduplication
);
for
(
ExcelDataEntity
excelDataEntity
:
afterDeduplication
)
{
if
(
StringUtils
.
isNotEmpty
(
excelDataEntity
.
getPayeeName
())
&&
!
"-"
.
equals
(
excelDataEntity
.
getPayeeName
()))
{
if
(
excelDataEntity
.
getPayeeName
().
contains
(
"(个人)"
))
{
excelDataEntity
.
setPayeeName
(
excelDataEntity
.
getPayeeName
().
replace
(
"(个人)"
,
""
));
afterDeduplication1
.
add
(
excelDataEntity
);
}
else
if
(
excelDataEntity
.
getPayeeName
().
contains
(
"(商户)"
))
{
excelDataEntity
.
setPayeeName
(
excelDataEntity
.
getPayeeName
().
replace
(
"(商户)"
,
""
));
afterDeduplication1
.
add
(
excelDataEntity
);
}
else
{
afterDeduplication1
.
add
(
excelDataEntity
);
}
}
}
excelDataService
.
saveBatch
(
afterDeduplication1
);
//保存无主用户
//afterDeduplication转换成payeeName的字符串集合并去重
List
<
String
>
payeeNameList
=
afterDeduplication
.
stream
().
map
(
ExcelDataEntity:
:
getPayeeName
).
distinct
().
collect
(
Collectors
.
toList
());
List
<
String
>
payeeNameList
=
afterDeduplication
1
.
stream
().
map
(
ExcelDataEntity:
:
getPayeeName
).
distinct
().
collect
(
Collectors
.
toList
());
for
(
String
s
:
payeeNameList
)
{
userList
.
add
(
UserEntity
.
builder
()
.
userName
(
s
)
...
...
@@ -159,10 +174,24 @@ public class AnalysisServiceImpl implements AnalysisService {
}
userService
.
saveUserBatch
(
userList
);
}
else
{
excelDataService
.
saveBatch
(
excelData
);
List
<
ExcelDataEntity
>
excelData1
=
Lists
.
newArrayList
();
for
(
ExcelDataEntity
excelDataEntity
:
excelData
)
{
if
(
StringUtils
.
isNotEmpty
(
excelDataEntity
.
getPayeeName
())
&&
!
"-"
.
equals
(
excelDataEntity
.
getPayeeName
()))
{
if
(
excelDataEntity
.
getPayeeName
().
contains
(
"(个人)"
))
{
excelDataEntity
.
setPayeeName
(
excelDataEntity
.
getPayeeName
().
replace
(
"(个人)"
,
""
));
excelData1
.
add
(
excelDataEntity
);
}
else
if
(
excelDataEntity
.
getPayeeName
().
contains
(
"(商户)"
))
{
excelDataEntity
.
setPayeeName
(
excelDataEntity
.
getPayeeName
().
replace
(
"(商户)"
,
""
));
excelData1
.
add
(
excelDataEntity
);
}
else
{
excelData1
.
add
(
excelDataEntity
);
}
}
}
excelDataService
.
saveBatch
(
excelData1
);
//保存无主用户
//afterDeduplication转换成payeeName的字符串集合并去重
List
<
String
>
payeeNameList
=
excelData
.
stream
().
map
(
ExcelDataEntity:
:
getPayeeName
).
distinct
().
collect
(
Collectors
.
toList
());
List
<
String
>
payeeNameList
=
excelData
1
.
stream
().
map
(
ExcelDataEntity:
:
getPayeeName
).
distinct
().
collect
(
Collectors
.
toList
());
for
(
String
s
:
payeeNameList
)
{
userList
.
add
(
UserEntity
.
builder
()
.
userName
(
s
)
...
...
@@ -178,6 +207,10 @@ public class AnalysisServiceImpl implements AnalysisService {
//保存用户
if
(
StringUtils
.
isNotEmpty
(
folderName
))
{
Map
<
String
,
String
>
idCardInfo
=
IdCardUtils
.
parseIdCardInfo
(
folderName
);
//删除旧用户
userService
.
remove
(
new
LambdaQueryWrapper
<
UserEntity
>()
.
eq
(
UserEntity:
:
getUserName
,
folderName
)
.
eq
(
UserEntity:
:
getCaseId
,
caseId
));
if
(!
ObjectUtils
.
isEmpty
(
idCardInfo
))
{
userService
.
save
(
UserEntity
.
builder
()
.
userName
(
folderName
)
...
...
@@ -187,7 +220,7 @@ public class AnalysisServiceImpl implements AnalysisService {
.
idType
(
"身份证"
)
.
type
(
"1"
)
.
caseId
(
caseId
).
build
());
}
else
{
}
else
{
userService
.
save
(
UserEntity
.
builder
()
.
userName
(
folderName
)
.
type
(
"1"
)
...
...
src/main/java/com/platform/service/impl/CaseServiceImpl.java
View file @
cab07481
...
...
@@ -746,6 +746,8 @@ public class CaseServiceImpl extends ServiceImpl<CaseMapper, CasesEntity> implem
caseRuleConfig
.
setCaseId
(
caseDTO
.
getId
());
caseRuleConfig
.
setWhiteFlag
(
true
);
caseRuleConfig
.
setDirectionFlag
(
true
);
caseRuleConfig
.
setMinAmount
(
100.0
);
caseRuleConfig
.
setMinTransaction
(
2
);
return
caseRuleConfigService
.
save
(
caseRuleConfig
);
}
else
{
caseDTO
.
setLastUpdateTime
(
new
Date
());
...
...
src/main/resources/com/platform/mapper/CaseMapper.xml
View file @
cab07481
...
...
@@ -52,6 +52,7 @@
template_id
from cases
<where>
login_name = #{loginName}
<if
test=
"caseCode != null and caseCode != ''"
>
and case_code like concat('%', #{caseCode}, '%')
</if>
...
...
@@ -59,6 +60,7 @@
and den_name like concat('%', #{denName}, '%')
</if>
</where>
order by create_time desc
</select>
<select
id=
"getInfoById"
resultType=
"com.platform.model.entity.CasesEntity"
>
select
...
...
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