批量办理 100%

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -2473,7 +2473,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 						if (Common.isEmpty(socialTypeRemark.toString())
 								&& CommonConstants.ZERO_STRING.equals(typeSub)
 								&& CommonConstants.ZERO_STRING.equals(dis.getType())
-								&& Common.isNotNull(socialType)) {
+								&& Common.isEmpty(socialType)) {
 							continue;
 						}
 						socialInfo = socialMapper.selectById(dis.getSocialId());
@@ -2519,7 +2519,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 									temp.append(DispatchConstants.DISPATCH_HANDLE_FAIL);
 									initAuditInfo(auditInfo, ( temp + handleRemark), handleStatus, user, temp.toString());
 								}
-								dis.setSocialHandleStatus(socialInfo.getHandleStatus());
 								auditInfo.setSocialId(dis.getId());
 							} else {
 								errorList.add(new ErrorMessage(-1, "找不到对应员工社保派增派单数据：" + dis.getEmpName()));
@@ -2653,6 +2652,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 								continue;
 							}
 						}
+
+					}
 					//更新派单状态
 					if (Common.isNotNull(auditInfo)) {
 						//派增判断
@@ -2702,8 +2703,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					} else {
 						errorList.add(new ErrorMessage(-1, "派单数据错误！"));
 					}
-
-					}
 				}
 			} catch(Exception e){
 				log.error("派单办理异常：", e);
@@ -2811,7 +2810,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				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));
 			}
-			if (socialType.indexOf(CommonConstants.TEN_STRING) > CommonConstants.ZERO_INT
+			if (socialType.indexOf(CommonConstants.TWO_STRING) > CommonConstants.ZERO_INT
 					&& (Common.isEmpty(socialInfo.getMedicalHandle())
 					|| CommonConstants.ZERO_STRING.equals(socialInfo.getMedicalHandle()))){
 				socialInfo.setMedicalHandle(ifNotEquals(CommonConstants.ZERO_INT,flag,CommonConstants.ONE_STRING,CommonConstants.TWO_STRING));