记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
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
董敬伟
liquidnet-bus-v1
Commits
402bd181
Commit
402bd181
authored
Dec 02, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加 场地拥有方可查看场地演出数据
parent
aebe0466
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
PerformancePartnerListDao.java
...iquidnet/service/kylin/dao/PerformancePartnerListDao.java
+1
-0
MongoMerchantUtils.java
...m/liquidnet/service/merchant/util/MongoMerchantUtils.java
+2
-1
No files found.
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformancePartnerListDao.java
View file @
402bd181
...
...
@@ -28,6 +28,7 @@ public class PerformancePartnerListDao implements Cloneable {
private
String
timeStop
;
private
Integer
payCountdownMinute
;
private
Integer
auditStatus
;
private
Integer
fieldAuditStatus
;
private
List
<
String
>
permissionId
;
private
String
rejectTxt
;
private
String
createdAt
;
...
...
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/util/MongoMerchantUtils.java
View file @
402bd181
...
...
@@ -296,7 +296,7 @@ public class MongoMerchantUtils {
}
}
List
<
KylinPerformanceVo
>
performanceVos
=
mongoTemplate
.
find
(
Query
.
query
(
new
Criteria
().
orOperator
(
criteria
,
Criteria
.
where
(
"merchantId"
).
is
(
performancePartnerListParam
.
getMerchantId
()))).
with
(
Sort
.
by
(
orderBy
,
performancePartnerListParam
.
getOrderItem
())),
Query
.
query
(
new
Criteria
().
orOperator
(
criteria
,
Criteria
.
where
(
"merchantId"
).
is
(
performancePartnerListParam
.
getMerchantId
()))).
with
(
Sort
.
by
(
orderBy
,
performancePartnerListParam
.
getOrderItem
())),
// Query.query(criteria.orOperator(Criteria.where("merchantId").is(performancePartnerListParam.getMerchantId()))).with(Sort.by(orderBy, performancePartnerListParam.getOrderItem())),
KylinPerformanceVo
.
class
,
KylinPerformanceVo
.
class
.
getSimpleName
());
//查询销量
...
...
@@ -326,6 +326,7 @@ public class MongoMerchantUtils {
dao
.
setAuditStatus
(
item
.
getAuditStatus
());
dao
.
setRejectTxt
(
item
.
getRejectTxt
());
dao
.
setCreatedAt
(
item
.
getCreatedAt
());
dao
.
setFieldAuditStatus
(
item
.
getFieldAuditStatus
());
int
totalGeneral
=
0
;
String
timeSell
=
null
;
String
timeStop
=
null
;
...
...
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