fix:新增客户管理基类字段status，添加查询公司名的功能

ruoyi-modules/ruoyi-customerManagement/src/main/java/org/dromara/customerManagement/controller/CustomerController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 import org.dromara.common.mybatis.core.page.PageQuery;
 
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * 客户管理接口
@@ -68,4 +69,8 @@ public class CustomerController extends BaseController {
     public void exportCustomerExcel(HttpServletResponse response) {
         ExcelUtil.exportTemplate(CollUtil.newArrayList(new HashMap<>(),customerService.selectList()),"客户管理列表.xlsx","excel/客户导出模板",response);
     }
+    @GetMapping("/getcompanyname")
+    public List<String> selectCompanyNameList() {
+        return customerService.selectCompanyNameList();
+    }
 }

ruoyi-modules/ruoyi-customerManagement/src/main/java/org/dromara/customerManagement/domain/Customer.java

@@ -58,4 +58,8 @@ public class Customer extends TenantEntity {
      * 总公司id
      */
     private Long pid;
+    /**
+     * 状态
+     */
+    private String status;
 }

ruoyi-modules/ruoyi-customerManagement/src/main/java/org/dromara/customerManagement/domain/bo/CustomerBo.java

@@ -65,4 +65,8 @@ public class CustomerBo extends BaseEntity {
      * 总公司id
      */
     private Long pid;
+    /**
+     * 状态
+     */
+    private String status;
 }

ruoyi-modules/ruoyi-customerManagement/src/main/java/org/dromara/customerManagement/domain/vo/CompanyVo.java

@@ -0,0 +1,9 @@
+package org.dromara.customerManagement.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class CompanyVo {
+    private String username;
+    private String factoryName;
+}

ruoyi-modules/ruoyi-customerManagement/src/main/java/org/dromara/customerManagement/domain/vo/CustomerVo.java

@@ -60,4 +60,8 @@ public class CustomerVo extends BaseEntity {
      * 总公司id
      */
     private Long pid;
+    /**
+     * 状态
+     */
+    private String status;
 }

ruoyi-modules/ruoyi-customerManagement/src/main/java/org/dromara/customerManagement/mapper/CustomerMapper.java

@@ -3,8 +3,12 @@ package org.dromara.customerManagement.mapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.customerManagement.domain.Customer;
+import org.dromara.customerManagement.domain.vo.CompanyVo;
 import org.dromara.customerManagement.domain.vo.CustomerVo;
 
+import java.util.List;
+
 @Mapper
 public interface CustomerMapper extends BaseMapperPlus<Customer, CustomerVo> {
+    List<CompanyVo> selectCompanyNameList();
 }

ruoyi-modules/ruoyi-customerManagement/src/main/java/org/dromara/customerManagement/service/CustomerService.java

@@ -42,4 +42,6 @@ public interface CustomerService {
     int deleteCustomerById(Long customerId);
 
     List<Customer> selectList();
+
+    List<String> selectCompanyNameList();
 }

ruoyi-modules/ruoyi-customerManagement/src/main/java/org/dromara/customerManagement/service/impl/CustomerServiceImpl.java

@@ -9,11 +9,13 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.customerManagement.domain.Customer;
 import org.dromara.customerManagement.domain.bo.CustomerBo;
+import org.dromara.customerManagement.domain.vo.CompanyVo;
 import org.dromara.customerManagement.domain.vo.CustomerVo;
 import org.dromara.customerManagement.mapper.CustomerMapper;
 import org.dromara.customerManagement.service.CustomerService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -73,4 +75,13 @@ public class CustomerServiceImpl implements CustomerService {
     public List<Customer> selectList() {
         return customerMapper.selectList();
     }
+
+    @Override
+    public List<String> selectCompanyNameList() {
+        List<String> companyNameList = new ArrayList<>();
+        for (CompanyVo companyVo : customerMapper.selectCompanyNameList()){
+            companyNameList.add(companyVo.getUsername()+"-"+companyVo.getFactoryName());
+        }
+        return companyNameList;
+    }
 }

ruoyi-modules/ruoyi-customerManagement/src/main/resources/mapper/CustomerMapper.xml

@@ -3,5 +3,7 @@
     PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.customerManagement.mapper.CustomerMapper">
-
+    <select id="selectCompanyNameList" resultType="org.dromara.customerManagement.domain.vo.CompanyVo">
+        SELECT username, factory_name FROM fa_kuyou_user
+    </select>
 </mapper>