过滤立项号合同号

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/Util/OAUtil.java

@@ -28,19 +28,25 @@ public class OAUtil {
         return apiUrl;
     }
 
-    static public String filter(String s, Map returnResult) {//过滤掉不包含F_QPOV_Base字段的数据，并返回展示
+    static public String filter(String s) {//过滤掉不包含F_QPOV_Base字段的数据，并返回展示
+        String QJFYQC001 = "XXDD202105200009";
         List list = JSON.parseObject(s, List.class, Feature.OrderedField);
         List<Map> returnResults = new ArrayList<Map>();
-        List<Map> end = new ArrayList<Map>();
         for (Object linkedHashMap : list) {
             Map map = JSON.parseObject(linkedHashMap.toString(), LinkedHashMap.class);
             if (map.containsKey("F_QPOV_Base")) {
-                if (null != map.get("F_QPOV_Base")) returnResults.add(map);
+                if (null != map.get("F_QPOV_Base")) {
+                    returnResults.add(map);
+                } else {
+                    map.put("F_QPOV_Base", QJFYQC001);
+                    returnResults.add(map);
+                }
             } else {
-                end.add(map);
+                map.put("F_QPOV_Base", QJFYQC001);
+                returnResults.add(map);
             }
         }
-        if (null != end && 0 < end.size()) returnResult.put("缺少立项号/合同号", JsonUtil.Listjson(end));
+//        if (null != end && 0 < end.size()) returnResult.put("缺少立项号/合同号", JsonUtil.Listjson(end));
 
         return JsonUtil.Listjson(returnResults);
     }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/service/impl/QueryBusinessTripDetailsServiceImpl.java

@@ -80,7 +80,7 @@ public class QueryBusinessTripDetailsServiceImpl extends ServiceImpl<QueryBusine
             responsejson = e.toString();
             oaSelectJournalService.setOaSelectJournalError(requestJson, responsejson, BusinessNo);
             returnResult.put("message", "请求数据报错");
-            returnResult.put("result", responsejson);
+            returnResult.put("result", "调用接口异常"+responsejson);
             return returnResult;
         }
         if (faceApiCatch) oaSelectJournalService.setOaSelectJournal(requestJson, responsejson, BusinessNo);
@@ -91,7 +91,7 @@ public class QueryBusinessTripDetailsServiceImpl extends ServiceImpl<QueryBusine
 
 
         try {
-            add = businessTripInterfaceWebapi.batchAdd(s);
+            add = businessTripInterfaceWebapi.batchAdd(OAUtil.filter(s));
         } catch (Exception e) {
             webApiCatch = false;
             e.printStackTrace();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/service/impl/QueryLoanDetailsServiceImpl.java

@@ -73,7 +73,7 @@ public class QueryLoanDetailsServiceImpl extends ServiceImpl<QueryLoanDetailsMap
             responsejson = e.toString();
             oaSelectJournalService.setOaSelectJournalError(requestJson, responsejson, BusinessNo);
             returnResult.put("message", "请求数据报错");
-            returnResult.put("result", responsejson);
+            returnResult.put("result", "调用接口异常"+responsejson);
             return returnResult;
         }
         if (faceApiCatch) oaSelectJournalService.setOaSelectJournal(requestJson, responsejson, BusinessNo);
@@ -82,7 +82,7 @@ public class QueryLoanDetailsServiceImpl extends ServiceImpl<QueryLoanDetailsMap
         Object result = jsonObject.get("result");
         String s = result.toString();
         try {
-            add = loanInterfaceWebapi.batchAdd(s);
+            add = loanInterfaceWebapi.batchAdd(OAUtil.filter(s));
         } catch (Exception e) {
             webApiCatch = false;
             e.printStackTrace();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/API/service/impl/QueryOtherDetailsServiceImpl.java

@@ -71,7 +71,7 @@ public class QueryOtherDetailsServiceImpl extends ServiceImpl<QueryOtherDetailsM
             responsejson = e.toString();
             oaSelectJournalService.setOaSelectJournalError(requestJson, responsejson, BusinessNo);
             returnResult.put("message", "请求数据报错");
-            returnResult.put("result", responsejson);
+            returnResult.put("result", "调用接口异常"+responsejson);
             return returnResult;
         }
         if (faceApiCatch) oaSelectJournalService.setOaSelectJournal(requestJson, responsejson, BusinessNo);
@@ -80,7 +80,7 @@ public class QueryOtherDetailsServiceImpl extends ServiceImpl<QueryOtherDetailsM
         Object result = jsonObject.get("result");
         String s = result.toString();
         try {
-            add = webapi.batchAdd(s);
+            add = webapi.batchAdd(OAUtil.filter(s));
         } catch (Exception e) {
             webApiCatch = false;
             e.printStackTrace();

jeecg-boot-module-system/src/test/java/org/jeecg/SecurityToolsTest.java

@@ -230,6 +230,7 @@ public class SecurityToolsTest {
 //        map.put("F_Lqkj_Syncdataid", "100009");
         map.put("F_LQKJ_SYNCBILL", "PUR_Requisition");
         map.put("F_LQKJ_SYNCCHECK", "0");
+        map.put("FID", "123456");
         String o = "{\"fid\":\"123\",\"f_lqkj_syncdataid\":\"sda\",\"f_lqkj_syncbill\":\"123\",\"f_lqkj_synccheck\":\"123\"}";
         LQKJ_t_IMSSyncDetails lqkj_t_imsSync = JSON.parseObject(JSON.toJSONString(map), LQKJ_t_IMSSyncDetails.class).setCreatetime(new Date());
         System.out.println(lqkj_t_imsSync);