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
8d2df675
Commit
8d2df675
authored
Oct 14, 2020
by
mengbali153
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into master
parents
19d624d5
9327a7c0
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
48 deletions
+28
-48
NonStandardValueController.java
...ement/business/controller/NonStandardValueController.java
+17
-4
QualityApplyController.java
...sc/cement/business/controller/QualityApplyController.java
+9
-40
QualityController.java
...wise/sc/cement/business/controller/QualityController.java
+2
-2
WordUtil.java
...c/main/java/cn/wise/sc/cement/business/util/WordUtil.java
+0
-2
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/controller/NonStandardValueController.java
View file @
8d2df675
...
...
@@ -2,6 +2,7 @@ package cn.wise.sc.cement.business.controller;
import
cn.hutool.core.date.DateTime
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.util.StrUtil
;
import
cn.wise.sc.cement.business.entity.NonStandardValue
;
import
cn.wise.sc.cement.business.model.BaseResponse
;
import
cn.wise.sc.cement.business.model.PageQuery
;
...
...
@@ -54,8 +55,14 @@ public class NonStandardValueController {
@GetMapping
(
"/user_id"
)
@ApiOperation
(
"非标产值统计"
)
public
BaseResponse
nonValue
(
PageQuery
pageQuery
,
String
start
,
String
end
)
{
Date
startParse
=
DateUtil
.
parse
(
start
);
Date
endParse
=
DateUtil
.
parse
(
end
);
Date
startParse
=
null
;
if
(
StrUtil
.
isNotBlank
(
start
))
{
startParse
=
DateUtil
.
parse
(
start
);
}
Date
endParse
=
null
;
if
(
StrUtil
.
isNotBlank
(
end
))
{
endParse
=
DateUtil
.
parse
(
end
);
}
//将list拆分成分页
BaseResponse
<
List
<
NonStandardValue
>>
baseResponse
=
inonStandardValueService
.
nonValue
(
startParse
,
endParse
);
List
<
NonStandardValue
>
data
=
baseResponse
.
getData
();
...
...
@@ -69,9 +76,15 @@ public class NonStandardValueController {
@ApiOperation
(
value
=
"获取所有已通过的非标产值"
)
@GetMapping
(
"/getList"
)
public
BaseResponse
getList
(
String
start
,
String
end
)
{
Date
startParse
=
null
;
if
(
StrUtil
.
isNotBlank
(
start
))
{
startParse
=
DateUtil
.
parse
(
start
);
}
Date
endParse
=
null
;
if
(
StrUtil
.
isNotBlank
(
end
))
{
endParse
=
DateUtil
.
parse
(
end
);
}
try
{
Date
startParse
=
DateUtil
.
parse
(
start
);
Date
endParse
=
DateUtil
.
parse
(
end
);
return
inonStandardValueService
.
getList
(
startParse
,
endParse
);
}
catch
(
Exception
e
)
{
log
.
debug
(
"获取所有已通过的非标产值{}"
,
e
);
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/controller/QualityApplyController.java
View file @
8d2df675
...
...
@@ -2,6 +2,7 @@ package cn.wise.sc.cement.business.controller;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.util.StrUtil
;
import
cn.wise.sc.cement.business.entity.QualityApply
;
import
cn.wise.sc.cement.business.model.BaseResponse
;
import
cn.wise.sc.cement.business.service.IQualityApplyService
;
...
...
@@ -58,51 +59,19 @@ public class QualityApplyController {
}
}
public
static
void
main
(
String
[]
args
)
{
List
<
QualityApply
>
list
=
new
ArrayList
<>();
QualityApply
qualityApply
=
new
QualityApply
();
qualityApply
.
setCementCode
(
"test"
);
qualityApply
.
setCreateTime
(
LocalDate
.
now
());
qualityApply
.
setInputResult
(
"[1,2,3,4]"
);
qualityApply
.
setProjectId
(
1
);
qualityApply
.
setProjectName
(
"test"
);
qualityApply
.
setUserName
(
"检测人"
);
qualityApply
.
setSampleCode
(
"001"
);
qualityApply
.
setSampleForm
(
"粉末"
);
qualityApply
.
setSampleName
(
"样品A"
);
qualityApply
.
setTeams
(
"[S,CO3,LiO2,H2Co3]"
);
qualityApply
.
setTeamGroupId
(
1
);
QualityApply
qualityApply1
=
new
QualityApply
();
qualityApply1
.
setCementCode
(
"test"
);
qualityApply1
.
setCreateTime
(
LocalDate
.
now
());
qualityApply1
.
setInputResult
(
"[1,2,3,4]"
);
qualityApply1
.
setProjectId
(
1
);
qualityApply1
.
setProjectName
(
"test"
);
qualityApply1
.
setUserName
(
"检测人"
);
qualityApply1
.
setSampleCode
(
"001"
);
qualityApply1
.
setSampleForm
(
"粉末"
);
qualityApply1
.
setSampleName
(
"样品A"
);
qualityApply1
.
setTeams
(
"[S,CO3,LiO2,H2Co3]"
);
qualityApply1
.
setTeamGroupId
(
1
);
list
.
add
(
qualityApply1
);
String
ss
=
"[\"S\",\"CO3\",\"LiO2\",\"H2Co3\"]"
;
list
.
add
(
qualityApply
);
List
<
String
>
a
=
new
ArrayList
<>();
a
.
add
(
"S"
);
a
.
add
(
"CO3"
);
a
.
add
(
"LiO2"
);
a
.
add
(
"H2Co3"
);
System
.
out
.
println
(
JSON
.
toJSONString
(
a
));
System
.
out
.
println
(
JSON
.
toJSONString
(
list
));
}
@PostMapping
(
"/export"
)
@ApiOperation
(
"导出质量监控"
)
public
void
exportQuality
(
String
startDate
,
String
endDate
,
HttpServletResponse
response
)
{
Date
startParse
=
DateUtil
.
parse
(
startDate
);
Date
endParse
=
DateUtil
.
parse
(
endDate
);
Date
startParse
=
null
;
if
(
StrUtil
.
isNotBlank
(
startDate
))
{
startParse
=
DateUtil
.
parse
(
startDate
);
}
Date
endParse
=
null
;
if
(
StrUtil
.
isNotBlank
(
endDate
))
{
endParse
=
DateUtil
.
parse
(
endDate
);
}
iQualityApplyService
.
exportQuality
(
startParse
,
endParse
,
response
);
}
}
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/controller/QualityController.java
View file @
8d2df675
...
...
@@ -62,10 +62,10 @@ public class QualityController {
if
(
records
.
size
()
==
0
)
{
return
BaseResponse
.
errorMsg
(
"没找到相关数据!"
);
}
List
<
Integer
>
projectIds
=
records
.
stream
().
map
(
EntrustVo:
:
get
Project
Id
).
collect
(
Collectors
.
toList
());
List
<
Integer
>
projectIds
=
records
.
stream
().
map
(
EntrustVo:
:
getId
).
collect
(
Collectors
.
toList
());
Set
<
Integer
>
qualityApplyIds
=
iQualityApplyService
.
selectQualityApplyStatusByProIds
(
projectIds
);
records
.
forEach
(
arg
->{
if
(
qualityApplyIds
.
contains
(
arg
.
get
Project
Id
())){
if
(
qualityApplyIds
.
contains
(
arg
.
getId
())){
arg
.
setStatusValue
(
"审核完成"
);
arg
.
setStatus
(
10
);
}
else
{
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/util/WordUtil.java
View file @
8d2df675
...
...
@@ -3,7 +3,6 @@ package cn.wise.sc.cement.business.util;
import
freemarker.template.Configuration
;
import
freemarker.template.Template
;
import
lombok.extern.slf4j.Slf4j
;
import
javax.servlet.ServletOutputStream
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.File
;
...
...
@@ -61,7 +60,6 @@ public class WordUtil {
out
=
new
OutputStreamWriter
(
fos
,
StandardCharsets
.
UTF_8
);
//变量替换
template
.
process
(
beanParams
,
out
);
FileInputStream
in
=
new
FileInputStream
(
file
);
byte
[]
buffer
=
new
byte
[
in
.
available
()];
...
...
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