huyc 项目档案代码提交

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectVO.java

@@ -20,6 +20,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import lombok.Data;
 
+import javax.validation.constraints.Max;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Past;
 import java.io.Serializable;
@@ -41,6 +42,7 @@ public class EmployeeProjectVO implements Serializable {
      * 员工类型（字典值，0外包1派遣2代理）
      */
 	@NotNull(message = "员工类型不能为空")
+	@Max(value = 1,message = "最大长度不能超过1位")
 	@ExcelProperty(value ="员工类型")
     private String empNatrue;
 

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java

@@ -416,7 +416,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 			list = baseMapper.selectList(Wrappers.<TEmployeeProject>query().lambda().in(TEmployeeProject::getId, idsList));
 		}
 		if(Common.isNotEmpty(list)) {
-			int i = 1;
+			int i = 0;
 			for (TEmployeeProject delProject : list) {
 				++i;
 				Set<String> errorMsg = new HashSet<>();
@@ -426,9 +426,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 						baseMapper.updateById(delProject);
 					}else {
 						errorMsg.add(MsgUtils.getMessage(ErrorCodes.ARCHIVES_EMP_FAMILY_NAME_EXISTING));
-						continue;
-					}
-					if (!CollUtil.isEmpty(errorMsg)) {
 						errorList.add(new ErrorMessage((long) i, errorMsg));
 					}
 				} catch (Exception e) {
@@ -438,7 +435,10 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 				}
 			}
 		}
-		return null;
+		if (CollUtil.isNotEmpty(errorList)) {
+			return R.failed(errorList);
+		}
+		return R.ok();
 	}
 
 	/**