Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
dacabc54
Commit
dacabc54
authored
Feb 21, 2022
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
9d5dee2f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
EquipmentServiceImpl.java
...oot/module/jcs/biz/service/impl/EquipmentServiceImpl.java
+1
-3
ExcelServiceImpl.java
...os/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java
+3
-1
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/EquipmentServiceImpl.java
View file @
dacabc54
...
...
@@ -43,9 +43,7 @@ public class EquipmentServiceImpl {
ResponseModel
<
Object
>
response
=
equipFeignClient
.
getFireSystemListAll
();
List
<
Map
<
String
,
Object
>>
fireSystemMapList
=
(
List
<
Map
<
String
,
Object
>>)
response
.
getResult
();
List
<
MenuFrom
>
fireSystemDtoList
=
Lists
.
newArrayList
();
fireSystemMapList
.
stream
().
filter
(
result
->
result
.
get
(
"bizOrgCode"
)
!=
null
&&
result
.
get
(
"bizOrgCode"
).
toString
().
startsWith
(
reginParams
.
getPersonIdentity
().
getBizOrgCode
()))
.
forEach
(
fireSystemMapList
.
stream
().
forEach
(
system
->
{
MenuFrom
menuFrom
=
new
MenuFrom
((
String
)
system
.
get
(
"id"
),
(
String
)
system
.
get
(
"name"
),
"0"
,
"0"
);
fireSystemDtoList
.
add
(
menuFrom
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java
View file @
dacabc54
...
...
@@ -23,6 +23,7 @@ import org.springframework.beans.BeanUtils;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.scheduling.annotation.Async
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.util.StringUtils
;
import
org.springframework.web.multipart.MultipartFile
;
import
org.typroject.tyboot.core.foundation.context.RequestContext
;
...
...
@@ -412,7 +413,8 @@ public class ExcelServiceImpl {
break
;
}
}
@Transactional
public
void
commonUpload
(
MultipartFile
multipartFile
,
ExcelDto
excelDto
,
String
uuidString
)
throws
Exception
{
switch
(
excelDto
.
getType
())
{
...
...
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