班级列表

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassGradeController.java

@@ -34,7 +34,7 @@ import io.swagger.annotations.ApiOperation;
 
 /**
  * 班级Controller
- * 
+ *
  * @author ruoyi
  * @date 2021-11-10
  */
@@ -66,9 +66,9 @@ public class ClassGradeController extends BaseController {
     @ApiOperation("是否出现官方接口选择")
     @PreAuthorize("@ss.hasPermi('modules.grade:grade:select')")
     @GetMapping("/select")
-    public  AjaxResult<Integer> select(ClassGradeAddBo bo) {
+    public AjaxResult<Integer> select(ClassGradeAddBo bo) {
         boolean tenantId = ServletUtils.getRequest().getHeader("TenantId").equals("867735392558919680");
-        return  AjaxResult.success(tenantId?1:0);
+        return AjaxResult.success(tenantId ? 1 : 0);
     }
 
     /**
@@ -83,7 +83,7 @@ public class ClassGradeController extends BaseController {
         return getDataTable(list);
     }
 
-/*    *//**
+    /*    *//**
      * 导出班级列表
      *//*
     @ApiOperation("导出班级列表")
@@ -102,7 +102,7 @@ public class ClassGradeController extends BaseController {
     @ApiOperation("获取班级详细信息")
     @PreAuthorize("@ss.hasPermi('modules.grade:grade:query')")
     @GetMapping("/{classId}")
-    public AjaxResult<ClassGradeVo> getInfo(@PathVariable("classId" ) Long classId) {
+    public AjaxResult<ClassGradeVo> getInfo(@PathVariable("classId") Long classId) {
         return AjaxResult.success(iClassGradeService.queryById(classId));
     }
 
@@ -128,7 +128,7 @@ public class ClassGradeController extends BaseController {
         return toAjax(iClassGradeService.updateByEditBo(bo) ? 1 : 0);
     }
 
-/*    *//**
+    /*    *//**
      * 删除班级
      *//*
     @ApiOperation("删除班级")

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeAddBo.java

@@ -82,4 +82,8 @@ public class ClassGradeAddBo {
     /** 商品绑定ID */
     @ApiModelProperty("商品绑定ID")
     private Long[] classGradeGoodsAddBos;
+
+    /** 班級編碼 */
+    @ApiModelProperty("班級編碼")
+    private String gradeCode;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeEditBo.java

@@ -100,4 +100,8 @@ public class ClassGradeEditBo {
     @ApiModelProperty("报考地区")
     private Long cityId;
 
+    /** 班級編碼 */
+    @ApiModelProperty("班級編碼")
+    private String gradeCode;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/bo/ClassGradeQueryBo.java

@@ -107,4 +107,8 @@ public class ClassGradeQueryBo extends BaseEntity {
 	/** 院校ID */
 	@ApiModelProperty("院校ID")
 	private Long majorId;
+
+	/** 班級編碼 */
+	@ApiModelProperty("班級編碼")
+	private String gradeCode;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/domain/ClassGrade.java

@@ -69,4 +69,7 @@ private static final long serialVersionUID=1L;
 
     /** 报考地区 */
     private Long cityId;
+
+    /** 班級編碼 */
+    private String gradeCode;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
 import com.zhongzheng.modules.grade.bo.*;
@@ -82,6 +83,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
+        add.setGradeCode(ServletUtils.getEncoded("BJ"));
         boolean save = this.save(add);
         if (bo.getClassGradeGoodsAddBos() != null){
             for (Long classGradeGoodsAddBo : bo.getClassGradeGoodsAddBos()) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassGradeVo.java

@@ -122,4 +122,8 @@ public class ClassGradeVo {
 	@ApiModelProperty("报考地区")
 	private Long cityId;
 
+	/** 班級編碼 */
+	@ApiModelProperty("班級編碼")
+	private String gradeCode;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/User.java

@@ -154,4 +154,21 @@ private static final long serialVersionUID=1L;
 
     /** 学习时长 */
     private String studentCode;
+
+    /** 工作年限 */
+    private Long workYear;
+    /** 公司名称 */
+    private String companyName;
+    /** 名族 */
+    private String nation;
+    /** 户口性质 */
+    private String census;
+    /** 籍贯 */
+    private String nativePlace;
+    /** 联系地址 */
+    private String contactAddress;
+    /** 收件地址 */
+    private String consigneeAddress;
+    /** 备注 */
+    private String remark;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserVo.java

@@ -182,6 +182,39 @@ public class UserVo {
 	@ApiModelProperty("學員編碼")
 	private String studentCode;
 
+	/** 工作年限 */
+	@Excel(name = "工作年限")
+	@ApiModelProperty("工作年限")
+	private Long workYear;
+	/** 公司名称 */
+	@Excel(name = "公司名称")
+	@ApiModelProperty("公司名称")
+	private String companyName;
+	/** 名族 */
+	@Excel(name = "名族")
+	@ApiModelProperty("名族")
+	private String nation;
+	/** 户口性质 */
+	@Excel(name = "户口性质")
+	@ApiModelProperty("户口性质")
+	private String census;
+	/** 籍贯 */
+	@Excel(name = "籍贯")
+	@ApiModelProperty("籍贯")
+	private String nativePlace;
+	/** 联系地址 */
+	@Excel(name = "联系地址")
+	@ApiModelProperty("联系地址")
+	private String contactAddress;
+	/** 收件地址 */
+	@Excel(name = "收件地址")
+	@ApiModelProperty("收件地址")
+	private String consigneeAddress;
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+
 	public void setNull(){
 		this.setOpenId(null);
 		this.setIdCardImg1(null);