添加已采购采购人列表

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

@@ -2,8 +2,8 @@ package com.fjhx.purchase.controller.purchase;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.fjhx.common.constant.SourceConstant;
-import com.fjhx.purchase.entity.purchase.dto.PurchasePayRecordDto;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.purchase.entity.purchase.vo.PurchaseVo;
@@ -96,4 +96,12 @@ public class PurchaseController {
         return purchaseService.paymentBill(purchaseDto);
     }
 
+    /**
+     * 获取已采购 采购人列表
+     */
+    @GetMapping("/getPurchaseUserList")
+    public List<SysUser> getPurchaseUserList() {
+        return purchaseService.getPurchaseUserList();
+    }
+
 }

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

@@ -2,12 +2,11 @@ package com.fjhx.purchase.service.purchase;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.purchase.entity.purchase.dto.PurchaseDto;
-import com.fjhx.purchase.entity.purchase.dto.PurchasePayRecordDto;
 import com.fjhx.purchase.entity.purchase.dto.PurchaseSelectDto;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.fjhx.purchase.entity.purchase.vo.PurchaseVo;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.service.BaseService;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -65,4 +64,8 @@ public interface PurchaseService extends BaseService<Purchase> {
      */
     Page<PurchaseDto> paymentBill(PurchaseSelectDto purchaseDto);
 
+    /**
+     * 获取已采购 采购人列表
+     */
+    List<SysUser> getPurchaseUserList();
 }

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

@@ -17,7 +17,6 @@ import com.fjhx.common.entity.documentary.bo.DocumentaryData;
 import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.common.service.documentary.GetDocumentaryBusinessTemplate;
-import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.item.entity.product.vo.ProductInfoVo;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.purchase.entity.invoice.vo.InvoiceDetailsVo;
@@ -40,7 +39,6 @@ import com.fjhx.purchase.service.invoice.InvoiceDetailsService;
 import com.fjhx.purchase.service.pay.PayDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseDetailService;
 import com.fjhx.purchase.service.purchase.PurchasePayRecordDetailService;
-import com.fjhx.purchase.service.purchase.PurchasePayRecordService;
 import com.fjhx.purchase.service.purchase.PurchaseService;
 import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
 import com.fjhx.purchase.service.subscribe.SubscribeService;
@@ -50,9 +48,11 @@ import com.fjhx.wms.entity.warehouse.po.Warehouse;
 import com.fjhx.wms.service.warehouse.WarehouseService;
 import com.obs.services.internal.ServiceException;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.system.service.ISysUserService;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -96,9 +96,6 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
     private ArrivalDetailService arrivalDetailService;
 
     @Autowired
-    private CustomerService customerService;
-
-    @Autowired
     WarehouseService warehouseService;
 
     @Autowired
@@ -113,8 +110,9 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
     private CodingRuleService codingRuleService;
     @Autowired
     private PurchasePayRecordDetailService purchasePayRecordDetailService;
+
     @Autowired
-    private PurchasePayRecordService purchasePayRecordService;
+    private ISysUserService userService;
 
     /**
      * 列表
@@ -239,7 +237,7 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
                     JSONObject json = JSONObject.parseObject(victoriatouristJson);
                     String warehouseName = warehousesMap.get(json.getLong("receiptWarehouseId"));
                     json.put("receiptWarehouseName", warehouseName);
-                    purchaseVo.setVictoriatouristJson(JSONObject.toJSONString(json,JSONWriter.Feature.WriteLongAsString));
+                    purchaseVo.setVictoriatouristJson(JSONObject.toJSONString(json, JSONWriter.Feature.WriteLongAsString));
                 }
             }
             //赋值到货状态
@@ -490,4 +488,15 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
 
         return page;
     }
+
+    /**
+     * 获取已采购 采购人列表
+     */
+    @Override
+    public List<SysUser> getPurchaseUserList() {
+        List<Long> createUserIds = listObject(Purchase::getCreateUser, q -> q.groupBy(Purchase::getCreateUser));
+        List<SysUser> listByUserId = userService.getListByUserId(createUserIds);
+        listByUserId.forEach(item -> item.setPassword(null));
+        return listByUserId;
+    }
 }