Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/statis/domain/FsStatisSalerWatch.java

@@ -24,6 +24,11 @@ public class FsStatisSalerWatch {
      */
     private Long id;
 
+    private Long companyId;
+
+    @Excel(name = "所属公司")
+    private String companyName;
+
     /**
      * 部门
      */

fs-service/src/main/resources/mapper/statis/FsStatisSalerWatchMapper.xml

@@ -192,6 +192,7 @@
     </select>
     <select id="queryListExport" resultType="com.fs.statis.domain.FsStatisSalerWatch">
         SELECT
+        concat(u.company_id,'_',c.company_name) as company_name,
         concat(u.user_name,'_',u.nick_name) as company_user_name,
         ANY_VALUE(concat(dept.dept_id,'_',dept.dept_name)) as dept_name,
         SUM(watch.train_camp_num) as train_camp_num,
@@ -219,6 +220,8 @@
         on dept.del_flag=0 and watch.dept_id=dept.dept_id
         LEFT JOIN company_user u
         on u.del_flag=0 and watch.company_user_id=u.user_id
+        LEFT JOIN company c
+        on c.company_id=u.company_id
         <where>
             <if test="userIds != null and userIds.size() > 0">
                 AND watch.company_user_id IN
@@ -245,6 +248,7 @@
             </choose>
         </where>
         GROUP BY watch.company_user_id
+        order by u.company_id
     </select>
     <select id="generateSopData" resultType="com.fs.statis.domain.FsStatisSalerWatch">
         INSERT INTO fs_statis_saler_watch (