Merge remote-tracking branch 'origin/bjcz_his_scrm' into 北京存在

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

@@ -6,8 +6,10 @@ import com.fs.common.core.domain.R;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.company.domain.CompanyConfig;
+import com.fs.company.domain.CompanyMiniapp;
 import com.fs.company.param.SaveCompanyMiniAppParam;
 import com.fs.company.service.ICompanyConfigService;
+import com.fs.company.service.ICompanyMiniappService;
 import com.fs.company.vo.CompanyMiniAppVO;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
@@ -32,6 +34,8 @@ public class CompanyConfigController extends BaseController
 
     @Autowired
     private ICompanyConfigService companyConfigService;
+    @Autowired
+    private ICompanyMiniappService companyMiniappService;
 
     @Autowired
     private TokenService tokenService;

fs-service/src/main/java/com/fs/company/mapper/CompanyConfigMapper.java

@@ -76,7 +76,7 @@ public interface CompanyConfigMapper
     @Select("select config_value from company_config where company_id=#{companyId} and config_key='redPacket:config' ")
     String selectRedPacketConfigByKey(Long companyId);
 
-    @Select("select \n" +
+/*    @Select("select \n" +
             "id,\n" +
             "name,\n" +
             "appid\n" +
@@ -84,6 +84,11 @@ public interface CompanyConfigMapper
             "fs_course_play_source_config\n" +
             "where \n" +
             "is_del = 0\n" +
-            "and FIND_IN_SET(#{companyId},set_company_ids)")
+            "and FIND_IN_SET(#{companyId},set_company_ids)")*/
+
+    @Select("SELECT cm.id,cm.company_id,cs.`name`,cm.app_id FROM  company_miniapp  cm\n" +
+            "LEFT JOIN fs_course_play_source_config   cs ON cm.app_id=cs.appid\n" +
+            "\n" +
+            "WHERE cm.`company_id` = #{companyId}")
     List<CompanyMiniAppVO> getCompanyMiniAppList(@Param("companyId") Long companyId);
 }

fs-service/src/main/java/com/fs/course/vo/FsCourseRedPacketLogListPVO.java

@@ -103,4 +103,6 @@ public class FsCourseRedPacketLogListPVO extends BaseEntity
 
     private Long deptId;
     private Long companyId;
+
+    private String createDate;
 }

fs-service/src/main/resources/mapper/course/FsCourseRedPacketLogMapper.xml

@@ -217,14 +217,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
     <select id="getReadPackageTotal" resultType="com.fs.course.vo.FsCourseRedPacketLogListPVO">
-        select c.company_name,l.company_id,sum(l.amount) as amount,l.create_time as createTime from fs_course_red_packet_log l
-        inner join company  c on c.company_id = l.company_id
-        WHERE  l.create_time &gt;= #{beginTime}
-        AND l.create_time &lt;#{endTime}
-        and l.status =1
+        SELECT
+        c.company_name,
+        t.company_id,
+        t.createDate,
+        t.amount
+        FROM (
+        SELECT
+        company_id,
+        DATE(create_time) as createDate,
+        SUM(amount) as amount
+        FROM fs_course_red_packet_log
+        WHERE create_time &gt;= #{beginTime}
+        AND create_time &lt; #{endTime}
+        AND status = 1
         <if test="companyId != null and  companyId != '' ">
-            and l.company_id = #{companyId}
+            and company_id = #{companyId}
         </if>
-        GROUP BY l.company_id
+        GROUP BY company_id, DATE(create_time)
+        ) t
+        INNER JOIN company c ON c.company_id = t.company_id
+        ORDER BY t.createDate DESC
     </select>
 </mapper>