Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
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
bb485650
Commit
bb485650
authored
Nov 05, 2020
by
qinhu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
质量管理bug修改
parent
27032be5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
45 additions
and
28 deletions
+45
-28
QualityApplyController.java
...sc/cement/business/controller/QualityApplyController.java
+45
-28
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/controller/QualityApplyController.java
View file @
bb485650
package
cn
.
wise
.
sc
.
cement
.
business
.
controller
;
package
cn
.
wise
.
sc
.
cement
.
business
.
controller
;
import
cn.hutool.core.collection.CollectionUtil
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.util.StrUtil
;
import
cn.hutool.core.util.StrUtil
;
import
cn.wise.sc.cement.business.entity.QualityApply
;
import
cn.wise.sc.cement.business.entity.QualityApply
;
...
@@ -24,6 +25,8 @@ import java.time.LocalDate;
...
@@ -24,6 +25,8 @@ import java.time.LocalDate;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.stream.Collectors
;
/**
/**
* <p>
* <p>
...
@@ -40,37 +43,51 @@ import java.util.List;
...
@@ -40,37 +43,51 @@ import java.util.List;
@RequestMapping
(
"/business/qualityApply"
)
@RequestMapping
(
"/business/qualityApply"
)
public
class
QualityApplyController
{
public
class
QualityApplyController
{
final
final
IQualityApplyService
iQualityApplyService
;
IQualityApplyService
iQualityApplyService
;
public
QualityApplyController
(
IQualityApplyService
iQualityApplyService
)
{
public
QualityApplyController
(
IQualityApplyService
iQualityApplyService
)
{
this
.
iQualityApplyService
=
iQualityApplyService
;
this
.
iQualityApplyService
=
iQualityApplyService
;
}
}
@PostMapping
(
"/apply"
)
@PostMapping
(
"/apply"
)
@ApiOperation
(
"质量详情审核"
)
@ApiOperation
(
"质量详情审核"
)
public
BaseResponse
<
Boolean
>
applyQuality
(
@RequestBody
List
<
QualityApply
>
qualityApply
)
{
public
BaseResponse
<
Boolean
>
applyQuality
(
@RequestBody
List
<
QualityApply
>
qualityApply
)
{
boolean
save
=
iQualityApplyService
.
saveBatch
(
qualityApply
);
if
(
save
)
{
return
BaseResponse
.
okData
(
true
);
}
else
{
return
BaseResponse
.
errorMsg
(
"添加失败!"
);
}
}
@PostMapping
(
"/export"
)
Set
<
Integer
>
groupIds
=
qualityApply
@ApiOperation
(
"导出质量监控"
)
.
stream
().
map
(
QualityApply:
:
getTeamGroupId
).
collect
(
Collectors
.
toSet
());
public
void
exportQuality
(
String
startDate
,
String
endDate
,
HttpServletResponse
response
)
{
QueryWrapper
<
QualityApply
>
qw
=
new
QueryWrapper
<>();
Set
<
Integer
>
projectIds
=
qualityApply
.
stream
().
map
(
QualityApply:
:
getProjectId
).
collect
(
Collectors
.
toSet
());
if
(
CollectionUtil
.
isEmpty
(
qualityApply
)
&&
CollectionUtil
.
isEmpty
(
groupIds
)
&&
CollectionUtil
.
isEmpty
(
projectIds
))
{
return
BaseResponse
.
okData
(
true
);
}
Date
startParse
=
null
;
qw
.
eq
(
"project_id"
,
projectIds
.
iterator
().
next
());
if
(
StrUtil
.
isNotBlank
(
startDate
))
{
qw
.
in
(
"team_group_id"
,
groupIds
);
startParse
=
DateUtil
.
parse
(
startDate
);
iQualityApplyService
.
remove
(
qw
);
}
boolean
save
=
iQualityApplyService
.
saveBatch
(
qualityApply
);
Date
endParse
=
null
;
if
(
save
)
{
if
(
StrUtil
.
isNotBlank
(
endDate
))
{
return
BaseResponse
.
okData
(
true
);
endParse
=
DateUtil
.
parse
(
endDate
);
}
else
{
}
return
BaseResponse
.
errorMsg
(
"添加失败!"
);
iQualityApplyService
.
exportQuality
(
startParse
,
endParse
,
response
);
}
}
}
@PostMapping
(
"/export"
)
@ApiOperation
(
"导出质量监控"
)
public
void
exportQuality
(
String
startDate
,
String
endDate
,
HttpServletResponse
response
)
{
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
);
}
}
}
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