Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!501

src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java

@@ -208,6 +208,9 @@ public class YgglMainEmp extends Model<YgglMainEmp> {
 	@ApiModelProperty(value="离职前状态 1试用、2正式 ",example="1试用、2正式")
 	@ApiModelProperty(value="离职前状态 1试用、2正式 ",example="1试用、2正式")
 	private Integer beforeLeavingSts;
 	private Integer beforeLeavingSts;
 	
 	
+	@ApiModelProperty(value="自定义工号",example="")
+    private String customNum;
+	
 	@Transient
 	@Transient
 	@TableField(exist = false)
 	@TableField(exist = false)
 	private String workTime;//工龄
 	private String workTime;//工龄

src/main/java/cn/timer/api/controller/yggl/YgglController.java

@@ -248,10 +248,12 @@ public class YgglController {
 	public Result<Object> addygda(@CurrentUser UserBean userBean, @Validated @RequestBody AddygdaDto addygdaDto)
 	public Result<Object> addygda(@CurrentUser UserBean userBean, @Validated @RequestBody AddygdaDto addygdaDto)
 			throws Exception {
 			throws Exception {
 		Integer orgCode = userBean.getOrgCode();
 		Integer orgCode = userBean.getOrgCode();
+		String customNum = addygdaDto.getCustomNum();//自定义工号
 		String name = addygdaDto.getName();
 		String name = addygdaDto.getName();
 		String phone = addygdaDto.getPhone();
 		String phone = addygdaDto.getPhone();
 		Integer zjType = addygdaDto.getZjType();
 		Integer zjType = addygdaDto.getZjType();
 		String zjNum = addygdaDto.getZjNum();
 		String zjNum = addygdaDto.getZjNum();
+		int attgroupid = addygdaDto.getAttgroupid();//考勤组id
 		boolean isvalid = true;
 		boolean isvalid = true;
 		switch (zjType) {
 		switch (zjType) {
 		case 0:
 		case 0:
@@ -306,7 +308,11 @@ public class YgglController {
 					.status(CommonEnum.U_STS_ON.getType()).build().insert();
 					.status(CommonEnum.U_STS_ON.getType()).build().insert();
 			ygglMainEmp = YgglMainEmp.builder().name(name).phone(phone).zjType(zjType).zjNum(zjNum).jobType(jobType)
 			ygglMainEmp = YgglMainEmp.builder().name(name).phone(phone).zjType(zjType).zjNum(zjNum).jobType(jobType)
 					.jobStatus(jobStatus.SHIYONG.getType()).rzTime(rzTime).syq(syq).sex(sex)
 					.jobStatus(jobStatus.SHIYONG.getType()).rzTime(rzTime).syq(syq).sex(sex)
-					.empNum(login.getId()).orgCode(orgCode).bmgwId(bmgwId).build();
+					.empNum(login.getId()).orgCode(orgCode).bmgwId(bmgwId).customNum(customNum).build();
+			
+			if(addygdaDto.getAttgroupid() != null) {
+				KqglAssoYhkqz.builder().kqzid(attgroupid).userid(login.getId()).qyid(userBean.getOrgCode()).build().insert();
+			}
 			
 			
 			if(syq == 0) {
 			if(syq == 0) {
 				ygglMainEmp.setZzTime(rzTime);
 				ygglMainEmp.setZzTime(rzTime);

src/main/java/cn/timer/api/dto/yggl/AddygdaDto.java

@@ -73,5 +73,11 @@ public class AddygdaDto extends Page implements Serializable{
 	@ApiModelProperty(value="部门岗位id",example="0")
 	@ApiModelProperty(value="部门岗位id",example="0")
     private Integer bmgwId;
     private Integer bmgwId;
 	
 	
+	@ApiModelProperty(value="自定义工号",example="1001")
+	private String customNum;
+	
+	@ApiModelProperty(value="考勤组id",example="0")
+    private Integer attgroupid;
+	
 	
 	
 }
 }