看板查询修改

src/main/java/com/neotel/smfcore/common/annotation/QueryCondition.java

@@ -16,6 +16,8 @@ public @interface QueryCondition {
 
 
     Type type() default Type.EQ;
     Type type() default Type.EQ;
 
 
+    boolean isDBId() default  false;
+
     /**
     /**
      * 多字段模糊搜索，仅支持String类型字段，多个用逗号隔开, 如@Query(blurry = "email,username")
      * 多字段模糊搜索，仅支持String类型字段，多个用逗号隔开, 如@Query(blurry = "email,username")
      */
      */

src/main/java/com/neotel/smfcore/common/utils/QueryHelp.java

 package com.neotel.smfcore.common.utils;
 package com.neotel.smfcore.common.utils;
 
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Lists;
 import com.neotel.smfcore.common.annotation.QueryCondition;
 import com.neotel.smfcore.common.annotation.QueryCondition;
@@ -38,6 +37,11 @@ public class QueryHelp {
                         if (ObjectUtil.isNull(val) || "".equals(val)) {
                         if (ObjectUtil.isNull(val) || "".equals(val)) {
                             continue;
                             continue;
                         }
                         }
+                        if (q.isDBId()){
+                            if(val.equals("0")){
+                                continue;
+                            }
+                        }
 
 
                         // 如果是多字段
                         // 如果是多字段
                         String blurry = q.blurry();
                         String blurry = q.blurry();

src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java

@@ -104,14 +104,15 @@ public class BoxKanbanController {
     @GetMapping("/task")
     @GetMapping("/task")
     @PreAuthorize("@el.check('boxkanban:list')")
     @PreAuthorize("@el.check('boxkanban:list')")
     public PageData<BoxTaskDto> info(BoxTaskQueryCriter criteria, Pageable pageable) {
     public PageData<BoxTaskDto> info(BoxTaskQueryCriter criteria, Pageable pageable) {
-        Query query = QueryHelp.getQuery(criteria); 
+        Query query = QueryHelp.getQuery(criteria);
         String groupId = criteria.getGroupId();
         String groupId = criteria.getGroupId();
         List<String> cidList = getCidsByGroupId(groupId,true);
         List<String> cidList = getCidsByGroupId(groupId,true);
         query.addCriteria(Criteria.where("cid").in(cidList));
         query.addCriteria(Criteria.where("cid").in(cidList));
 
 
         //只查找近12个小时未完成的任务
         //只查找近12个小时未完成的任务
+        //暂时改成48小时
         Calendar calendar = Calendar.getInstance();
         Calendar calendar = Calendar.getInstance();
-        calendar.add(Calendar.HOUR_OF_DAY, -12);
+        calendar.add(Calendar.HOUR_OF_DAY, -48);
         query.addCriteria(Criteria.where("createDate").gte(calendar.getTime()));
         query.addCriteria(Criteria.where("createDate").gte(calendar.getTime()));
 
 
         Calendar ca2 = Calendar.getInstance();
         Calendar ca2 = Calendar.getInstance();
@@ -124,8 +125,9 @@ public class BoxKanbanController {
         }//异常
         }//异常
         else if(criteria.getTaskStatus()==2){
         else if(criteria.getTaskStatus()==2){
             query.addCriteria(Criteria.where("updateDate").lte(ca2).and("status").in(OP_STATUS.EXECUTING.name()));
             query.addCriteria(Criteria.where("updateDate").lte(ca2).and("status").in(OP_STATUS.EXECUTING.name()));
-        }else if(criteria.getTaskStatus()==3){
-            query.addCriteria(Criteria.where("status").nin(OP_STATUS.WAIT.name()));
+        }//等待
+        else if(criteria.getTaskStatus()==3){
+            query.addCriteria(Criteria.where("status").is(OP_STATUS.WAIT.name()));
         }else{
         }else{
             query.addCriteria(Criteria.where("status").nin(OP_STATUS.CANCEL.name(), OP_STATUS.FINISHED.name()));
             query.addCriteria(Criteria.where("status").nin(OP_STATUS.CANCEL.name(), OP_STATUS.FINISHED.name()));
         }
         }

src/main/java/com/neotel/smfcore/core/kanban/rest/bean/query/BoxTaskQueryCriter.java

@@ -26,7 +26,7 @@ public class BoxTaskQueryCriter {
     private String cid;
     private String cid;
 
 
     @ApiModelProperty("料仓ID")
     @ApiModelProperty("料仓ID")
-    @QueryCondition
+    @QueryCondition(isDBId =true)
     private String storageId;
     private String storageId;
 
 
 
 

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -200,6 +200,9 @@ public class StoragePosController {
     @GetMapping("/find")
     @GetMapping("/find")
     @PreAuthorize("@el.check('storage:list')")
     @PreAuthorize("@el.check('storage:list')")
     public PageData<StoragePosDto> storagePosFind(StoragePosFindCriteria criteria, Pageable pageable,HttpServletRequest request){
     public PageData<StoragePosDto> storagePosFind(StoragePosFindCriteria criteria, Pageable pageable,HttpServletRequest request){
+        if(criteria.getStorageId()!=null&&criteria.getStorageId().equals("0")){
+            criteria.setStorageId(null);
+        }
         Query query= QueryHelp.getQuery(criteria);
         Query query= QueryHelp.getQuery(criteria);
         Criteria baseCriteria= Criteria.where("used").is(true);
         Criteria baseCriteria= Criteria.where("used").is(true);
 
 

src/main/java/com/neotel/smfcore/core/storage/rest/query/StoragePosQueryCriteria.java

@@ -16,7 +16,7 @@ public class StoragePosQueryCriteria {
     private BetweenData<Date> createDate;
     private BetweenData<Date> createDate;
 
 
 
 
-    @QueryCondition
+    @QueryCondition(isDBId =true)
     private String storageId;
     private String storageId;
     @QueryCondition(blurry = "barcode.barcode")
     @QueryCondition(blurry = "barcode.barcode")
     private String barcode;
     private String barcode;

src/main/java/com/neotel/smfcore/core/system/rest/bean/query/TaskQueryCondition.java

@@ -9,7 +9,6 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
 
 import java.util.Date;
 import java.util.Date;
-import java.util.List;
 
 
 @Data
 @Data
 @ApiModel("查询条件")
 @ApiModel("查询条件")
@@ -34,7 +33,7 @@ public class TaskQueryCondition {
     @QueryCondition
     @QueryCondition
     @ApiModelProperty("任务状态")
     @ApiModelProperty("任务状态")
     private String status;
     private String status;
-    @QueryCondition
+    @QueryCondition(isDBId =true)
     @ApiModelProperty("料仓Id")
     @ApiModelProperty("料仓Id")
     private String storageId;
     private String storageId;