记得上下班打卡 | git大法好,push需谨慎

Commit 402bd181 authored by 胡佳晨's avatar 胡佳晨

增加 场地拥有方可查看场地演出数据

parent aebe0466
...@@ -28,6 +28,7 @@ public class PerformancePartnerListDao implements Cloneable { ...@@ -28,6 +28,7 @@ public class PerformancePartnerListDao implements Cloneable {
private String timeStop; private String timeStop;
private Integer payCountdownMinute; private Integer payCountdownMinute;
private Integer auditStatus; private Integer auditStatus;
private Integer fieldAuditStatus;
private List<String> permissionId; private List<String> permissionId;
private String rejectTxt; private String rejectTxt;
private String createdAt; private String createdAt;
......
...@@ -296,7 +296,7 @@ public class MongoMerchantUtils { ...@@ -296,7 +296,7 @@ public class MongoMerchantUtils {
} }
} }
List<KylinPerformanceVo> performanceVos = mongoTemplate.find( 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())), // Query.query(criteria.orOperator(Criteria.where("merchantId").is(performancePartnerListParam.getMerchantId()))).with(Sort.by(orderBy, performancePartnerListParam.getOrderItem())),
KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName()); KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
//查询销量 //查询销量
...@@ -326,6 +326,7 @@ public class MongoMerchantUtils { ...@@ -326,6 +326,7 @@ public class MongoMerchantUtils {
dao.setAuditStatus(item.getAuditStatus()); dao.setAuditStatus(item.getAuditStatus());
dao.setRejectTxt(item.getRejectTxt()); dao.setRejectTxt(item.getRejectTxt());
dao.setCreatedAt(item.getCreatedAt()); dao.setCreatedAt(item.getCreatedAt());
dao.setFieldAuditStatus(item.getFieldAuditStatus());
int totalGeneral = 0; int totalGeneral = 0;
String timeSell = null; String timeSell = null;
String timeStop = null; String timeStop = null;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment