Commit f9f9b1ad authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.13' into MVP1.7.13

parents 38c9c9f7 d189f4c0
......@@ -85,6 +85,8 @@ public class TGzPushHandleServiceImpl implements TGzPushHandleService {
public void handlePushEntry(TGzPushEntry tGzPushEntry) {
// 先改为推送中
tGzPushEntry.setFailReason("");
tGzPushEntry.setPushTime(LocalDateTime.now());
tGzPushEntry.setPushStatus(CommonConstants.THREE_STRING);
tGzPushEntry.setUpdateTime(LocalDateTime.now());
tGzPushEntryService.updateById(tGzPushEntry);
......@@ -135,6 +137,8 @@ public class TGzPushHandleServiceImpl implements TGzPushHandleService {
}
// 先改为推送中
findWaitInfo.setFailReason("");
findWaitInfo.setPushTime(LocalDateTime.now());
findWaitInfo.setPushStatus(CommonConstants.THREE_STRING);
findWaitInfo.setUpdateTime(LocalDateTime.now());
tGzPushEntryService.updateById(findWaitInfo);
......@@ -269,7 +273,7 @@ public class TGzPushHandleServiceImpl implements TGzPushHandleService {
if(CommonConstants.GZ_SUCCESS_CODE.equals(returnMap.get("responseCode"))){
LambdaUpdateWrapper<TGzEmpInfo> updateEmpWrapper = new LambdaUpdateWrapper<>();
updateEmpWrapper.eq(TGzEmpInfo::getBizId, pushInfo.getBizId())
.set(TGzEmpInfo::getEmpPushStatus, CommonConstants.ZERO_STRING);
.set(TGzEmpInfo::getEmpPushStatus, CommonConstants.ONE_STRING);
tGzEmpInfoService.update(null, updateEmpWrapper);
}
}
......@@ -295,7 +299,7 @@ public class TGzPushHandleServiceImpl implements TGzPushHandleService {
if(CommonConstants.GZ_SUCCESS_CODE.equals(returnMap.get("responseCode"))){
LambdaUpdateWrapper<TGzEmpInfo> updateEmpWrapper = new LambdaUpdateWrapper<>();
updateEmpWrapper.eq(TGzEmpInfo::getBizId, pushInfo.getBizId())
.set(TGzEmpInfo::getContractPushStatus, CommonConstants.ZERO_STRING);
.set(TGzEmpInfo::getContractPushStatus, CommonConstants.ONE_STRING);
tGzEmpInfoService.update(null, updateEmpWrapper);
}
}
......@@ -376,7 +380,7 @@ public class TGzPushHandleServiceImpl implements TGzPushHandleService {
if(CommonConstants.GZ_SUCCESS_CODE.equals(returnMap.get("responseCode"))){
LambdaUpdateWrapper<TGzEmpInfo> updateEmpWrapper = new LambdaUpdateWrapper<>();
updateEmpWrapper.eq(TGzEmpInfo::getBizId, pushInfo.getBizId())
.set(TGzEmpInfo::getContractAttaPushStatus, CommonConstants.ZERO_STRING);
.set(TGzEmpInfo::getContractAttaPushStatus, CommonConstants.ONE_STRING);
tGzEmpInfoService.update(null, updateEmpWrapper);
}
......
......@@ -1714,6 +1714,7 @@
,if(a.type ='0' and s.add_ysd_Handle_Status != '0', s.add_YSD_REQUEST_ID, s.YSD_REQUEST_ID) YSD_REQUEST_ID
,if(a.type ='0',YGS_SOCIAL_START_DATE_NEXT,null) YGS_SOCIAL_START_DATE_NEXT
,if(a.type ='0',YSD_SOCIAL_START_DATE_NEXT,null) YSD_SOCIAL_START_DATE_NEXT
,a.BACK_FILE_FLAG
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
......
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