Commit 520000af authored by hongguangwu's avatar hongguangwu

MVP1.7.10-批量审核,忽略单个

parent 4a545edc
......@@ -3514,12 +3514,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 是否自动化办理,true:推送到社保士兵
boolean isAuto;
// 是否批量接口且含有社保且自动化且配置了单个,批量审核时,要跳过社保
// 2025-5-12 18:24:42 hgw
// true:可变更社保,false不可更新社保
boolean isBatchSocialAuto;
for (TDispatchInfo dis : dispatchs) {
isBatchSocialAuto = true;
autoFlag = autoFlagMap.get(dis.getId());
if (Common.isEmpty(autoFlag)){
autoFlag ="1";
......@@ -3550,10 +3545,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
// 批量审核+审核为自动化+户配置为单个推送
if (!CommonConstants.ONE_STRING.equals(isSingleAudit)
&& singleFlagMap.get(dis.getId()) != null
&& CommonConstants.THREE_STRING.equals(auditStatus)) {
isBatchSocialAuto = false;
&& CommonConstants.THREE_STRING.equals(auditStatus)
&& null != socialInfo) {
// 自动忽略这种社保,要单个审核并选择上传附件才行
continue;
}
if (null != socialInfo && isBatchSocialAuto) {
if (null != socialInfo) {
// 派增审核
if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType())){
//派增审核通过
......@@ -3781,7 +3778,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
}
// 非(批量审核+审核为自动化+户配置为单个推送),才可以改社保
if (CommonConstants.ONE_INT == flag && flagTemp && isBatchSocialAuto){
if (CommonConstants.ONE_INT == flag && flagTemp){
if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType())){
sf.setSocialStatus(CommonConstants.FOUR_STRING);
sf.setSocialAddStatus(CommonConstants.THREE_STRING);
......@@ -3825,7 +3822,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
baseMapper.updateById(dis);
socialFundMapper.updateById(sf);
// 非(批量审核+审核为自动化+户配置为单个推送),才可以改社保
if (isAuto && isBatchSocialAuto) {
if (isAuto) {
TSocialFreindSet set = tSocialFreindSetService.getById("1");
// 是否推送税友,默认不是,推送到士兵
boolean isFriend = false;
......
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