库存列表查询

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/InventorySumReq.java

@@ -6,6 +6,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 
+import java.util.List;
+
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class InventorySumReq extends BaseRequest {
@@ -14,7 +16,7 @@ public class InventorySumReq extends BaseRequest {
     /**
      * 组织机构
      */
-    private Long orgId;
+    private String orgId;
 
     /**
      * 组织机构名称
@@ -38,6 +40,10 @@ public class InventorySumReq extends BaseRequest {
      */
     private String typeId;
     /**
+     * 类型IDs
+     */
+    public List<String>  typeIds;
+    /**
      * 类型名称
      */
     private String typeName;
@@ -49,7 +55,10 @@ public class InventorySumReq extends BaseRequest {
      * 号型名称
      */
     private String sizeName;
-
+    /**
+     * 号型名称集合
+     */
+    private List<String> sizeNames;
     /**
      * 排序规则
      */

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventorySummaryServiceImpl.java

@@ -87,7 +87,7 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
         //当没有参数传递的时候默认查询全部，但是如果传递了条件，根据条件查询并且如果是根据id进行查询，则需要判断该id是否存在
         //判断组织机构是否存在
         if (ObjectUtil.isNotNull(req.getOrgId())){
-            pubOrgService.PubOrgExist(req.getOrgId());
+            pubOrgService.PubOrgExist(Long.valueOf(req.getOrgId()));
         }
         //(如果传其他不是数据库字段参数或者排序规则不是deac或者asc可能会出现错误)
         if (ObjectUtil.isNotNull(req.getColumn()) && !req.getColumn().trim().isEmpty() &&
@@ -407,6 +407,10 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
         }
         //根据组织机构号查询
         wrapper.eq(ObjectUtil.isNotEmpty(req.getOrgId()), InventorySummary::getOrgId, req.getOrgId());
+//        wrapper.and(qw -> {
+//            qw.eq(ObjectUtil.isNotEmpty(req.getOrgId()), InventorySummary::getOrgId, req.getOrgId());
+//            // 其他条件...
+//        });
         //根据组织机构名模糊查询
         wrapper.like(ObjectUtil.isNotEmpty(req.getOrgName()), InventorySummary::getOrgName, req.getOrgName());
         //位置id（单警柜/仓库）
@@ -418,12 +422,22 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
         //装备类别名称
         wrapper.like(ObjectUtil.isNotEmpty(req.getTypeName()), InventorySummary::getTypeName, req.getTypeName());
         //根据类别
-        wrapper.eq(ObjectUtil.isNotEmpty(req.getTypeId()), InventorySummary::getTypeId, req.getTypeId());
+        if (req.typeIds.size()>0) {
+            wrapper.and(qw -> req.typeIds.forEach(typeId -> qw.or().eq(InventorySummary::getTypeId, typeId)));
+        }
+        //根据类别
+        if (req.getSizeNames().size()>0) {
+            wrapper.and(qw -> req.getSizeNames().forEach(sizeName -> qw.or().eq(InventorySummary::getSizeName, sizeName)));
+        }
         //型号名称
         wrapper.like(ObjectUtil.isNotEmpty(req.getSizeName()), InventorySummary::getSizeName, req.getSizeName());
         //号型
         wrapper.eq(ObjectUtil.isNotEmpty(req.getSizeId()), InventorySummary::getSizeId, req.getSizeId());
-        wrapper.last("order by " + req.getColumn() + " " + req.getOrder());
+        if (ObjectUtil.isNotEmpty(req.getColumn()))
+        {
+            wrapper.last("order by " + req.getColumn() + " " + req.getOrder());
+        }
+
 
         return wrapper;
     }

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java

@@ -764,7 +764,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                                 }
                             }
                             CommentEntity commentTransfer = (CommentEntity) comment;
-                
+
                             taskDetailVO.setComment(commentTransfer.getMessage());
                             taskDetailVO.setAttachmentVOList(attachmentVOList);
                             taskDetailVOS.add(taskDetailVO);