Skip to content

8
8timerapiv200
Commit 7352dec9 by Administrator
Options

Merge branch 'wdz' into 'develop' 

Wdz

See merge request 8timerv2/8timerapiv200!8
parents ad41a9a4 b72577be
Showing with 146 additions and 121 deletions
src/main/java/cn/timer/api/bean/yggl/YgglAttaSbgjj.java
package cn.timer.api.bean.yggl;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author Tang 2019-12-27
*/
@Entity
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name="yggl_atta_sbgjj")
@ApiModel("员工社保公积金")
public class YgglAttaSbgjj extends Model<YgglAttaSbgjj> {
private static final long serialVersionUID = 532391446907698642L;
@Id
@GeneratedValue
@TableId (type = IdType.AUTO)
@ApiModelProperty(value="编号 编号",example="10001")
private Integer id;
@ApiModelProperty(value="员工工号 员工工号",example="100")
private Integer empNum;
@ApiModelProperty(value="是否首次缴纳社保 0是 1否",example="0")
private Integer isScjnsb;
@ApiModelProperty(value="是否首次缴纳公积金 0是 1否",example="0")
private Integer isScjngjj;
@ApiModelProperty(value="个人社保帐号 ",example="HJHG124")
private String grsbzh;
@ApiModelProperty(value="个人公积金帐号 ",example="OH81889257")
private String grgjjzh;
package cn.timer.api.bean.yggl;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author Tang 2019-12-27
*/
@Entity
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name="yggl_atta_sbgjj")
@ApiModel("员工社保公积金")
public class YgglAttaSbgjj extends Model<YgglAttaSbgjj> {
private static final long serialVersionUID = 532391446907698642L;
@Id
@GeneratedValue
@TableId (type = IdType.AUTO)
@ApiModelProperty(value="编号 编号",example="10001")
private Integer id;
@ApiModelProperty(value="员工工号 员工工号",example="100")
private Integer empNum;
@ApiModelProperty(value="是否首次缴纳社保 0是 1否",example="0")
private Integer isScjnsb;
@ApiModelProperty(value="是否首次缴纳公积金 0是 1否",example="0")
private Integer isScjngjj;
@ApiModelProperty(value="个人社保帐号 ",example="HJHG124")
private String grsbzh;
@ApiModelProperty(value="个人公积金帐号 ",example="OH81889257")
private String grgjjzh;
@ApiModelProperty(value="组织机构代码 ",example="117")
private Integer orgCode;
}
\ No newline at end of file
src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java
......@@ -8,10 +8,14 @@ import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import org.springframework.format.annotation.DateTimeFormat;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -130,7 +134,7 @@ public class YgglMainEmp extends Model<YgglMainEmp> {
@ApiModelProperty(value="工作性质 1全职、2实习生、3兼职、4劳务派遣、5劳务、6派遣、7外包、8退休返聘",example="101")
private Integer jobType;
@ApiModelProperty(value="员工状态 1试用、2正式、3离职中、4已离职",example="101")
@ApiModelProperty(value="员工状态 1正式、2试用、3离职中、4已离职",example="101")
private Integer jobStatus;
@ApiModelProperty(value="入职日期 ",example="客户注册后的时间为入职时间")
......
src/main/java/cn/timer/api/controller/yggl/YgglController.java.rej 0 → 100644
diff a/src/main/java/cn/timer/api/controller/yggl/YgglController.java b/src/main/java/cn/timer/api/controller/yggl/YgglController.java (rejected hunks)
@@ -76,6 +76,7 @@
import cn.timer.api.dto.yggl.YgQueryDto;
import cn.timer.api.dto.yggl.YgglCartogramDto;
import cn.timer.api.dto.yggl.YgjgDto;
+import cn.timer.api.dto.yggl.YgmzDto;
import cn.timer.api.dto.yggl.YgProDto;
import cn.timer.api.dto.yggl.YgzzDto;
import cn.timer.api.utils.Md5;
src/main/java/cn/timer/api/dto/yggl/AddygdaDto.java
......@@ -51,4 +51,8 @@ public class AddygdaDto extends Page implements Serializable{
@ApiModelProperty(value="性别 0：男；1：女",example="0")
private Integer sex;
}
src/main/java/cn/timer/api/dto/yggl/YgQueryDto.java
/**
* @date 2019年11月16日
* @author 翁东州
* @方法中文名称:
*/
package cn.timer.api.dto.yggl;
import java.io.Serializable;
import java.util.Date;
import cn.timer.api.utils.Page;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @date 2019年11月16日
* @author 翁东州
* @方法中文名称:
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class YgQueryDto extends Page implements Serializable{
private static final long serialVersionUID = -1230023773946170942L;
@ApiModelProperty(value="员工姓名",example="华仔")
private String empName;
@ApiModelProperty(value="员工号",example="1")
private Integer empNum;
@ApiModelProperty(value="部门名",example="1")
private String deptName;
@ApiModelProperty(value="上级部门名",example="1")
private String upName;
@ApiModelProperty(value="入职时间",example="1")
private Date rzTime;
@ApiModelProperty(value="应离职时间",example="1")
private Date ylzTime;
@ApiModelProperty(value="工作性质1全职、2实习生、3兼职、4劳务派遣、5劳务、6派遣、7外包、8退休返聘",example="1")
private Integer jobType;
@ApiModelProperty(value="手机号",example="1")
private String phone;
@ApiModelProperty(value="部门id",example="101")
private Integer bmgwid;
@ApiModelProperty(value="员工状态1试用、2正式、3离职中、4已离职",example="2")
private Integer jobStatus;
@ApiModelProperty(value="手机号、姓名",example="1388888888 or 张三")
private String query;
@ApiModelProperty(value="备注",example="123")
private String bz;
}
/**
* @date 2019年11月16日
* @author 翁东州
* @方法中文名称:
*/
package cn.timer.api.dto.yggl;
import java.io.Serializable;
import java.util.Date;
import com.alibaba.fastjson.annotation.JSONField;
import cn.timer.api.utils.Page;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @date 2019年11月16日
* @author 翁东州
* @方法中文名称:
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class YgQueryDto extends Page implements Serializable{
private static final long serialVersionUID = -1230023773946170942L;
@ApiModelProperty(value="员工姓名",example="华仔")
private String empName;
@ApiModelProperty(value="员工号",example="1")
private Integer empNum;
@ApiModelProperty(value="部门名",example="1")
private String deptName;
@ApiModelProperty(value="上级部门名",example="1")
private String upName;
@ApiModelProperty(value="入职时间",example="1")
private Date rzTime;
@ApiModelProperty(value="应离职时间",example="1")
private Date ylzTime;
@ApiModelProperty(value="工作性质1全职、2实习生、3兼职、4劳务派遣、5劳务、6派遣、7外包、8退休返聘",example="1")
private Integer jobType;
@ApiModelProperty(value="手机号",example="1")
private String phone;
@ApiModelProperty(value="部门id",example="101")
private Integer bmgwid;
@ApiModelProperty(value="员工状态1正式、2试用、3离职中、4已离职",example="2")
private Integer jobStatus;
@ApiModelProperty(value="手机号、姓名",example="1388888888 or 张三")
private String query;
@ApiModelProperty(value="备注",example="123")
private String bz;
}
src/main/java/cn/timer/api/dto/yggl/YgjgDto.java
......@@ -38,6 +38,10 @@ public class YgjgDto implements Serializable {
@Transient
@TableField(exist = false)
private String cityname;
@Transient
@TableField(exist = false)
private String jgname;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment