Răsfoiți Sursa

导出线索:修复bug

ximinghao 3 luni în urmă
părinte
comite
f8f3b38b56

+ 0 - 13
src/main/java/com/skyversation/xjcy/dms/DMSService.java

@@ -124,19 +124,6 @@ public class DMSService {
         return list;
     }
 
-    public List<ClueFollow> queryClueFollow(String token, String cClueName, String cEnterpriseName, String constructionMethod) {
-
-        List<JSONObject> dmsResult;
-        DMSRequest request = DMSQuery.CLUE_FOLLOW.preRequest(null);
-        if (cClueName != null) request.addWhere("c_clue_name", "2", cClueName);
-        if (cEnterpriseName != null) request.addWhere("c_enterprise_name", "2", cEnterpriseName);
-        if (constructionMethod != null) request.addWhere("construction_method", "2", constructionMethod);
-
-        dmsResult = queryDmsList(request, token, DMSQuery.CLUE_FOLLOW.getColumnId());
-
-        return dmsResult.stream().map(jsonObject -> JSON.toJavaObject(jsonObject, ClueFollow.class)).collect(Collectors.toList());
-    }
-
     public List<JSONObject> simpleQuery(String token, String columId) {
         return queryDmsList(new DMSRequest(), token, columId);
     }

+ 2 - 1
src/main/java/com/skyversation/xjcy/service/DataExportService.java

@@ -3,6 +3,7 @@ package com.skyversation.xjcy.service;
 import com.alibaba.fastjson.JSONObject;
 import com.skyversation.xjcy.bean.ClueFollow;
 import com.skyversation.xjcy.dms.DMSColumn;
+import com.skyversation.xjcy.dms.DMSQuery;
 import com.skyversation.xjcy.dms.DMSService;
 import com.skyversation.xjcy.oauth.AuthService;
 import org.springframework.stereotype.Service;
@@ -33,7 +34,7 @@ public class DataExportService {
         List<Map<String,Object>> result = new ArrayList<>();
         LocalDate now = LocalDate.now();
         List<JSONObject> clues = dmsService.queryBeautifiedClue(authService.getToken(), c_clue_name,c_enterprise_name, construction_method);
-        List<ClueFollow> clueFollows = dmsService.queryClueFollow(authService.getToken(), c_clue_name,c_enterprise_name, construction_method);
+        List<ClueFollow> clueFollows = dmsService.query(authService.getToken(), DMSQuery.CLUE_FOLLOW, ClueFollow.class,now);
         //做map,仅留最近
         Map<String,ClueFollow> newestClueFollows = clueFollows.stream()
                 .filter(f->f.getCClueCode()!=null)