Merge branch 'master' into test

hx-purchase/src/main/java/com/fjhx/purchase/controller/purchase/PurchaseController.java

@@ -66,6 +66,14 @@ public class PurchaseController {
     }
 
     /**
+     * 批量查询采购单
+     */
+    @PostMapping("/getListInId")
+    public List<Purchase> getListInId(@RequestBody List<Long> ids) {
+        return purchaseService.getListInId(ids);
+    }
+
+    /**
      * 采购新增
      */
     @PostMapping("/add")

hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/PurchaseService.java

@@ -78,4 +78,11 @@ public interface PurchaseService extends BaseService<Purchase> {
      * 采购统计（采购列表）
      */
     Map<String,Object> purchaseStatistics(PurchaseSelectDto dto);
+
+    /**
+     * 批量查询
+     * @param ids
+     * @return
+     */
+    List<Purchase> getListInId(List<Long> ids);
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/impl/PurchaseServiceImpl.java

@@ -533,6 +533,17 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
         return map;
     }
 
+    /**
+     * 批量查询
+     * @param ids
+     * @return
+     */
+    @Override
+    public List<Purchase> getListInId(List<Long> ids) {
+        List<Purchase> list = this.list(Wrappers.<Purchase>query().lambda().in(Purchase::getId,ids));
+        return list;
+    }
+
     @Override
     public Page<? extends DocumentaryData> getDocumentaryPage(JSONObject selectData, BaseSelectDto
             dto, List<Long> excludeBusinessId) {