Merge remote-tracking branch 'origin/develop' into develop

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

@@ -3079,7 +3079,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				StringBuilder temp = new StringBuilder();
 				// 预估库同步社保还是公积金的标志，0：全部；1仅社保；2仅公积金
 				int forecastFlag = CommonConstants.ZERO_INT;
+				// auditFlag 表示社保办理无办理项是不保存
+				boolean auditFlag = true;
 				for (TDispatchInfo dis : disList) {
+					auditFlag = true;
 					if (CommonConstants.ZERO_STRING.equals(typeSub)) {
 						forecastFlag = CommonConstants.ONE_INT;
 					} else if (CommonConstants.ONE_STRING.equals(typeSub)) {
@@ -3129,21 +3132,24 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 
 								socialMapper.updateById(socialInfo);
 								dis.setSocialHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark));
-								auditInfo.setType(CommonConstants.ONE_STRING);
-								if (CommonConstants.ZERO_INT == flag) {
-									temp.setLength(CommonConstants.ZERO_INT);
-									temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD);
-									temp.append(Common.isNullToString(socialTypeRemark));
-									temp.append(DispatchConstants.DISPATCH_HANDLE_SUCCESS);
-									initAuditInfo(auditInfo, ( temp + ServiceUtil.ifNullToEmpty(handleRemark)), CommonConstants.THREE_STRING, user, temp.toString(), remark);
-								} else {
-									temp.setLength(CommonConstants.ZERO_INT);
-									temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD);
-									temp.append(Common.isNullToString(socialTypeRemark));
-									temp.append(DispatchConstants.DISPATCH_HANDLE_FAIL);
-									initAuditInfo(auditInfo, ( temp + ServiceUtil.ifNullToEmpty(handleRemark)), CommonConstants.FOUR_STRING, user, temp.toString(), remark);
+								auditFlag = Common.isNotNull(Common.isNullToString(socialTypeRemark));
+								if (auditFlag){
+									auditInfo.setType(CommonConstants.ONE_STRING);
+									if (CommonConstants.ZERO_INT == flag) {
+										temp.setLength(CommonConstants.ZERO_INT);
+										temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD);
+										temp.append(Common.isNullToString(socialTypeRemark));
+										temp.append(DispatchConstants.DISPATCH_HANDLE_SUCCESS);
+										initAuditInfo(auditInfo, ( temp + ServiceUtil.ifNullToEmpty(handleRemark)), CommonConstants.THREE_STRING, user, temp.toString(), remark);
+									} else {
+										temp.setLength(CommonConstants.ZERO_INT);
+										temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD);
+										temp.append(Common.isNullToString(socialTypeRemark));
+										temp.append(DispatchConstants.DISPATCH_HANDLE_FAIL);
+										initAuditInfo(auditInfo, ( temp + ServiceUtil.ifNullToEmpty(handleRemark)), CommonConstants.FOUR_STRING, user, temp.toString(), remark);
+									}
+									auditInfo.setSocialId(dis.getId());
 								}
-								auditInfo.setSocialId(dis.getId());
 							} else {
 								errorList.add(new ErrorMessage(-1, "找不到对应员工社保派增派单数据：" + dis.getEmpName()));
 								continue;
@@ -3362,7 +3368,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 						//新增办理记录信息
 						auditInfo.setDispatchInfoId(dis.getId());
 						auditInfo.setEmpIdcard(dis.getEmpIdcard());
-						auditInfoMapper.insert(auditInfo);
+						if (auditFlag){
+							auditInfoMapper.insert(auditInfo);
+						}
 						baseMapper.updateById(dis);
 						socialFundMapper.updateById(sf);
 						//1.派增办理失败 刷新预估数据