Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/statis/mapper/ConsumptionBalanceMapper.java

@@ -141,4 +141,6 @@ public interface ConsumptionBalanceMapper {
     BigDecimal getCurrentBalanceCompanyId(@Param("companyId") Long companyId);
 
     Long smsBalanceCompany(@Param("companyId") Long companyId);
+
+    Long selectFsCourseTrafficLogCount(AnalysisPreviewQueryDTO param);
 }

fs-service/src/main/java/com/fs/statis/service/impl/StatisticsCompanyServiceImpl.java

@@ -29,6 +29,7 @@ import com.hc.openapi.tool.util.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.util.Asserts;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -83,6 +84,9 @@ public class StatisticsCompanyServiceImpl implements IStatisticsCompanyService {
 
     @Autowired
     private QwUserMapper qwUserMapper;
+
+    @Value("${cloud_host.company_name}")
+    private String signProjectName;
     @Override
     public void dataOverviewTask() {
         List<OptionsVO> optionsVOS = companyService.selectAllCompanyList(null);
@@ -882,7 +886,12 @@ public class StatisticsCompanyServiceImpl implements IStatisticsCompanyService {
             dto.setCompletedRate("0");
         }
 
-        Long watchCount = consumptionBalanceMapper.queryWatchCount(param);
+        Long watchCount = null;
+        if("泽林文化".equals(signProjectName)){
+            watchCount =   consumptionBalanceMapper.selectFsCourseTrafficLogCount(param);
+        }else {
+            watchCount = consumptionBalanceMapper.queryWatchCount(param);
+        }
         Long completedCount = consumptionBalanceMapper.queryCompletedCount(param);
 
         if(watchCount == null){

fs-service/src/main/java/com/fs/statis/service/impl/StatisticsServiceImpl.java

@@ -34,6 +34,7 @@ import com.hc.openapi.tool.util.ObjectUtils;
 import com.hc.openapi.tool.util.StringUtils;
 import org.apache.http.util.Asserts;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -89,7 +90,8 @@ public class StatisticsServiceImpl implements IStatisticsService {
     @Autowired
     private IQwIpadServerService qwIpadServerService;
 
-
+    @Value("${cloud_host.company_name}")
+    private String signProjectName;
 
     @Override
     public void dataOverviewTask() {
@@ -792,7 +794,12 @@ public class StatisticsServiceImpl implements IStatisticsService {
             dto.setCompletedRate("0");
         }
 
-        Long watchCount = consumptionBalanceMapper.queryWatchCount(param);
+        Long watchCount = null;
+        if("泽林文化".equals(signProjectName)){
+            watchCount =   consumptionBalanceMapper.selectFsCourseTrafficLogCount(param);
+        }else {
+            watchCount = consumptionBalanceMapper.queryWatchCount(param);
+        }
         Long completedCount = consumptionBalanceMapper.queryCompletedCount(param);
 
         if(watchCount == null){

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

@@ -523,5 +523,18 @@
             AND is_del=0
         </where>
     </select>
+    <select id="selectFsCourseTrafficLogCount" resultType="java.lang.Long">
+        SELECT COUNT(*)
+        FROM fs_course_traffic_log
+        <where>
+            <if test="startTime != null and endTime != null">
+                and create_time &gt;= #{startTime}
+                and create_time &lt;= #{endTime}
+            </if>
+            <if test="companyId != null">
+                AND company_id = #{companyId}
+            </if>
+        </where>
+    </select>
 
 </mapper>