Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
tianjin-cement
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
竹天卫
tianjin-cement
Commits
12c03198
Commit
12c03198
authored
Oct 14, 2020
by
mengbali153
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
能力管理--联调
历史档案--联调 非标产值--联调
parent
8d2df675
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
17 deletions
+13
-17
NonStandardApprovalController.java
...nt/business/controller/NonStandardApprovalController.java
+2
-2
NonStandardValueController.java
...ement/business/controller/NonStandardValueController.java
+2
-2
INonStandardApprovalService.java
.../cement/business/service/INonStandardApprovalService.java
+1
-2
INonStandardValueService.java
.../sc/cement/business/service/INonStandardValueService.java
+1
-2
NonStandardApplyServiceImpl.java
...nt/business/service/impl/NonStandardApplyServiceImpl.java
+2
-2
NonStandardApprovalServiceImpl.java
...business/service/impl/NonStandardApprovalServiceImpl.java
+1
-2
NonStandardValueServiceImpl.java
...nt/business/service/impl/NonStandardValueServiceImpl.java
+4
-5
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/controller/NonStandardApprovalController.java
View file @
12c03198
...
...
@@ -106,9 +106,9 @@ public class NonStandardApprovalController {
@ApiOperation
(
"委托单位审批导出列表"
)
@PostMapping
(
"/exportList"
)
public
void
exportList
(
Integer
status
,
String
filename
,
String
userId
,
String
name
,
HttpServletResponse
response
)
{
public
void
exportList
(
String
filename
,
String
userId
,
String
name
,
HttpServletResponse
response
)
{
try
{
iNonStandardApprovalService
.
exportList
(
status
,
filename
,
userId
,
name
,
response
);
iNonStandardApprovalService
.
exportList
(
filename
,
userId
,
name
,
response
);
}
catch
(
Exception
e
)
{
log
.
debug
(
"非标产值申请导出列表{}"
,
e
);
}
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/controller/NonStandardValueController.java
View file @
12c03198
...
...
@@ -94,9 +94,9 @@ public class NonStandardValueController {
@ApiOperation
(
"非标产值信息导出列表"
)
@PostMapping
(
"/exportList"
)
public
void
exportList
(
Integer
status
,
String
filename
,
Integer
userId
,
String
name
,
HttpServletResponse
response
)
{
public
void
exportList
(
String
filename
,
Integer
userId
,
String
name
,
HttpServletResponse
response
)
{
try
{
inonStandardValueService
.
exportList
(
status
,
filename
,
userId
,
name
,
response
);
inonStandardValueService
.
exportList
(
filename
,
userId
,
name
,
response
);
}
catch
(
Exception
e
)
{
log
.
debug
(
"非标产值信息导出列表{}"
,
e
);
}
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/INonStandardApprovalService.java
View file @
12c03198
...
...
@@ -72,11 +72,10 @@ public interface INonStandardApprovalService extends IService<NonStandardApprova
/**
* 非标产值审批列表导出
* @param status 状态
* @param filename 文件名
* @param userId 账户
* @param name 姓名
* @param response
*/
void
exportList
(
Integer
status
,
String
filename
,
String
userId
,
String
name
,
HttpServletResponse
response
);
void
exportList
(
String
filename
,
String
userId
,
String
name
,
HttpServletResponse
response
);
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/INonStandardValueService.java
View file @
12c03198
...
...
@@ -43,11 +43,10 @@ public interface INonStandardValueService extends IService<NonStandardValue> {
/**
* 非标产值列表导出
* @param status 状态
* @param filename 文件名
* @param userId 用户id
* @param name 姓名
* @param response
*/
void
exportList
(
Integer
status
,
String
filename
,
Integer
userId
,
String
name
,
HttpServletResponse
response
);
void
exportList
(
String
filename
,
Integer
userId
,
String
name
,
HttpServletResponse
response
);
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardApplyServiceImpl.java
View file @
12c03198
...
...
@@ -140,8 +140,8 @@ public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMap
for
(
Map
<
String
,
Object
>
m
:
list
)
{
Object
[]
objects
=
new
Object
[
headers
.
length
];
for
(
int
j
=
0
;
j
<
headers
.
length
;
j
++)
{
String
obj
=
m
.
get
(
headers
[
j
]).
toString
();
if
(
j
==
0
){
String
obj
=
m
.
get
(
headers
[
j
])
==
null
?
""
:
m
.
get
(
headers
[
j
])
.
toString
();
if
(
j
==
0
&&
obj
!=
null
){
obj
=
obj
.
split
(
"\\."
)[
0
];
}
objects
[
j
]
=
obj
;
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardApprovalServiceImpl.java
View file @
12c03198
...
...
@@ -129,9 +129,8 @@ public class NonStandardApprovalServiceImpl extends ServiceImpl<NonStandardAppro
}
@Override
public
void
exportList
(
Integer
status
,
String
filename
,
String
userId
,
String
name
,
HttpServletResponse
response
)
{
public
void
exportList
(
String
filename
,
String
userId
,
String
name
,
HttpServletResponse
response
)
{
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
params
.
put
(
"status"
,
status
);
params
.
put
(
"name"
,
name
);
params
.
put
(
"userId"
,
userId
);
List
<
Map
<
String
,
Object
>>
list
=
nonStandardApprovalMapper
.
exportList
(
params
);
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardValueServiceImpl.java
View file @
12c03198
...
...
@@ -116,16 +116,15 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
@Override
public
void
exportList
(
Integer
status
,
String
filename
,
Integer
userId
,
String
name
,
HttpServletResponse
response
)
{
public
void
exportList
(
String
filename
,
Integer
userId
,
String
name
,
HttpServletResponse
response
)
{
Map
<
String
,
Object
>
params
=
new
HashMap
<>();
params
.
put
(
"status"
,
status
);
params
.
put
(
"userId"
,
userId
);
params
.
put
(
"name"
,
name
);
List
<
Map
<
String
,
Object
>>
list
=
nonStandardValueMapper
.
exportList
(
params
);
if
(!
CollectionUtils
.
isEmpty
(
list
))
{
Map
<
String
,
Object
>
map
=
list
.
get
(
0
);
String
[]
headers
=
new
String
[
map
.
size
()
];
String
[]
headers
=
new
String
[
10
];
headers
[
0
]
=
"序号"
;
headers
[
1
]
=
"姓名"
;
headers
[
2
]
=
"账户"
;
...
...
@@ -142,8 +141,8 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
for
(
Map
<
String
,
Object
>
m
:
list
)
{
Object
[]
objects
=
new
Object
[
headers
.
length
];
for
(
int
j
=
0
;
j
<
headers
.
length
;
j
++)
{
String
obj
=
m
.
get
(
headers
[
j
]).
toString
();
if
(
j
==
0
){
String
obj
=
m
.
get
(
headers
[
j
])
==
null
?
""
:
m
.
get
(
headers
[
j
])
.
toString
();
if
(
j
==
0
&&
obj
!=
null
){
obj
=
obj
.
split
(
"\\."
)[
0
];
}
objects
[
j
]
=
obj
;
...
...
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