1

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java

@@ -393,7 +393,7 @@ public class WgzAppController {
 		WgzApplyForPayrollSettlementAddRes res = new WgzApplyForPayrollSettlementAddRes();
 		Long appUserId = SecurityUtils.getAppUserId();
 		BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(appUserId);
-		BgtProjectRecruit appById = iBgtProjectRecruitService.getAppById(by.getId());
+		BgtProjectRecruit appById = iBgtProjectRecruitService.getAppById(by.getRecruitId());
 		//1、先获取项目详情基本信息
 		WgzAppProjectDetailsRes wgzAppProjectDetailsRes = iBgtProjectRecruitService.userProjectDetails(id);
 		BeanUtils.copyProperties(wgzAppProjectDetailsRes, res);

ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java

@@ -474,7 +474,7 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl<BgtProjec
 		BgtProjectRecruitApply recruitApply = queryById(req.getRecruitApplyId());
 		BgtProjectRecruit recruit = iBgtProjectRecruitService.getAppById(recruitApply.getRecruitId());
 		//数据库行级锁
-		String s = new WgzMessageServiceImpl().JudgingRecruitment(recruit.getId(), recruit.getRecruitStaffNum(), recruit.getRecruitEndTime());
+		String s = new WgzMessageServiceImpl().JudgingRecruitment(req.getRecruitApplyId(), recruit.getRecruitStaffNum(), recruit.getRecruitEndTime());
 		switch (s) {
 			case "1":
 				throw new RuntimeException("已招满！");

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppRegistrationInformationRes.java

@@ -44,7 +44,7 @@ public class WgzAppRegistrationInformationRes implements Serializable {
 	private String recruitAmount;
 
 	@ApiModelProperty("招工数量")
-	private int recruitStaffNum;
+	private String recruitStaffNum;
 
 	@ApiModelProperty("任务名称")
 	private String taskName;

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

@@ -169,6 +169,8 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl<WgzAttendanceMappe
 //			LocalDate localDate = startTime.toLocalDate();
 //			throw new RuntimeException("您有已通过的请假申请，请假时间为："+localDate);
 //		}
+		//4、在进场时间时才能打卡，如果有退场记录就不允许打卡
+
 		//5、查看当前人、当前工地、当天的打卡记录
 		String formattedDate = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
 		WgzAttendance we = publicFindByUserIdWait(appUserId, by.getRecruitId(), formattedDate);

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

@@ -210,7 +210,7 @@ public class WgzMessageServiceImpl extends ServicePlusImpl<WgzMessageMapper, Wgz
 		//2、根据招工ID得到招工信息及附件
 		WgzAppRegistrationInformationRes byRecruitIdData = baseMapper.findByRecruitIdData(byId.getTableId());
 		byRecruitIdData.setMessageId(byId.getId()).setIsOperation(byId.getIsOperation());
-		byRecruitIdData.setFull(JudgingRecruitment(byId.getTableId(), byRecruitIdData.getRecruitStaffNum(), byRecruitIdData.getRecruitEndTime()));
+		byRecruitIdData.setFull(JudgingRecruitment(byId.getTableId(), Integer.parseInt(byRecruitIdData.getRecruitStaffNum()), byRecruitIdData.getRecruitEndTime()));
 		return byRecruitIdData;
 	}