考勤与请假增加招工申请主键自增id

ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzAttendance.java

@@ -42,6 +42,11 @@ public class WgzAttendance implements Serializable {
     @ApiModelProperty("项目ID")
     private Long recruitId;
 
+	/** 招工申请主键自增id */
+	@Excel(name = "招工申请主键自增id")
+	@ApiModelProperty("招工申请主键自增id")
+	private Long applyKey;
+
     /** 人员ID */
     @Excel(name = "人员ID")
     @ApiModelProperty("人员ID")

ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzLeave.java

@@ -41,7 +41,13 @@ public class WgzLeave implements Serializable {
     @ApiModelProperty("项目ID")
     private Long recruitId;
 
-    /** 项目ID */
+	/** 招工申请主键自增id */
+	@Excel(name = "招工申请主键自增id")
+	@ApiModelProperty("招工申请主键自增id")
+	private Long applyKey;
+
+
+	/** 项目ID */
     @Excel(name = "请假人")
     @ApiModelProperty("请假人")
     private Long userId;

ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java

@@ -182,6 +182,7 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
 		//6、组装完整的打卡信息
 		WgzAttendance wgzAttendance = new WgzAttendance().
 			setRecruitId(appById.getId()).
+			setApplyKey(by.getId()).
 			setUserId(appUserId).
 			setDailyWage(appById.getRecruitAmount()).
 			setDate(LocalDate.now());

ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java

@@ -178,6 +178,7 @@ public class WgzLeaveServiceImpl extends ServicePlusImpl<WgzLeaveMapper, WgzLeav
 		//6、组装请假对象数据 并插入
 		WgzLeave wgzLeave = new WgzLeave().
 			setRecruitId(by.getRecruitId()).
+			setApplyKey(by.getId()).
 			setSubject(appById.getRecruitName()).
 			setUserId(appUserId).
 			setLeaveType(req.getLeaveType()).

ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java

@@ -195,7 +195,7 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
 			.last("LIMIT " + req.getNum())
 		);
 		if (attList.size() < req.getNum()) { //判断剩余天数是否满足当前结算天数
-			throw new RuntimeException("您剩余可结算天数为："+attList.size()+"天，您当前想要结算的天数为："+req.getNum()+"天，剩余天数不足！");
+			throw new RuntimeException("您剩余可结算天数为："+attList.size()+"天！");
 		}
 		//3、把需要结算的数据标记为已结算
 		List<WgzAttendance> objects = new ArrayList<>();