change 3 vuotta sitten
vanhempi
commit
3364e58107

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

@@ -41,7 +41,7 @@ import io.swagger.annotations.ApiOperation;
 @Api(value = "班级控制器", tags = {"班级管理"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/modules.grade/grade")
+@RequestMapping("/grade/grade")
 public class ClassGradeController extends BaseController {
 
     private final IClassGradeService iClassGradeService;

+ 1 - 0
zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/WxLoginService.java

@@ -151,6 +151,7 @@ public class WxLoginService
         bo.setLastLoginTime(DateUtils.getNowTime());
         bo.setCreateTime(DateUtils.getNowTime());
         bo.setUpdateTime(DateUtils.getNowTime());
+        bo.setStudentCode(ServletUtils.getEncoded("XY"));
         if(inviteCode!=null){
             User inviteUser = iUserService.queryByAccount(inviteCode);
             if(inviteUser!=null){

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserAddBo.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.user.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -94,4 +95,7 @@ public class UserAddBo {
     private Long lastLoginTime;
     @ApiModelProperty("头像")
     private String avatar;
+    /** 學員編碼 */
+    @ApiModelProperty("學員編碼")
+    private String studentCode;
 }

+ 5 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserEditBo.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.user.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -135,6 +136,10 @@ public class UserEditBo {
     @ApiModelProperty("头像")
     private String avatar;
 
+    /** 學員編碼 */
+    @ApiModelProperty("學員編碼")
+    private String studentCode;
+
     public void setNull(){
         this.setTelphone(null);
     }

+ 5 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserQueryBo.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.user.bo;
 
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -101,4 +102,8 @@ public class UserQueryBo extends BaseEntity {
 	@ApiModelProperty("状态 1正常 0关闭")
 	private List<Integer> status;
 
+	/** 學員編碼 */
+	@ApiModelProperty("學員編碼")
+	private String studentCode;
+
 }

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

@@ -151,4 +151,7 @@ private static final long serialVersionUID=1L;
     /** 学习时长 */
     @TableField(exist = false)
     private Long studyTime;
+
+    /** 学习时长 */
+    private String studentCode;
 }

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

@@ -176,6 +176,12 @@ public class UserVo {
 	@ApiModelProperty("最后登录时间")
 	private Long lastLoginTime;
 
+
+	/** 學員編碼 */
+	@Excel(name = "學員編碼")
+	@ApiModelProperty("學員編碼")
+	private String studentCode;
+
 	public void setNull(){
 		this.setOpenId(null);
 		this.setIdCardImg1(null);