Merge remote-tracking branch 'origin/master'

fs-company/src/main/java/com/fs/company/controller/CompanyController.java

@@ -7,9 +7,11 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.company.domain.Company;
 import com.fs.company.domain.CompanySms;
 import com.fs.company.domain.CompanyVoice;
+import com.fs.company.param.CompanyParam;
 import com.fs.company.service.ICompanyService;
 import com.fs.company.service.ICompanySmsService;
 import com.fs.company.service.ICompanyVoiceService;
+import com.fs.company.vo.CompanyNameVO;
 import com.fs.core.security.LoginUser;
 import com.fs.core.web.service.TokenService;
 import com.fs.his.vo.OptionsVO;
@@ -38,6 +40,19 @@ public class CompanyController extends BaseController
     @Autowired
     private TokenService tokenService;
 
+
+    /**
+     * 查询企业列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CompanyParam param)
+    {
+        startPage();
+        List<CompanyNameVO> list = companyService.selectCompanyNameVOList(param);
+        return getDataTable(list);
+    }
+
+
     @GetMapping(value = "/getCompanyInfo")
     public R getCompanyInfo()
     {

fs-company/src/main/resources/application-druid.yml

@@ -125,3 +125,13 @@ spring:
                     wall:
                         config:
                             multi-statement-allow: true
+rocketmq:
+    name-server: rmq-1243b25nj.rocketmq.gz.public.tencenttdmq.com:8080 # RocketMQ NameServer 地址
+    producer:
+        group: my-producer-group
+        access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
+        secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey
+    consumer:
+        group: test-group
+        access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
+        secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey

fs-company/src/main/resources/application.yml

@@ -43,7 +43,8 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: dev
+#    active: dev
+    active: druid
     include: config
   # 文件上传
   servlet:

fs-service-system/src/main/java/com/fs/company/mapper/CompanyMapper.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.fs.company.domain.Company;
 import com.fs.company.param.CompanyParam;
 import com.fs.company.vo.CompanyCrmVO;
+import com.fs.company.vo.CompanyNameVO;
 import com.fs.company.vo.CompanyVO;
 import com.fs.his.vo.OptionsVO;
 import org.apache.ibatis.annotations.Param;
@@ -84,6 +85,23 @@ public interface CompanyMapper
             "</script>"})
     List<CompanyVO> selectCompanyVOList(@Param("maps")CompanyParam param);
 
+    @Select({"<script> " +
+            "select c.* " +
+            "from company c " +
+            "where is_del=0 " +
+            "<if test = 'maps.companyId != null  '> " +
+            "and c.company_id = #{maps.companyId}" +
+            "</if>" +
+            "<if test = 'maps.companyName != null and  maps.companyName !=\"\"     '> " +
+            "and c.company_name like CONCAT('%',#{maps.companyName},'%') " +
+            "</if>" +
+            "<if test = 'maps.status != null   '> " +
+            "and c.status = #{maps.status}" +
+            "</if>" +
+            "order by c.company_id asc " +
+            "</script>"})
+    List<CompanyNameVO> selectCompanyNameVOList(@Param("maps")CompanyParam param);
+
     @Select({"<script> " +
             "select c.*,a.api_name as voice_api_name,u.user_name " +
             " ,(select count(1) from crm_customer cc where c.company_id= cc.company_id and date_format(cc.update_time,'%y%m%d') = date_format(now(),'%y%m%d') ) as now_day_customer_count " +

fs-service-system/src/main/java/com/fs/company/service/ICompanyService.java

@@ -8,6 +8,7 @@ import com.fs.common.core.domain.R;
 import com.fs.company.domain.Company;
 import com.fs.company.param.CompanyParam;
 import com.fs.company.vo.CompanyCrmVO;
+import com.fs.company.vo.CompanyNameVO;
 import com.fs.company.vo.CompanyVO;
 import com.fs.store.domain.FsStoreOrder;
 import com.fs.store.domain.FsStorePayment;
@@ -72,6 +73,9 @@ public interface ICompanyService
 
     List<CompanyVO> selectCompanyVOList(CompanyParam param);
 
+    List<CompanyNameVO> selectCompanyNameVOList(CompanyParam param);
+
+
     List<CompanyCrmVO> selectCompanyCrmDayCountList(CompanyParam param);
 
     Integer selectCompanyCount();

fs-service-system/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -10,6 +10,7 @@ import com.fs.company.domain.*;
 import com.fs.company.mapper.*;
 import com.fs.company.param.CompanyParam;
 import com.fs.company.vo.CompanyCrmVO;
+import com.fs.company.vo.CompanyNameVO;
 import com.fs.company.vo.CompanyVO;
 import com.fs.course.mapper.FsCourseRedPacketLogMapper;
 import com.fs.store.config.StoreConfig;
@@ -208,6 +209,11 @@ public class CompanyServiceImpl implements ICompanyService
         return companyMapper.selectCompanyVOList(param);
     }
 
+    @Override
+    public List<CompanyNameVO> selectCompanyNameVOList(CompanyParam param) {
+        return companyMapper.selectCompanyNameVOList(param);
+    }
+
     @Override
     public List<CompanyCrmVO> selectCompanyCrmDayCountList(CompanyParam param) {
         return companyMapper.selectCompanyCrmDayCountList(param);

fs-service-system/src/main/java/com/fs/company/vo/CompanyNameVO.java

@@ -0,0 +1,20 @@
+package com.fs.company.vo;
+
+import com.fs.common.annotation.Excel;
+import lombok.Data;
+
+@Data
+public class CompanyNameVO {
+
+    /** ID */
+    private Long companyId;
+
+    /** 企业名 */
+    @Excel(name = "企业名")
+    private String companyName;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Integer status;
+
+}