20230702

README.md

@@ -1,6 +1,6 @@
 # REPORT_AUTO
 
-nohup java -jar tsl_data-1.6-exec.jar >output.log 2>&1 &
+nohup java -jar tsl_data-1.7-exec.jar >output.log 2>&1 &
 
 nohup java -jar dingtalk_auto-1.3-exec.jar >output.log 2>&1 &
 
@@ -16,6 +16,10 @@ nohup java -jar dingtalk_auto-1.3-exec.jar >output.log 2>&1 &
 
 ## tsl_data版本说明
 
+### v1.7
+
+1. 修复了一个sql语句的0除问题 selectClientRatioForDay
+
 ### v1.6
 
 1. 新增一个数据表--客户端-战略考核并且需要排在第二个sheet

tsl_data/pom.xml

@@ -13,7 +13,7 @@
 
     <groupId>com.nokia</groupId>
     <artifactId>tsl_data</artifactId>
-    <version>1.6</version>
+    <version>1.7</version>
 
     <packaging>jar</packaging>
 

tsl_data/src/main/resources/mapper/TslDao.xml

@@ -15,16 +15,19 @@
         complaint_satisfied_list::float8, complaint_satisfied_count::float8,
         complaint_resolution_list::float8, complaint_resolution_count::float8,
         complaint_response_list::float8, complaint_response_count::float8, complaint::float8 from
-        report_auto.he_d_high_quality hdhq where acct_date = #{day} and profes_dep = '网络质量' and
-        big_type_name = '移网网络体验' and small_type_name = '--') select '全省' as businoareaname,
+        report_auto.he_d_high_quality hdhq where acct_date = '2023-07-01' and profes_dep = '网络质量'
+        and big_type_name = '移网网络体验' and small_type_name = '--') select '全省' as businoareaname,
         sum(complaint_satisfied_list) / sum(complaint_satisfied_count + complaint) as
         complaint_satisfied, sum(complaint_resolution_list) / sum(complaint_resolution_count +
         complaint) as complaint_resolution, sum(complaint_response_list) /
         sum(complaint_response_count + complaint) as complaint_response from t1 union select
-        businoareaname, complaint_satisfied_list / (complaint_satisfied_count + complaint) as
-        complaint_satisfied, complaint_resolution_list / (complaint_resolution_count + complaint) as
-        complaint_resolution, complaint_response_list / (complaint_response_count + complaint) as
-        complaint_response from t1</select>
+        businoareaname, case when (complaint_satisfied_count + complaint) = 0 then 0 else
+        complaint_satisfied_list / (complaint_satisfied_count + complaint) end as
+        complaint_satisfied, case when (complaint_resolution_count + complaint) = 0 then 0 else
+        complaint_resolution_list / (complaint_resolution_count + complaint) end as
+        complaint_resolution, case when (complaint_response_count + complaint) = 0 then 0 else
+        complaint_response_list / (complaint_response_count + complaint) end as complaint_response
+        from t1</select>
 
     <select id="selectOldTsDurationForMonth" resultType="Map"> select city_name,avg_duration from
         report_auto.avg_duration where month_id = #{monthId} </select>

tsl_data/src/test/java/com/nokia/tsl_data/TslDataApplicationTest.java

@@ -7,6 +7,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import com.nokia.tsl_data.dao.TslDao;
 import com.nokia.tsl_data.service.TslDataService;
 import com.nokia.tsl_data.service.TslTaskService;
 
@@ -18,7 +19,7 @@ public class TslDataApplicationTest {
 
     @Test
     void test() {
-        Map<String, List<Object>> sheet1Data = service.getSheet1Data("20230627");
+        List<List<List<Object>>> sheet1Data = service.getSheet4_6Data("20230701");
         System.out.println(sheet1Data);
     }
 
@@ -30,4 +31,13 @@ public class TslDataApplicationTest {
         tslTaskService.reportGenerateTask("20230627");
     }
 
+    @Autowired
+    private TslDao tslDao;
+
+    @Test
+    void test2() {
+        List<Map<String, Object>> selectClientRatioForDay = tslDao.selectClientRatioForDay("20230701");
+        System.out.println(selectClientRatioForDay);
+    }
+
 }