Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

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

@@ -7,6 +7,8 @@ import com.yh.saas.plugin.yiliangyiyun.service.ICustomerInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * <p>
  * 客户信息 前端控制器
@@ -85,5 +87,14 @@ public class CustomerInfoController {
     public void deleteCustomerInfo(@RequestBody CustomerInfo example) {
         customerInfoService.deleteCustomerInfo(example.getId());
     }
+    /**
+     * 客户下拉列表
+     * @param compId
+     * @return
+     */
+    @GetMapping("/customerList")
+    public List<CustomerInfo> customerList(@RequestParam String compId) {
+        return customerInfoService.customerList(compId);
+    }
 }
 

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.CustomerInfo;
 import com.baomidou.mybatisplus.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 客户信息 服务类
@@ -51,4 +53,10 @@ public interface ICustomerInfoService extends IService<CustomerInfo> {
      * @param id
      */
     void deleteCustomerInfo(String id);
+    /**
+     * 客户下拉列表
+     * @param compId
+     * @return
+     */
+    List<CustomerInfo> customerList(String compId);
 }

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

@@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.common.support.util.IdGenerator;
-import com.yh.saas.plugin.yiliangyiyun.entity.CustomerInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.PurchaseOrder;
-import com.yh.saas.plugin.yiliangyiyun.entity.SaleOrder;
-import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.mapper.CustomerInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.ICustomerInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
@@ -215,4 +212,16 @@ public class CustomerInfoServiceImpl extends ServiceImpl<CustomerInfoMapper, Cus
         this.deleteById(customerInfo.getId());
     }
 
+    /**
+     * 客户下拉列表
+     * @param compId
+     * @return
+     */
+    @Override
+    public List<CustomerInfo> customerList(String compId) {
+        List<CustomerInfo> customerInfoList=this.selectList(new EntityWrapper<CustomerInfo>()
+        .eq("comp_id",compId).eq("delete_flag", NumberConstant.CONSTANT0));
+        return customerInfoList;
+    }
+
 }