1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CostManagementInfoController.java

@@ -1,15 +1,13 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
-import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.CostManagementInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.CustomerInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.WeightedDetails;
 import com.yh.saas.plugin.yiliangyiyun.service.ICostManagementInfoService;
-import com.yh.saas.plugin.yiliangyiyun.service.IWeightedDetailsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * <p>
  * 成本管理信息 前端控制器
@@ -31,7 +29,7 @@ public class CostManagementInfoController {
      * @return
      */
     @GetMapping("/selectCostManagementInfo")
-    public Page<CostManagementInfo> selectCostManagementInfo(CostManagementInfo costManagementInfo) {
+    public List<CostManagementInfo> selectCostManagementInfo(CostManagementInfo costManagementInfo) {
         return costManagementInfoService.selectCostManagementInfo(costManagementInfo);
     }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/IdentityAuthenticationInfo.java

@@ -61,6 +61,14 @@ public class IdentityAuthenticationInfo extends BaseModel<IdentityAuthentication
      * 手机号
      */
     private String customerPhone;
+    /**
+     * 所属供应商
+     */
+    private String supplier;
+    /**
+     * 供应商电话
+     */
+    private String supplierPhone;
     /**
      * 收款人姓名
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICostManagementInfoService.java

@@ -1,9 +1,10 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
-import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.CostManagementInfo;
 import com.baomidou.mybatisplus.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 成本管理信息 服务类
@@ -20,7 +21,7 @@ public interface ICostManagementInfoService extends IService<CostManagementInfo>
      * @param costManagementInfo
      * @return
      */
-    Page<CostManagementInfo> selectCostManagementInfo(CostManagementInfo costManagementInfo);
+    List<CostManagementInfo> selectCostManagementInfo(CostManagementInfo costManagementInfo);
 
     /**
      * 编辑信息

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CostManagementInfoServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -42,17 +43,15 @@ public class CostManagementInfoServiceImpl extends ServiceImpl<CostManagementInf
      * @return
      */
     @Override
-    public Page<CostManagementInfo> selectCostManagementInfo(CostManagementInfo costManagementInfo) {
+    public List<CostManagementInfo> selectCostManagementInfo(CostManagementInfo costManagementInfo) {
         Wrapper<CostManagementInfo> costManagementInfoWrapper = new EntityWrapper<>();
         costManagementInfoWrapper.eq("warehouse_type", costManagementInfo.getWarehouseType());
         costManagementInfoWrapper.orderBy("warehouse_name");
         if (costManagementInfo.getWarehouseId()!=null&&!costManagementInfo.getWarehouseId().isEmpty()){
             costManagementInfoWrapper.eq("warehouse_id", costManagementInfo.getWarehouseId());
         }
-        Page<CostManagementInfo> costManagementInfoPage = this.selectPage(costManagementInfo.getQueryPage(), costManagementInfoWrapper);
-        int count = this.selectCount(costManagementInfoWrapper);
-        costManagementInfoPage.setSize(count);
-        return costManagementInfoPage;
+        List<CostManagementInfo> costManagementInfoList = this.selectList(costManagementInfoWrapper);
+        return costManagementInfoList;
     }