Commit 558959db authored by hongguangwu's avatar hongguangwu

MVP1.7.9-20

parent 2326044f
...@@ -178,7 +178,6 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -178,7 +178,6 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
List<TSocialSoldierLog> logTemp = new ArrayList<>(); List<TSocialSoldierLog> logTemp = new ArrayList<>();
List<TSocialInfo> socialInfoTemp = new ArrayList<>(); List<TSocialInfo> socialInfoTemp = new ArrayList<>();
List<TSocialInfo> socialInfoUpdate = new ArrayList<>(); List<TSocialInfo> socialInfoUpdate = new ArrayList<>();
int i=1;
String ygsHandleStatus; String ygsHandleStatus;
String dispatchItem = "社保"; String dispatchItem = "社保";
// 同一个户才一批次推送,因为账号密码不一样 ,不同户,则先推送一批 // 同一个户才一批次推送,因为账号密码不一样 ,不同户,则先推送一批
...@@ -208,7 +207,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -208,7 +207,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
&& !vo.getSocialHouseholdName().equals(ygsAddlist.get(index+1).getSocialHouseholdName())) { && !vo.getSocialHouseholdName().equals(ygsAddlist.get(index+1).getSocialHouseholdName())) {
nextFlag = true; nextFlag = true;
} }
if (nextFlag || i % 20 == 0 || i >= ygsAddlist.size()) { if (nextFlag || index % 20 == 0 || index >= ygsAddlist.size()-1) {
nextFlag = false; nextFlag = false;
requestId = socialFriendConfig.pushFriendByInfo(restTemplate, vo, listVo, type, thisTime, backLogList); requestId = socialFriendConfig.pushFriendByInfo(restTemplate, vo, listVo, type, thisTime, backLogList);
ygsHandleStatus = CommonConstants.TWO_STRING; ygsHandleStatus = CommonConstants.TWO_STRING;
...@@ -232,7 +231,6 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -232,7 +231,6 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
socialInfoTemp = new ArrayList<>(); socialInfoTemp = new ArrayList<>();
logTemp = new ArrayList<>(); logTemp = new ArrayList<>();
} }
i++;
} catch (Exception e) { } catch (Exception e) {
remark = "提交社保士兵异常!"; remark = "提交社保士兵异常!";
} }
...@@ -290,7 +288,6 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -290,7 +288,6 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
List<TSocialSoldierLog> logTemp = new ArrayList<>(); List<TSocialSoldierLog> logTemp = new ArrayList<>();
List<TSocialInfo> socialInfoTemp = new ArrayList<>(); List<TSocialInfo> socialInfoTemp = new ArrayList<>();
List<TSocialInfo> socialInfoUpdate = new ArrayList<>(); List<TSocialInfo> socialInfoUpdate = new ArrayList<>();
int i=1;
String ysdHandleStatus; String ysdHandleStatus;
String dispatchItem = "医保"; String dispatchItem = "医保";
// 同一个户才一批次推送,因为账号密码不一样 ,不同户,则先推送一批 // 同一个户才一批次推送,因为账号密码不一样 ,不同户,则先推送一批
...@@ -334,7 +331,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -334,7 +331,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
&& !vo.getSocialHouseholdName().equals(ysdAddlist.get(index+1).getSocialHouseholdName())) { && !vo.getSocialHouseholdName().equals(ysdAddlist.get(index+1).getSocialHouseholdName())) {
nextFlag = true; nextFlag = true;
} }
if (nextFlag || i % 20 == 0 || i >= ysdAddlist.size()) { if (nextFlag || index % 20 == 0 || index >= ysdAddlist.size()-1) {
requestId = socialFriendConfig.pushFriendByInfo(restTemplate, vo, listVo, type, thisTime, backLogList); requestId = socialFriendConfig.pushFriendByInfo(restTemplate, vo, listVo, type, thisTime, backLogList);
ysdHandleStatus = CommonConstants.TWO_STRING; ysdHandleStatus = CommonConstants.TWO_STRING;
remark = "已推送提交任务!"; remark = "已推送提交任务!";
...@@ -357,7 +354,6 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -357,7 +354,6 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
socialInfoTemp = new ArrayList<>(); socialInfoTemp = new ArrayList<>();
logTemp = new ArrayList<>(); logTemp = new ArrayList<>();
} }
i++;
} catch (Exception e) { } catch (Exception e) {
remark = "提交社保士兵异常!"; remark = "提交社保士兵异常!";
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment