1、修改BUG382对排班制考勤进行修改，修改成员后，在考勤排班页修改考勤月份，人员信息、班次信息显示的是修改前的内容

2、修改BUG106自定义共工号没有和其他模块关联

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

@@ -162,7 +162,7 @@ public class YgglMainLzb extends Model<YgglMainLzb> {
     private Integer isJrkq;
     private Integer isJrkq;
     
     
 	@ApiModelProperty(value="公司内部工号 就是公司内部自己设置的工号",example="101")
 	@ApiModelProperty(value="公司内部工号 就是公司内部自己设置的工号",example="101")
-    private Integer jobNum;
+    private String jobNum;
     
     
 	@ApiModelProperty(value="工作地点 ",example="工作地点")
 	@ApiModelProperty(value="工作地点 ",example="工作地点")
     private String workAddress;
     private String workAddress;

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

@@ -31,6 +31,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -1407,9 +1408,10 @@ public class YgglController {
 				.update(new UpdateWrapper<YgglMainEmp>().lambda()
 				.update(new UpdateWrapper<YgglMainEmp>().lambda()
 						.eq(YgglMainEmp::getEmpNum, empNum)
 						.eq(YgglMainEmp::getEmpNum, empNum)
 						.eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()));
 						.eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()));
-		
+		//设置员工自定义工号工号
+		String jobNum = StringUtils.isEmpty(ygglMainEmp.getCustomNum())?ygglMainEmp.getEmpNum().toString():ygglMainEmp.getCustomNum();
 		YgglMainLzb.builder().jobStatus(jobStatus.LIZHIZHONG.getType()).lzTime(lzygQueryDto.getLzTime())
 		YgglMainLzb.builder().jobStatus(jobStatus.LIZHIZHONG.getType()).lzTime(lzygQueryDto.getLzTime())
-				.lzyy(lzygQueryDto.getLzyy()).lzbz(lzygQueryDto.getLzbz()).build()
+				.lzyy(lzygQueryDto.getLzyy()).lzbz(lzygQueryDto.getLzbz()).jobNum(jobNum).build()
 				.update(new UpdateWrapper<YgglMainLzb>().lambda()
 				.update(new UpdateWrapper<YgglMainLzb>().lambda()
 						.eq(YgglMainLzb::getEmpNum, empNum)
 						.eq(YgglMainLzb::getEmpNum, empNum)
 						.eq(YgglMainLzb::getOrgCode, userBean.getOrgCode()));
 						.eq(YgglMainLzb::getOrgCode, userBean.getOrgCode()));

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

@@ -59,4 +59,7 @@ public class LzbDto extends Page implements Serializable{
 	
 	
 	@ApiModelProperty(value="实际离职时间",example="离职备注")
 	@ApiModelProperty(value="实际离职时间",example="离职备注")
 	private Date sjlz;
 	private Date sjlz;
+
+	@ApiModelProperty(value="公司内部工号 就是公司内部自己设置的工号",example="101")
+	private String jobNum;
 }
 }

src/main/resources/mapping/yggl/YgglMainLzbMapper.xml

@@ -189,7 +189,8 @@
 			a.phone `phone`,
 			a.phone `phone`,
 			a.lzbz `bz`,
 			a.lzbz `bz`,
 			a.lzyy lzyy,
 			a.lzyy lzyy,
-			a.sjlz_time sjlz
+			a.sjlz_time sjlz,
+			a.job_num
 		FROM
 		FROM
 			yggl_main_lzb a
 			yggl_main_lzb a
 		LEFT JOIN zzgl_bmgw_m b ON a.bmgw_id = b.id
 		LEFT JOIN zzgl_bmgw_m b ON a.bmgw_id = b.id
@@ -202,7 +203,7 @@
 		</if>
 		</if>
 		<if test ="null != q.query and q.query !=''">
 		<if test ="null != q.query and q.query !=''">
 		AND
 		AND
-			(a.name like CONCAT('%',#{q.query},'%') OR a.emp_num like CONCAT('%',#{q.query},'%'))
+			(a.name like CONCAT('%',#{q.query},'%') OR a.emp_num like CONCAT('%',#{q.query},'%') OR a.job_num like CONCAT('%',#{q.query},'%'))
 		</if>
 		</if>
 		ORDER BY a.job_status ASC
 		ORDER BY a.job_status ASC
     </select>
     </select>