dev

src/main/java/com/syjiaer/clinic/server/controller/common/ManagerUserController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.crypto.SecretKey;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -49,5 +50,13 @@ public class ManagerUserController extends BaseController {
         return success(managerUserService.verify());
     }
 
+    /**
+     * 所有人员信息
+     * @return
+     */
+    @RequestMapping("list")
+    public Result<List<ManagerUser>> list(){
+        return success(managerUserService.list());
+    }
 
 }

src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryPurchaseController.java

@@ -52,15 +52,7 @@ public class InventoryPurchaseController extends BaseController {
     @RequestMapping("/list")
     public Result<Page<InventoryPurchaseVo>> list() {
         PurchaseOrderQuery query = parmsUtil.getObject("query", PurchaseOrderQuery.class);
-        if (query == null) {
+
-            return error("没有带查询条件");
-        }
-        if (query.getPageNum() == null || query.getPageNum() == 0) {
-            query.setPageNum(1);
-        }
-        if (query.getPageSize() == null || query.getPageSize() == 0) {
-            query.setPageSize(Constants.DetailPageSize);
-        }
         return success(inventoryPurchaseService.listPage(query));
     }
 

src/main/java/com/syjiaer/clinic/server/entity/inventory/dto/PurchaseOrderQuery.java

@@ -3,10 +3,20 @@ package com.syjiaer.clinic.server.entity.inventory.dto;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 @Getter
 @Setter
 public class PurchaseOrderQuery {
     private Integer pageNum;
     private Integer pageSize;
+    private String code;
+    private List<Integer> supplierIds;
+    private List<Integer> managerUserIds;
+    private String beginTime;
+    private String endTime;
+
+
+
 
 }

src/main/java/com/syjiaer/clinic/server/service/common/ManagerUserService.java

@@ -22,6 +22,7 @@ import javax.crypto.SecretKey;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Service
@@ -59,5 +60,14 @@ public class ManagerUserService extends BaseService {
     return getManagerUser();
     }
 
+    /**
+     * 所有管理员
+     * @return
+     */
+    public List<ManagerUser> list() {
+        QueryWrapper<ManagerUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("id,name");
+        return managerUserMapper.selectList(queryWrapper);
 
     }
+}

src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryPurchaseService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.syjiaer.clinic.server.common.constants.Constants;
 import com.syjiaer.clinic.server.common.enums.*;
 import com.syjiaer.clinic.server.common.exception.MessageException;
+import com.syjiaer.clinic.server.common.util.DateUtil;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.entity.goods.Goods;
 import com.syjiaer.clinic.server.entity.inventory.*;
@@ -50,6 +51,7 @@ public class InventoryPurchaseService extends BaseService {
     private InventoryPurchaseMapper inventoryPurchaseMapper;
     @Autowired
     private InventoryPurchaseLogMapper inventoryPurchaseLogMapper;
+
     /*
      * 创建采购订单
      * @param inventoryPurchase 采购订单
@@ -170,6 +172,7 @@ public class InventoryPurchaseService extends BaseService {
 
     /**
      * 已有采购单，添加新商品
+     *
      * @param inventory 采购的商品
      */
     @Transactional(rollbackFor = Exception.class)
@@ -257,12 +260,43 @@ public class InventoryPurchaseService extends BaseService {
 
     /**
      * 分页查询采购单
+     *
      * @param query 查询条件
      * @return
      */
 
     public Page<InventoryPurchaseVo> listPage(PurchaseOrderQuery query) {
+        if (query == null) {
+            throw new MessageException("没有带查询条件");
+        }
+
+        if (query.getPageNum() == null || query.getPageNum() == 0) {
+            query.setPageNum(1);
+        }
+        if (query.getPageSize() == null || query.getPageSize() == 0) {
+            query.setPageSize(Constants.DetailPageSize);
+        }
+
+
         QueryWrapper<InventoryPurchase> queryWrapper = new QueryWrapper<>();
+
+        if (query.getCode() != null && !query.getCode().isEmpty()) {
+            queryWrapper.like("code", query.getCode().trim());
+        }
+        if (query.getSupplierIds() != null && !query.getSupplierIds().isEmpty()) {
+            queryWrapper.in("supplier_id", query.getSupplierIds());
+        }
+        if (query.getManagerUserIds() != null && !query.getManagerUserIds().isEmpty()) {
+            queryWrapper.in("manager_user_id", query.getManagerUserIds());
+        }
+        if (query.getBeginTime() != null && !query.getBeginTime().isEmpty()) {
+            LocalDateTime beginTime = DateUtil.getDateTime(query.getBeginTime());
+            queryWrapper.ge("create_datetime", beginTime);
+        }
+        if (query.getEndTime() != null && !query.getEndTime().isEmpty()) {
+            LocalDateTime endTime = DateUtil.getDateTime(query.getEndTime());
+            queryWrapper.le("create_datetime", endTime);
+        }
         Page<InventoryPurchase> page = pageHelper(query.getPageNum(), query.getPageSize(),
                 queryWrapper, inventoryPurchaseMapper, "create_datetime", false);
         List<InventoryPurchaseVo> voList = new ArrayList<>();
@@ -282,6 +316,7 @@ public class InventoryPurchaseService extends BaseService {
 
     /**
      * 获取采购单详情信息
+     *
      * @param code 采购单号
      * @return inventoryOrderGoodsList 商品信息  inventoryOrder 采购单信息
      */
@@ -313,8 +348,10 @@ public class InventoryPurchaseService extends BaseService {
         return map;
     }
 
-    /**.
+    /**
+     * .
      * 更新采购单基本信息
+     *
      * @param inventoryOrder 采购单信息
      */
     public void updateById(InventoryPurchase inventoryOrder) {
@@ -331,6 +368,7 @@ public class InventoryPurchaseService extends BaseService {
 
     /**
      * 采购单中商品退货
+     *
      * @param list inventory表idList
      */
     @Transactional(rollbackFor = Exception.class)