he2802 2 years ago
parent
commit
3dd6168929

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -731,6 +731,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         if (Validator.isEmpty(userVo.getRealName()) || Validator.isEmpty(userVo.getIdCard()) || Validator.isEmpty(userVo.getTelPhone())) {
             return "用户信息缺失";
         }
+        if (Validator.isEmpty(userVo.getEduLevel()) || Validator.isEmpty(userVo.getCompanyName()) || Validator.isEmpty(userVo.getSex())) {
+            return "用户详细信息缺失";
+        }
         if (Validator.isEmpty(orderGoods.getSevenYear())) {
             return "商品年份缺失";
         }

+ 12 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeUserVo.java

@@ -160,4 +160,16 @@ public class ClassGradeUserVo {
 	@ApiModelProperty("学习记录同步到老系统时间")
 	private Long toOldTime;
 	private Long orderGoodsId;
+	/** 教育层次 */
+	@cn.afterturn.easypoi.excel.annotation.Excel(name = "教育层次")
+	@ApiModelProperty("教育层次")
+	private String eduLevel;
+	/** 公司名称 */
+	@cn.afterturn.easypoi.excel.annotation.Excel(name = "公司名称")
+	@ApiModelProperty("公司名称")
+	private String companyName;
+	/** 性别 */
+	@cn.afterturn.easypoi.excel.annotation.Excel(name = "性别1男2女")
+	@ApiModelProperty("性别1男2女")
+	private Integer sex;
 }