Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
customer-service
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
QG
customer-service
Commits
5449a841
Commit
5449a841
authored
Jun 06, 2024
by
yajun.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加查询时间条件
parent
feccee0b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
ThirdWorkOrderExportVo.java
...stomer/rest/vo/thirdworkorder/ThirdWorkOrderExportVo.java
+2
-0
ThirdWorkOrderServiceImpl.java
...roup/customer/service/impl/ThirdWorkOrderServiceImpl.java
+3
-1
No files found.
src/main/java/cn/quantgroup/customer/rest/vo/thirdworkorder/ThirdWorkOrderExportVo.java
View file @
5449a841
package
cn
.
quantgroup
.
customer
.
rest
.
vo
.
thirdworkorder
;
package
cn
.
quantgroup
.
customer
.
rest
.
vo
.
thirdworkorder
;
import
com.alibaba.excel.annotation.ExcelIgnore
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
...
@@ -112,6 +113,7 @@ public class ThirdWorkOrderExportVo implements Serializable {
...
@@ -112,6 +113,7 @@ public class ThirdWorkOrderExportVo implements Serializable {
/**
/**
* 订单状态
* 订单状态
*/
*/
@ExcelIgnore
private
Integer
orderStatus
;
private
Integer
orderStatus
;
...
...
src/main/java/cn/quantgroup/customer/service/impl/ThirdWorkOrderServiceImpl.java
View file @
5449a841
...
@@ -264,7 +264,9 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
...
@@ -264,7 +264,9 @@ public class ThirdWorkOrderServiceImpl implements IThirdWorkOrderService {
if
(
StringUtils
.
isNotBlank
(
param
.
getAcceptUser
())){
if
(
StringUtils
.
isNotBlank
(
param
.
getAcceptUser
())){
conditionSql
.
append
(
"and assignee.assignee='"
+
param
.
getAcceptUser
()+
"' "
);
conditionSql
.
append
(
"and assignee.assignee='"
+
param
.
getAcceptUser
()+
"' "
);
}
}
if
(
StringUtils
.
isNotBlank
(
param
.
getStartTime
())
&&
StringUtils
.
isNotBlank
(
param
.
getEndTime
())
)
{
conditionSql
.
append
(
"and lc.create_time >='"
+
param
.
getStartTime
()
+
"' and lc.create_time <= '"
+
param
.
getEndTime
()+
"'"
);
}
if
(
StringUtils
.
isNotBlank
(
conditionSql
.
toString
())){
if
(
StringUtils
.
isNotBlank
(
conditionSql
.
toString
())){
sql
.
append
(
" where "
+
conditionSql
.
toString
().
substring
(
3
));
sql
.
append
(
" where "
+
conditionSql
.
toString
().
substring
(
3
));
countSql
.
append
(
" where "
+
conditionSql
.
toString
().
substring
(
3
));
countSql
.
append
(
" where "
+
conditionSql
.
toString
().
substring
(
3
));
...
...
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