灵明光子获取客户问卷接口修改合并

mjava-lingmingguangzi/pom.xml

@@ -38,7 +38,7 @@
         <dependency>
             <groupId>com.malk</groupId>
             <artifactId>base</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>

mjava-lingmingguangzi/src/main/java/com/malk/lingmingguangzi/controller/LingmingguangziController.java

@@ -18,14 +18,11 @@ public class LingmingguangziController {
         return lingmingguangziService.test();
     }
 
-    //获取‘客户满意度调查-车载’不同客户数量
-    @GetMapping("/getVehicleCustomerCount")
-    public McR getVehicleCustomerCount() {
-        return lingmingguangziService.getVehicleCustomerCount();
-    }
-
-    @GetMapping("/getConsumeCustomerCount")
-    public McR getConsumeCustomerCount() {
-        return lingmingguangziService.getConsumeCustomerCount();
+    /**
+     * 获取客户回收问卷数量
+     */
+    @GetMapping("/getCustomerQuestionnaireCount")
+    public McR getVehicleCustomerCount(Long start, Long end) {
+        return lingmingguangziService.getCustomerQuestionnaireCount(start, end);
     }
 }

mjava-lingmingguangzi/src/main/java/com/malk/lingmingguangzi/service/LingmingguangziService.java

@@ -9,12 +9,6 @@ public interface LingmingguangziService {
      * 获取车载不同客户问卷数量
      * @return
      */
-    McR getVehicleCustomerCount();
-
-    /**
-     * 获取消费客户问卷数量
-     * @return
-     */
-    McR getConsumeCustomerCount();
+    McR getCustomerQuestionnaireCount(Long start, Long end);
 
 }

mjava-lingmingguangzi/src/main/java/com/malk/lingmingguangzi/service/LingmingguangziServiceImpl.java

@@ -1,5 +1,6 @@
 package com.malk.lingmingguangzi.service;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.malk.server.aliwork.YDConf;
 import com.malk.server.aliwork.YDParam;
@@ -29,10 +30,38 @@ public class LingmingguangziServiceImpl implements LingmingguangziService {
     }
 
     @Override
-    public McR getVehicleCustomerCount() {
-        DDR_New ddrNew = ydClient.queryData(YDParam.builder()
-                .formUuid("FORM-5CC9748D283C49FC8C8A86EE0529730A4I1D")
-                .build(), YDConf.FORM_QUERY.retrieve_list);
+    public McR getCustomerQuestionnaireCount(Long start, Long end) {
+        YDParam.YDParamBuilder ydParamBuilder = YDParam.builder()
+                .formUuid("FORM-5CC9748D283C49FC8C8A86EE0529730A4I1D");
+
+        YDParam.YDParamBuilder ydParamBuilder2 = YDParam.builder()
+                .formUuid("FORM-36BF81FD5E43496FABB060190302A7615WBT");
+
+        YDParam.YDParamBuilder ydParamBuilder3 = YDParam.builder()
+                .formUuid("FORM-7AB4677010554E81BAA0AC26A46F1940PTIR");
+
+        YDParam.YDParamBuilder ydParamBuilder4 = YDParam.builder()
+                .formUuid("FORM-06A0188FF4E840CA82CBE51604C8C0D6SYTU");
+
+        if (start != null && end != null){
+            String startDate = DateUtil.format(new Date(start), "yyyy-MM-dd HH:mm:ss");
+            String endDate = DateUtil.format(DateUtil.offsetDay(new Date(end),1), "yyyy-MM-dd HH:mm:ss");
+
+            ydParamBuilder.createFromTimeGMT(startDate);
+            ydParamBuilder.createToTimeGMT(endDate);
+
+            ydParamBuilder2.createFromTimeGMT(startDate);
+            ydParamBuilder2.createToTimeGMT(endDate);
+
+            ydParamBuilder3.createFromTimeGMT(startDate);
+            ydParamBuilder3.createToTimeGMT(endDate);
+
+            ydParamBuilder4.createFromTimeGMT(startDate);
+            ydParamBuilder4.createToTimeGMT(endDate);
+        }
+
+        //车载--------------------------------------------
+        DDR_New ddrNew = ydClient.queryData(ydParamBuilder.build(), YDConf.FORM_QUERY.retrieve_list);
         List<Map> dataList = (List<Map>) ddrNew.getData();
         int importantCustomerCount = 0;
         int orderCustomerCount = 0;
@@ -40,7 +69,7 @@ public class LingmingguangziServiceImpl implements LingmingguangziService {
 
         for (Map data : dataList) {
             Map formData = (Map) data.get("formData");
-            String customerLevel = String.valueOf(formData.get("textField_lx4fx2u1"));
+            String customerLevel = String.valueOf(formData.get("selectField_lx4g7em6"));
             switch (customerLevel){
                 case "重要客户": importantCustomerCount++; break;
                 case "订单客户": orderCustomerCount++; break;
@@ -53,17 +82,10 @@ public class LingmingguangziServiceImpl implements LingmingguangziService {
         result.put("orderCustomerCount", orderCustomerCount);
         result.put("strategicCustomerCount", strategicCustomerCount);
 
-        return McR.success(result);
-    }
-
-    @Override
-    public McR getConsumeCustomerCount() {
+        //消费----------------------------------------------
         Set<String> customerSet = new HashSet<>();
-
         //商务端
-        DDR_New ddrNew1 = ydClient.queryData(YDParam.builder()
-                .formUuid("FORM-36BF81FD5E43496FABB060190302A7615WBT")
-                .build(), YDConf.FORM_QUERY.retrieve_list);
+        DDR_New ddrNew1 = ydClient.queryData(ydParamBuilder2.build(), YDConf.FORM_QUERY.retrieve_list);
         List<Map> dataList1 = (List<Map>) ddrNew1.getData();
 
         for (Map data : dataList1) {
@@ -74,9 +96,7 @@ public class LingmingguangziServiceImpl implements LingmingguangziService {
         }
 
         //技术端
-        DDR_New ddrNew2 = ydClient.queryData(YDParam.builder()
-                .formUuid("FORM-7AB4677010554E81BAA0AC26A46F1940PTIR")
-                .build(), YDConf.FORM_QUERY.retrieve_list);
+        DDR_New ddrNew2 = ydClient.queryData(ydParamBuilder3.build(), YDConf.FORM_QUERY.retrieve_list);
         List<Map> dataList2 = (List<Map>) ddrNew2.getData();
 
         for (Map data : dataList2) {
@@ -87,9 +107,7 @@ public class LingmingguangziServiceImpl implements LingmingguangziService {
         }
 
         //质量端
-        DDR_New ddrNew3 = ydClient.queryData(YDParam.builder()
-                .formUuid("FORM-06A0188FF4E840CA82CBE51604C8C0D6SYTU")
-                .build(), YDConf.FORM_QUERY.retrieve_list);
+        DDR_New ddrNew3 = ydClient.queryData(ydParamBuilder4.build(), YDConf.FORM_QUERY.retrieve_list);
         List<Map> dataList3 = (List<Map>) ddrNew3.getData();
 
         for (Map data : dataList3) {
@@ -98,7 +116,8 @@ public class LingmingguangziServiceImpl implements LingmingguangziService {
             System.out.println(customer);
             customerSet.add(customer);
         }
+        result.put("consumption",customerSet.size());
 
-        return McR.success(customerSet.size());
+        return McR.success(result);
     }
 }