Commit 413e7114 authored by fangxinjiang's avatar fangxinjiang

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

parents 8d65a5cd 80b40952
...@@ -38,6 +38,7 @@ import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner; ...@@ -38,6 +38,7 @@ import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils; import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo; import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
import com.yifu.cloud.plus.v1.yifu.social.service.TDispatchInfoService; import com.yifu.cloud.plus.v1.yifu.social.service.TDispatchInfoService;
import com.yifu.cloud.plus.v1.yifu.social.util.DoSocialTask;
import com.yifu.cloud.plus.v1.yifu.social.vo.*; import com.yifu.cloud.plus.v1.yifu.social.vo.*;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
...@@ -73,6 +74,8 @@ public class TDispatchInfoController { ...@@ -73,6 +74,8 @@ public class TDispatchInfoController {
private final DaprArchivesProperties daprArchivesProperties; private final DaprArchivesProperties daprArchivesProperties;
private final DoSocialTask socialTask;
/** /**
* 简单分页查询 * 简单分页查询
* @param page 分页对象 * @param page 分页对象
...@@ -531,7 +534,19 @@ public class TDispatchInfoController { ...@@ -531,7 +534,19 @@ public class TDispatchInfoController {
try { try {
if (Common.isNotNull(requestId)) { if (Common.isNotNull(requestId)) {
//主动释放锁 //主动释放锁
return tDispatchInfoService.addApplyAudit(idList,auditStatus,auditRemark,remark, isSingleAudit); List<String> friendIdList = new ArrayList<>();
List<String> soldierIdList = new ArrayList<>();
R<List<ErrorMessage>> errorList = tDispatchInfoService.addApplyAudit(idList,auditStatus,auditRemark
,remark, isSingleAudit,friendIdList,soldierIdList);
//推送税友
if (!friendIdList.isEmpty()) {
socialTask.pushFriend(friendIdList);
}
//推送社保士兵
if (!soldierIdList.isEmpty()) {
socialTask.pushSoldier(soldierIdList);
}
return errorList;
} else { } else {
return R.failed(ResultConstants.NO_GETLOCK_DATA); return R.failed(ResultConstants.NO_GETLOCK_DATA);
} }
......
...@@ -81,10 +81,10 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> { ...@@ -81,10 +81,10 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
DispatchDetailVo getSocialAndFundInfoById(String id); DispatchDetailVo getSocialAndFundInfoById(String id);
List<ErrorMessage> addBatchApplyAudit(List<String> idsList, YifuUser user, int flag, String auditStatus List<ErrorMessage> addBatchApplyAudit(List<String> idsList, YifuUser user, int flag, String auditStatus
, String auditRemark, String remark, String isSingleAudit); , String auditRemark, String remark, String isSingleAudit,List<String> friendIdList,List<String> soldierIdList);
R<List<ErrorMessage>> addApplyAudit(List<String> ids, String auditStatus, String auditRemark, String remark R<List<ErrorMessage>> addApplyAudit(List<String> ids, String auditStatus, String auditRemark, String remark
, String isSingleAudit); , String isSingleAudit,List<String> friendIdList,List<String> soldierIdList);
// isAutoFlag:是否社保士兵的自动办理,true :是 // isAutoFlag:是否社保士兵的自动办理,true :是
R<List<ErrorMessage>> addApplyHandle(List<String> ids, String typeSub, String handleStatus, String handleRemark, String socialType, String remark, YifuUser user, boolean isAutoHandle); R<List<ErrorMessage>> addApplyHandle(List<String> ids, String typeSub, String handleStatus, String handleRemark, String socialType, String remark, YifuUser user, boolean isAutoHandle);
......
...@@ -90,8 +90,6 @@ import org.springframework.cache.Cache; ...@@ -90,8 +90,6 @@ import org.springframework.cache.Cache;
import org.springframework.cache.CacheManager; import org.springframework.cache.CacheManager;
import org.springframework.cache.support.SimpleValueWrapper; import org.springframework.cache.support.SimpleValueWrapper;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
...@@ -3582,7 +3580,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3582,7 +3580,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
**/ **/
@Override @Override
public List<ErrorMessage> addBatchApplyAudit(List<String> idsList, YifuUser user, int flag, String auditStatus public List<ErrorMessage> addBatchApplyAudit(List<String> idsList, YifuUser user, int flag, String auditStatus
, String auditRemark, String remark, String isSingleAudit) { , String auditRemark, String remark, String isSingleAudit,List<String> friendIdList,List<String> soldierIdList) {
List<ErrorMessage> errorList = new ArrayList<>(); List<ErrorMessage> errorList = new ArrayList<>();
if (!Common.isNotNull(idsList)) { if (!Common.isNotNull(idsList)) {
errorList.add(new ErrorMessage(-1, CommonConstants.PARAM_IS_NOT_ERROR)); errorList.add(new ErrorMessage(-1, CommonConstants.PARAM_IS_NOT_ERROR));
...@@ -3942,7 +3940,16 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3942,7 +3940,16 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
&& set != null && Common.isNotNull(set.getType()) && set.getType() == 1) { && set != null && Common.isNotNull(set.getType()) && set.getType() == 1) {
isFriend = true; isFriend = true;
} }
socialTask.pushSoldier(dis.getId(), isFriend, isSingleAudit); if (!isFriend || CommonConstants.ONE_STRING.equals(isSingleAudit)) {
// 当前默认 安徽省 ,且开关是税友的,才可以税友推送办理
if (isFriend) {
// 断开派单单条推送税友
// 单个审核接口并且户类型为单个,即时推送税友
friendIdList.add(dis.getId());
} else {
soldierIdList.add(dis.getId());
}
}
} }
//派减的申请审核完更新社保公积金查询快照表 //派减的申请审核完更新社保公积金查询快照表
...@@ -4096,7 +4103,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4096,7 +4103,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
@ShardingTransactionType(TransactionType.BASE) @ShardingTransactionType(TransactionType.BASE)
@Override @Override
public R<List<ErrorMessage>> addApplyAudit(List<String> ids, String auditStatus, String auditRemark, String remark public R<List<ErrorMessage>> addApplyAudit(List<String> ids, String auditStatus, String auditRemark, String remark
, String isSingleAudit) { , String isSingleAudit,List<String> friendIdList,List<String> soldierIdList) {
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if (null == user) { if (null == user) {
return R.failed(CommonConstants.USER_FAIL); return R.failed(CommonConstants.USER_FAIL);
...@@ -4115,7 +4122,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -4115,7 +4122,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} else { } else {
return R.failed("派单审核状态参数异常:0待审核 1审核通过 2审核不通过"); return R.failed("派单审核状态参数异常:0待审核 1审核通过 2审核不通过");
} }
List<ErrorMessage> errorInfo = addBatchApplyAudit(ids, user, flag, auditStatus, Common.isNullToString(auditRemark), remark, isSingleAudit); List<ErrorMessage> errorInfo = addBatchApplyAudit(ids, user, flag, auditStatus
, Common.isNullToString(auditRemark), remark, isSingleAudit,friendIdList,soldierIdList);
return R.ok(errorInfo, "派单审核结果:"); return R.ok(errorInfo, "派单审核结果:");
} catch (Exception e) { } catch (Exception e) {
log.error("派单审核异常:" + e.getMessage()); log.error("派单审核异常:" + e.getMessage());
......
...@@ -269,25 +269,12 @@ public class DoSocialTask { ...@@ -269,25 +269,12 @@ public class DoSocialTask {
* @return * @return
**/ **/
@Async @Async
public void pushSoldier(String dispatchId, boolean isFriend, String isSingleAudit) { public void pushFriend(List<String> dispatchIdList) {
if (!isFriend || CommonConstants.ONE_STRING.equals(isSingleAudit)) {
List<String> dispatchIdList = new ArrayList<>();
dispatchIdList.add(dispatchId);
try {
Thread.sleep(60000);
} catch (InterruptedException e) {
e.printStackTrace();
}
// 当前默认 安徽省 ,且开关是税友的,才可以税友推送办理
if (isFriend) {
// 断开派单单条推送税友
// 单个审核接口并且户类型为单个,即时推送税友
// if (CommonConstants.ONE_STRING.equals(isSingleAudit)) {
tSocialFriendPushService.pushFriend(dispatchIdList); tSocialFriendPushService.pushFriend(dispatchIdList);
// }
} else {
tSocialSoldierPushService.pushSoldier(dispatchIdList);
}
} }
@Async
public void pushSoldier(List<String> dispatchIdList) {
tSocialSoldierPushService.pushSoldier(dispatchIdList);
} }
} }
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