From 2922e51a7a8e657a8467c818ae16700e41ddac77 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 10 五月 2022 19:45:58 +0800
Subject: [PATCH] bug修复

---
 app/src/main/java/com/yeshi/makemoney/app/dao/goldcorn/GoldCornConsumeRecordDao.java |   74 ++++++++++++++++++++++--------------
 1 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/com/yeshi/makemoney/app/dao/goldcorn/GoldCornConsumeRecordDao.java b/app/src/main/java/com/yeshi/makemoney/app/dao/goldcorn/GoldCornConsumeRecordDao.java
index f61baac..fca2298 100644
--- a/app/src/main/java/com/yeshi/makemoney/app/dao/goldcorn/GoldCornConsumeRecordDao.java
+++ b/app/src/main/java/com/yeshi/makemoney/app/dao/goldcorn/GoldCornConsumeRecordDao.java
@@ -8,85 +8,100 @@
 
 import java.math.BigDecimal;
 import java.util.List;
+
 import com.yeshi.makemoney.app.entity.goldcorn.GoldCornConsumeType;
+
 import java.lang.Long;
 import java.util.Date;
+
 import org.yeshi.utils.mongo.MongodbBaseDao;
+
 import java.lang.String;
 import java.lang.Integer;
+
 import com.yeshi.makemoney.app.entity.goldcorn.GoldCornConsumeRecord;
+
 import java.util.ArrayList;
 
 
 @Repository
-public class GoldCornConsumeRecordDao extends MongodbBaseDao<GoldCornConsumeRecord>{
+public class GoldCornConsumeRecordDao extends MongodbBaseDao<GoldCornConsumeRecord> {
 
-  public void updateSelective(GoldCornConsumeRecord bean) {
+    public void updateSelective(GoldCornConsumeRecord bean) {
         Query query = new Query();
-        Update update=new Update();
+        Update update = new Update();
         query.addCriteria(Criteria.where("id").is(bean.getId()));
-        if(bean.getUid() != null) {
+        if (bean.getUid() != null) {
             update.set("uid", bean.getUid());
         }
-        if(bean.getCornNum() != null) {
+        if (bean.getCornNum() != null) {
             update.set("cornNum", bean.getCornNum());
         }
-        if(bean.getType() != null) {
+        if (bean.getType() != null) {
             update.set("type", bean.getType());
         }
-        if(bean.getMoney() != null) {
+        if (bean.getMoney() != null) {
             update.set("money", bean.getMoney());
         }
-        if(bean.getRemarks() != null) {
+        if (bean.getRemarks() != null) {
             update.set("remarks", bean.getRemarks());
         }
-        if(bean.getCreateTime() != null) {
+        if (bean.getCreateTime() != null) {
             update.set("createTime", bean.getCreateTime());
         }
         update.set("updateTime", new Date());
         update(query, update);
-  }
+    }
 
 
-  public List<GoldCornConsumeRecord> list(DaoQuery daoQuery){
+    public List<GoldCornConsumeRecord> list(DaoQuery daoQuery) {
         Query query = getQuery(daoQuery);
-        if (daoQuery.sortList!=null && daoQuery.sortList.size()>0){
+        if (daoQuery.sortList != null && daoQuery.sortList.size() > 0) {
             query.with(Sort.by(daoQuery.sortList));
         }
         query.skip(daoQuery.start);
         query.limit(daoQuery.count);
         return findList(query);
-  }
+    }
 
-  public long count(DaoQuery daoQuery){
-        Query query=getQuery(daoQuery);
+    public long count(DaoQuery daoQuery) {
+        Query query = getQuery(daoQuery);
         return count(query);
-  }
+    }
 
-  private Query getQuery(DaoQuery daoQuery){
-        List<Criteria> andList=new ArrayList<>();
-        if(daoQuery.uid!=null){
+    public Criteria getCriteria(DaoQuery daoQuery) {
+        List<Criteria> andList = new ArrayList<>();
+        if (daoQuery.uid != null) {
             andList.add(Criteria.where("uid").is(daoQuery.uid));
         }
-        if(daoQuery.type!=null){
+        if (daoQuery.type != null) {
             andList.add(Criteria.where("type").is(daoQuery.type));
         }
-        if(daoQuery.maxCreateTime!=null){
+        if (daoQuery.maxCreateTime != null) {
             andList.add(Criteria.where("createTime").lt(daoQuery.maxCreateTime));
         }
-        if(daoQuery.minCreateTime!=null){
+        if (daoQuery.minCreateTime != null) {
             andList.add(Criteria.where("createTime").gte(daoQuery.minCreateTime));
         }
-        Query query=new Query();
-        Criteria[]  ands=new Criteria[andList.size()];
+
+        Criteria[] ands = new Criteria[andList.size()];
         andList.toArray(ands);
-        if(ands.length>0){
-            query.addCriteria(new Criteria().andOperator(ands));
+        if (andList.size() > 0) {
+            return new Criteria().andOperator(ands);
+        }
+        return null;
+    }
+
+    private Query getQuery(DaoQuery daoQuery) {
+        Query query = new Query();
+        Criteria criteria = getCriteria(daoQuery);
+        if (criteria != null) {
+            query.addCriteria(criteria);
         }
         return query;
-  }
+    }
 
-  public static class DaoQuery{
+    public static class DaoQuery {
         public Long uid;
         public GoldCornConsumeType type;
         public Date maxCreateTime;
@@ -94,5 +109,6 @@
         public int start;
         public int count;
         public List<Sort.Order> sortList;
-  }
+        public String eventId;
+    }
 }

--
Gitblit v1.8.0