From 63a63a23302c6e98f8f742431c50dd5501ba5a2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com> Date: Mon, 24 Mar 2025 09:54:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E4=B8=8E=E8=AF=B7=E5=81=87?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8B=9B=E5=B7=A5=E7=94=B3=E8=AF=B7=E4=B8=BB?= =?UTF-8?q?=E9=94=AE=E8=87=AA=E5=A2=9Eid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BgtProjectRecruitApplyServiceImpl.java | 10 ++++++++++ .../src/main/java/com/ruoyi/common/util/ValidUtil.java | 4 ++-- .../src/main/java/com/ruoyi/task/BusinessTask.java | 3 ++- .../main/java/com/ruoyi/wgz/domain/WgzAttendance.java | 5 +++++ .../src/main/java/com/ruoyi/wgz/domain/WgzLeave.java | 8 +++++++- .../wgz/service/impl/WgzAttendanceServiceImpl.java | 1 + .../ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java | 1 + .../wgz/service/impl/WgzPayCalculationServiceImpl.java | 2 +- 8 files changed, 29 insertions(+), 5 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java index 6248595..63cf735 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java @@ -17,6 +17,7 @@ import com.ruoyi.bgt.mapper.BgtProjectRecruitApplyMapper; import com.ruoyi.bgt.service.IBgtMessageService; import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService; import com.ruoyi.bgt.service.IBgtProjectRecruitService; +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.ruoyi.common.core.page.TableDataInfo; @@ -32,6 +33,7 @@ import com.ruoyi.system.service.ISysDictTypeService; import com.ruoyi.wgz.bo.req.WgzAppConfirmRegistrationReq; import com.ruoyi.wgz.bo.req.WgzAppUnderwayReq; import com.ruoyi.wgz.bo.res.WgzAppUnderwayRes; +import com.ruoyi.wgz.bo.res.WgzAppUserScoreQuery; import com.ruoyi.wgz.bo.rests.WgzAppUserAllRecruitmentTwo; import com.ruoyi.wgz.domain.WgzMessage; import com.ruoyi.wgz.domain.WgzScoreRecord; @@ -107,6 +109,9 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl(). diff --git a/ruoyi-system/src/main/java/com/ruoyi/common/util/ValidUtil.java b/ruoyi-system/src/main/java/com/ruoyi/common/util/ValidUtil.java index d09bbd2..ec230de 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/common/util/ValidUtil.java +++ b/ruoyi-system/src/main/java/com/ruoyi/common/util/ValidUtil.java @@ -8,8 +8,8 @@ package com.ruoyi.common.util; public class ValidUtil { public static boolean isValidIdentityCard(String identityCard) { - // 简单的身份证号校验逻辑，可以根据需要进行更复杂的校验 - return identityCard != null && identityCard.matches("\\d{15}|\\d{18}"); + // 允许15位纯数字或者18位身份证，18位身份证最后一位可以是数字或字母X/x + return identityCard != null && identityCard.matches("\\d{15}|\\d{17}[\\dXx]"); } public static boolean isValidBankCard(String bankCard) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/task/BusinessTask.java b/ruoyi-system/src/main/java/com/ruoyi/task/BusinessTask.java index c42c70f..f6776e7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/task/BusinessTask.java +++ b/ruoyi-system/src/main/java/com/ruoyi/task/BusinessTask.java @@ -193,9 +193,9 @@ public class BusinessTask //表示有上班缺卡，添加缺卡信息 if (count == 0) { //添加缺卡信息 - System.out.println("上班缺卡-------"+by.getUserId()); WgzAttendance attendance = new WgzAttendance() .setRecruitId(by.getRecruitId()) + .setApplyKey(by.getId()) .setUserId(by.getUserId()) .setDailyWage(recruit.getRecruitAmount()) .setDate(now) @@ -369,6 +369,7 @@ public class BusinessTask //获取到请假天数 WgzAttendance wgzAttendance = new WgzAttendance(). setRecruitId(wgzLeave.getRecruitId()). + setApplyKey(wgzLeave.getApplyKey()). setUserId(wgzLeave.getUserId()). setLeaveMarkId(wgzLeave.getId()). setDate(formattedDate). diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzAttendance.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzAttendance.java index 97e8a9b..3bc6c0c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzAttendance.java +++ b/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") diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzLeave.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzLeave.java index e5926f4..c16cede 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzLeave.java +++ b/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; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java index 1eba9a4..4ded678 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzAttendanceServiceImpl.java @@ -182,6 +182,7 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl objects = new ArrayList<>();