完成代码

src/main/java/com/system/service/impl/KingDeeCommonPushServiceImpl.java

@@ -14,6 +14,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -134,32 +135,57 @@ public class KingDeeCommonPushServiceImpl implements IKingDeeCommonPushService {
     private Map<String, Object> encapsulationRequest(KingDeeUpdateThirdDataInVo inVo, Map<String, String> config, String queueId, Integer id, Long start, String kingDeeFiledDetail, Map<String, Object> data) {
         List<Object> objectList = JsonUtil.toList(kingDeeFiledDetail, Object.class);
         List<Map<String, String>> fieldList = objectList.stream().map(m -> JsonUtil.toMap(JsonUtil.toString(m), String.class, String.class)).collect(Collectors.toList());
-        HashSet<String> attachments = new HashSet<String>();
-        String addTwo = kingDeeCommonPushApi.kingDeeUpdateThirdData(config, queueId, config.get("name"), inVo.getData(), fieldList, data, attachments);
-
-        Map<String, Object> temp = JsonUtil.toMap(addTwo, String.class, Object.class);
-        if (!CollectionUtils.isEmpty(temp) && KingDeeConstants.NOT_LOGGED_IN_CODE.equals(temp.get(KingDeeConstants.CODE_NAME))) {
-            kingDeeLoginScheduler.configureTasks();
-            addTwo = kingDeeCommonPushApi.kingDeeUpdateThirdData(config, queueId, config.get("name") + "重新登陆请求", inVo.getData(), fieldList, data, attachments);
-            temp = JsonUtil.toMap(addTwo, String.class, Object.class);
+        Map<String, Object> temp = new HashMap();
+    	List<Map<String, Object>> dataList = inVo.getData();
+        if("BAS_PreBaseDataOne".equalsIgnoreCase(config.get("sFormId")))
+        {
+        	for(Map<String, Object> curData:dataList)
+        	{
+        		List<Map<String, Object>> curDataList = new ArrayList();
+        		curDataList.add(curData);
+            	temp = sendDataToKingdee(config, queueId, curDataList, fieldList, data);
+        	}
         }
-        
-        if(!CollectionUtils.isEmpty(temp) && KingDeeConstants.SUCCESS_CODE.equals(temp.get(KingDeeConstants.CODE_NAME)))
+        else
         {
-    		for(Map<String, Object> resultData: (List<Map<String, Object>>)temp.get("resultData"))
-    		{
-    			if(attachments.size() > 0)
-    			{
+        	temp = sendDataToKingdee(config, queueId, dataList, fieldList, data);
+        }
+
+
+        return temp;
+    }
+    
+    /**
+     * 把数据发送给金蝶
+     */
+    private Map<String, Object> sendDataToKingdee(Map<String, String> config, String queueId, List<Map<String, Object>> dataList, List<Map<String, String>> fieldList, Map<String, Object> data)
+    {        
+        HashSet<String> attachments = new HashSet<String>();
+    	String addTwo = kingDeeCommonPushApi.kingDeeUpdateThirdData(config, queueId, config.get("name"), dataList, fieldList, data, attachments);
+
+	    Map<String, Object> temp = JsonUtil.toMap(addTwo, String.class, Object.class);
+	    if (!CollectionUtils.isEmpty(temp) && KingDeeConstants.NOT_LOGGED_IN_CODE.equals(temp.get(KingDeeConstants.CODE_NAME))) {
+	        kingDeeLoginScheduler.configureTasks();
+	        addTwo = kingDeeCommonPushApi.kingDeeUpdateThirdData(config, queueId, config.get("name") + "重新登陆请求", dataList, fieldList, data, attachments);
+	        temp = JsonUtil.toMap(addTwo, String.class, Object.class);
+	    }
+	    
+	    if(!CollectionUtils.isEmpty(temp) && KingDeeConstants.SUCCESS_CODE.equals(temp.get(KingDeeConstants.CODE_NAME)))
+	    {
+			for(Map<String, Object> resultData: (List<Map<String, Object>>)temp.get("resultData"))
+			{
+				if(attachments.size() > 0)
+				{
 	    			int curId = Integer.parseInt(resultData.get("id").toString());
 	            	for(String attachment:attachments)
 	            	{
 	            		 kingDeeCommonPushApi.uploadAttachment(attachment, curId);
 	            	}
-    			}
-    		}
-        }
-
-        return temp;
+				}
+			}
+	    }
+	    
+	    return temp;
     }
 
     private Object implementSql(KingDeeUpdateThirdDataInVo inVo, Map<String, String> config, String queueId, Integer id, Long start, String customSql) {