Browse Source

学员列表

change 3 years ago
parent
commit
d1d78120f5

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

@@ -134,6 +134,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                 lqw.like(ClassGradeSys::getStatus,1);
                 lqw.like(ClassGradeSys::getStatus,1);
                 ClassGradeSys classGradeSys1 = new ClassGradeSys();
                 ClassGradeSys classGradeSys1 = new ClassGradeSys();
                 classGradeSys1.setStatus(0);
                 classGradeSys1.setStatus(0);
+                classGradeSys1.setEndTime(DateUtils.getNowTime());
                 classGradeSysService.update(classGradeSys1,lqw);
                 classGradeSysService.update(classGradeSys1,lqw);
 
 
                 ClassGradeSys classGradeSys = new ClassGradeSys();
                 ClassGradeSys classGradeSys = new ClassGradeSys();

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

@@ -98,4 +98,10 @@ public class UserAddBo {
     /** 學員編碼 */
     /** 學員編碼 */
     @ApiModelProperty("學員編碼")
     @ApiModelProperty("學員編碼")
     private String studentCode;
     private String studentCode;
+
+    /** 1在职 0离职 */
+    @Excel(name = "1在职 0离职")
+    @ApiModelProperty("1在职 0离职")
+    private Long jobStatus;
+
 }
 }

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

@@ -140,6 +140,12 @@ public class UserEditBo {
     @ApiModelProperty("學員編碼")
     @ApiModelProperty("學員編碼")
     private String studentCode;
     private String studentCode;
 
 
+    /** 1在职 0离职 */
+    @Excel(name = "1在职 0离职")
+    @ApiModelProperty("1在职 0离职")
+    private Long jobStatus;
+
+
     public void setNull(){
     public void setNull(){
         this.setTelphone(null);
         this.setTelphone(null);
     }
     }

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

@@ -106,4 +106,10 @@ public class UserQueryBo extends BaseEntity {
 	@ApiModelProperty("學員編碼")
 	@ApiModelProperty("學員編碼")
 	private String studentCode;
 	private String studentCode;
 
 
+	/** 1在职 0离职 */
+	@Excel(name = "1在职 0离职")
+	@ApiModelProperty("1在职 0离职")
+	private Long jobStatus;
+
+
 }
 }

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

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.user.domain;
 package com.zhongzheng.modules.user.domain;
 
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
@@ -171,4 +172,8 @@ private static final long serialVersionUID=1L;
     private String consigneeAddress;
     private String consigneeAddress;
     /** 备注 */
     /** 备注 */
     private String remark;
     private String remark;
+
+    /** 1在职 0离职 */
+    private Long jobStatus;
+
 }
 }

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

@@ -215,6 +215,11 @@ public class UserVo {
 	@ApiModelProperty("备注")
 	@ApiModelProperty("备注")
 	private String remark;
 	private String remark;
 
 
+	/** 1在职 0离职 */
+	@Excel(name = "1在职 0离职")
+	@ApiModelProperty("1在职 0离职")
+	private Long jobStatus;
+
 	public void setNull(){
 	public void setNull(){
 		this.setOpenId(null);
 		this.setOpenId(null);
 		this.setIdCardImg1(null);
 		this.setIdCardImg1(null);