Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
8timerv2
8timerapiv200
Commits
75b48506
Commit
75b48506
authored
May 05, 2020
by
邓实川
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
接口优化
parent
acc324c5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
src/main/java/cn/timer/api/controller/qyzx/QyzxBusinessController.java
+3
-1
src/main/java/cn/timer/api/controller/yggl/YgglController.java
+2
-1
No files found.
src/main/java/cn/timer/api/controller/qyzx/QyzxBusinessController.java
View file @
75b48506
...
...
@@ -238,7 +238,9 @@ public class QyzxBusinessController {
@ApiOperation
(
value
=
"开发票"
,
httpMethod
=
"POST"
,
notes
=
"接口发布说明"
)
public
Result
<
QyzxInvoiceData
>
generateOrder
(
@CurrentUser
UserBean
userBean
,
@RequestBody
QyzxInvoiceData
qyzxInvoiceData
)
{
if
(!
ObjectUtil
.
isAllNotEmpty
(
qyzxInvoiceData
,
qyzxInvoiceData
.
getInvoiceTitle
(),
if
(!
ObjectUtil
.
isAllNotEmpty
(
// qyzxInvoiceData,
qyzxInvoiceData
.
getInvoiceTitle
(),
qyzxInvoiceData
.
getDutyParagraph
(),
qyzxInvoiceData
.
getCompanyAddress
(),
qyzxInvoiceData
.
getCompanyPhone
(),
qyzxInvoiceData
.
getBankName
(),
qyzxInvoiceData
.
getBankAccount
(),
qyzxInvoiceData
.
getInvoiceType
(),
qyzxInvoiceData
.
getInvoiceProject
(),
...
...
src/main/java/cn/timer/api/controller/yggl/YgglController.java
View file @
75b48506
...
...
@@ -432,7 +432,8 @@ public class YgglController {
ygQueryDto
.
getTotalPage
()
==
null
?
10
:
ygQueryDto
.
getTotalPage
());
QueryWrapper
<
YgglMainEmp
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
select
(
"name"
,
"emp_num"
,
"bmgw_id"
,
"rz_time"
,
"job_type"
,
"phone"
,
"job_status"
)
.
ne
(
"job_status"
,
YgEnumInterface
.
jobStatus
.
YILIZHI
.
getType
()).
eq
(
"org_code"
,
orgCode
)
.
ne
(
"job_status"
,
YgEnumInterface
.
jobStatus
.
YILIZHI
.
getType
())
.
eq
(
"org_code"
,
orgCode
)
.
eq
(
t
!=
null
&&
t
>
-
1
,
"job_type"
,
t
).
eq
(
j
!=
null
&&
j
>
-
1
,
"job_status"
,
j
)
.
in
(!
bList
.
isEmpty
(),
"bmgw_id"
,
bList
)
.
and
(!
StrUtil
.
hasBlank
(
q
),
wq
->
wq
.
like
(
"name"
,
q
).
or
().
like
(
"phone"
,
q
));
...
...
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