Skip to content

Y
yifu-mvp
Commit 39c780e9 authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

批量办理 100%

parent 618f373d
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 50 deletions
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ 39c780e9
...@@ -2473,7 +2473,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2473,7 +2473,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isEmpty(socialTypeRemark.toString()) if (Common.isEmpty(socialTypeRemark.toString())
&& CommonConstants.ZERO_STRING.equals(typeSub) && CommonConstants.ZERO_STRING.equals(typeSub)
&& CommonConstants.ZERO_STRING.equals(dis.getType()) && CommonConstants.ZERO_STRING.equals(dis.getType())
&& Common.isNotNull(socialType)) { && Common.isEmpty(socialType)) {
continue; continue;
} }
socialInfo = socialMapper.selectById(dis.getSocialId()); socialInfo = socialMapper.selectById(dis.getSocialId());
...@@ -2519,7 +2519,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2519,7 +2519,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
temp.append(DispatchConstants.DISPATCH_HANDLE_FAIL); temp.append(DispatchConstants.DISPATCH_HANDLE_FAIL);
initAuditInfo(auditInfo, ( temp + handleRemark), handleStatus, user, temp.toString()); initAuditInfo(auditInfo, ( temp + handleRemark), handleStatus, user, temp.toString());
} }
dis.setSocialHandleStatus(socialInfo.getHandleStatus());
auditInfo.setSocialId(dis.getId()); auditInfo.setSocialId(dis.getId());
} else { } else {
errorList.add(new ErrorMessage(-1, "找不到对应员工社保派增派单数据：" + dis.getEmpName())); errorList.add(new ErrorMessage(-1, "找不到对应员工社保派增派单数据：" + dis.getEmpName()));
...@@ -2653,56 +2652,56 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2653,56 +2652,56 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
continue; continue;
} }
} }
//更新派单状态
if (Common.isNotNull(auditInfo)) { }
//派增判断 //更新派单状态
if (CommonConstants.ZERO_STRING.equals(dis.getType())) { if (Common.isNotNull(auditInfo)) {
if ((CommonConstants.ONE_STRING.equals(dis.getSocialHandleStatus()) //派增判断
|| CommonConstants.TWO_STRING.equals(dis.getSocialHandleStatus())) if (CommonConstants.ZERO_STRING.equals(dis.getType())) {
&& ((CommonConstants.ONE_STRING.equals(dis.getFundHandleStatus()) if ((CommonConstants.ONE_STRING.equals(dis.getSocialHandleStatus())
|| CommonConstants.TWO_STRING.equals(dis.getFundHandleStatus())))) { || CommonConstants.TWO_STRING.equals(dis.getSocialHandleStatus()))
//办理成功 && ((CommonConstants.ONE_STRING.equals(dis.getFundHandleStatus())
dis.setStatus(CommonConstants.FOUR_STRING); || CommonConstants.TWO_STRING.equals(dis.getFundHandleStatus())))) {
} //办理成功
if (Common.isEmpty(dis.getSocialHandleStatus()) dis.setStatus(CommonConstants.FOUR_STRING);
&& ((CommonConstants.ONE_STRING.equals(dis.getFundHandleStatus())
|| CommonConstants.TWO_STRING.equals(dis.getFundHandleStatus())))) {
//办理成功
dis.setStatus(CommonConstants.FOUR_STRING);
}
if ((CommonConstants.ONE_STRING.equals(dis.getSocialHandleStatus())
|| CommonConstants.TWO_STRING.equals(dis.getSocialHandleStatus()))
&& Common.isEmpty(dis.getFundHandleStatus())) {
//办理成功
dis.setStatus(CommonConstants.FOUR_STRING);
}
//派减判断
} else if (CommonConstants.ONE_STRING.equals(dis.getType())) {
if ( !((Common.isNotNull(socialInfo)
&& CommonConstants.ZERO_STRING.equals(socialInfo.getHandleStatus())
|| CommonConstants.FOUR_STRING.equals(socialInfo.getHandleStatus()))
|| (Common.isEmpty(providentFund)
&& CommonConstants.ZERO_STRING.equals(providentFund.getHandleStatus())))
) {
//办理成功或失败 更新为办理完结 2020-05-26
dis.setStatus(CommonConstants.FOUR_STRING);
}
} }
if (CommonConstants.ZERO_INT == flag) { if (Common.isEmpty(dis.getSocialHandleStatus())
auditInfo.setAuditStatus(CommonConstants.SIX_STRING); && ((CommonConstants.ONE_STRING.equals(dis.getFundHandleStatus())
} else if (CommonConstants.ONE_INT == flag) { || CommonConstants.TWO_STRING.equals(dis.getFundHandleStatus())))) {
auditInfo.setAuditStatus(CommonConstants.FIVE_STRING); //办理成功
dis.setStatus(CommonConstants.FOUR_STRING);
}
if ((CommonConstants.ONE_STRING.equals(dis.getSocialHandleStatus())
|| CommonConstants.TWO_STRING.equals(dis.getSocialHandleStatus()))
&& Common.isEmpty(dis.getFundHandleStatus())) {
//办理成功
dis.setStatus(CommonConstants.FOUR_STRING);
}
//派减判断
} else if (CommonConstants.ONE_STRING.equals(dis.getType())) {
if ( !((Common.isNotNull(socialInfo)
&& CommonConstants.ZERO_STRING.equals(socialInfo.getHandleStatus())
|| CommonConstants.FOUR_STRING.equals(socialInfo.getHandleStatus()))
|| (Common.isEmpty(providentFund)
&& CommonConstants.ZERO_STRING.equals(providentFund.getHandleStatus())))
) {
//办理成功或失败 更新为办理完结 2020-05-26
dis.setStatus(CommonConstants.FOUR_STRING);
} }
dis.setHandleRemark(null == handleRemark ? "" : handleRemark);
//新增办理记录信息
auditInfo.setDispatchInfoId(dis.getId());
auditInfo.setEmpIdcard(dis.getEmpIdcard());
auditInfoMapper.insert(auditInfo);
baseMapper.updateById(dis);
} else {
errorList.add(new ErrorMessage(-1, "派单数据错误！"));
} }
if (CommonConstants.ZERO_INT == flag) {
auditInfo.setAuditStatus(CommonConstants.SIX_STRING);
} else if (CommonConstants.ONE_INT == flag) {
auditInfo.setAuditStatus(CommonConstants.FIVE_STRING);
}
dis.setHandleRemark(null == handleRemark ? "" : handleRemark);
//新增办理记录信息
auditInfo.setDispatchInfoId(dis.getId());
auditInfo.setEmpIdcard(dis.getEmpIdcard());
auditInfoMapper.insert(auditInfo);
baseMapper.updateById(dis);
} else {
errorList.add(new ErrorMessage(-1, "派单数据错误！"));
} }
} }
} catch(Exception e){ } catch(Exception e){
...@@ -2811,7 +2810,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2811,7 +2810,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialInfo.setPensionHandle(ifNotEquals(CommonConstants.ZERO_INT,flag,CommonConstants.ONE_STRING,CommonConstants.TWO_STRING)); socialInfo.setPensionHandle(ifNotEquals(CommonConstants.ZERO_INT,flag,CommonConstants.ONE_STRING,CommonConstants.TWO_STRING));
sf.setPensionHandle(ifNotEquals(CommonConstants.ZERO_INT,flag,CommonConstants.ONE_STRING,CommonConstants.TWO_STRING)); sf.setPensionHandle(ifNotEquals(CommonConstants.ZERO_INT,flag,CommonConstants.ONE_STRING,CommonConstants.TWO_STRING));
} }
if (socialType.indexOf(CommonConstants.TEN_STRING) > CommonConstants.ZERO_INT if (socialType.indexOf(CommonConstants.TWO_STRING) > CommonConstants.ZERO_INT
&& (Common.isEmpty(socialInfo.getMedicalHandle()) && (Common.isEmpty(socialInfo.getMedicalHandle())
|| CommonConstants.ZERO_STRING.equals(socialInfo.getMedicalHandle()))){ || CommonConstants.ZERO_STRING.equals(socialInfo.getMedicalHandle()))){
socialInfo.setMedicalHandle(ifNotEquals(CommonConstants.ZERO_INT,flag,CommonConstants.ONE_STRING,CommonConstants.TWO_STRING)); socialInfo.setMedicalHandle(ifNotEquals(CommonConstants.ZERO_INT,flag,CommonConstants.ONE_STRING,CommonConstants.TWO_STRING));
......
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