From b32a787f5f6ae7b8f3db30f3d7ae709010552cd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com> Date: Fri, 28 Feb 2025 14:08:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B6=88=E6=81=AF=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=88=A0=E9=99=A4=EF=BC=8C=E6=8E=92=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/web/controller/wgz/controller/WgzAppController.java | 3 +++ ruoyi-system/src/main/java/com/ruoyi/task/BusinessTask.java | 1 + .../src/main/java/com/ruoyi/wgz/domain/WgzMessage.java | 1 + .../java/com/ruoyi/wgz/service/impl/WgzMessageServiceImpl.java | 2 -- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java index 8f015fb..be1251a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java @@ -413,6 +413,9 @@ public class WgzAppController { setAmount(recruitAmount); //3、查询当前进行中的项目是否有工资结算(多次追加) List gzs = iWgzPayCalculationService.findByUserIdRecruitIdNewestData(appUserId, appById.getId()); + if (gzs.isEmpty()){ + return AjaxResult.success(res); + } BigDecimal addSum = new BigDecimal(0); for (WgzPayCalculation gz : gzs) { //金额*天数=实际工资 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 c44f120..47d5f53 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/task/BusinessTask.java +++ b/ruoyi-system/src/main/java/com/ruoyi/task/BusinessTask.java @@ -117,6 +117,7 @@ public class BusinessTask //表示有上班缺卡，添加缺卡信息 if (count == 0) { //添加缺卡信息 + System.out.println("上班缺卡-------"+by.getUserId()); WgzAttendance attendance = new WgzAttendance() .setRecruitId(by.getRecruitId()) .setUserId(by.getUserId()) diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzMessage.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzMessage.java index 19885b5..a8e4f3e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzMessage.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzMessage.java @@ -94,6 +94,7 @@ public class WgzMessage implements Serializable { /** 删除标志（0代表存在 2代表删除） */ @Excel(name = "删除标志" , readConverterExp = "0=代表存在,2=代表删除") @ApiModelProperty("删除标志（0代表存在 2代表删除）") + @TableLogic private String delFlag; /** 创建者 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzMessageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzMessageServiceImpl.java index da0b719..9466e80 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzMessageServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzMessageServiceImpl.java @@ -163,8 +163,6 @@ public class WgzMessageServiceImpl extends ServicePlusImpl userGetMessageList(WgzAppGetMessageListReq req) { Long appUserId = SecurityUtils.getAppUserId(); WgzUser wgz = wgzUserService.findByUserId(appUserId); - - req.setRecipientId(appUserId); Page queryDTOPage = new Page<>(); queryDTOPage.setCurrent(req.getPageNum());