From 82e618a9f983d25d1f689f62d699fc2db298ac1c Mon Sep 17 00:00:00 2001 From: zt Date: Thu, 13 Mar 2025 11:46:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/common/enums/AuditStatus.java | 8 ++++ .../bgt/domain/vo/BgtMessageDetailVO.java | 4 ++ .../bgt/domain/vo/WgzAttendanceRecordVO.java | 2 +- .../service/impl/BgtMessageServiceImpl.java | 20 +++++++--- .../common/constants/BgtMessageConstant.java | 35 ++++++++++------- .../impl/WgzAttendanceServiceImpl.java | 6 ++- .../impl/WgzDailyClockServiceImpl.java | 38 ++++++++++++++++--- .../mapper/wgz/WgzDailyClockMapper.xml | 1 + .../mapper/wgz/WgzPayCalculationMapper.xml | 1 + 9 files changed, 89 insertions(+), 26 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/AuditStatus.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/AuditStatus.java index 5c27037..8acfdf9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/AuditStatus.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/AuditStatus.java @@ -1,5 +1,8 @@ package com.ruoyi.common.enums; +import java.util.Arrays; +import java.util.List; + /** * 审核状态 * @@ -30,4 +33,9 @@ public enum AuditStatus { return info; } + + + public static List getAudit(){ + return Arrays.asList(PASS.getCode(),REFUSE.getCode()); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtMessageDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtMessageDetailVO.java index db475ee..3d71c76 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtMessageDetailVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/BgtMessageDetailVO.java @@ -77,4 +77,8 @@ public class BgtMessageDetailVO implements Serializable { //任务 结算共用 @ApiModelProperty("任务名称") private String taskName; + + // + @ApiModelProperty("今日完成工作") + private String finishToday; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/WgzAttendanceRecordVO.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/WgzAttendanceRecordVO.java index c3f3950..d22a30d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/WgzAttendanceRecordVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/vo/WgzAttendanceRecordVO.java @@ -20,7 +20,7 @@ import java.time.LocalTime; @Data @NoArgsConstructor @Accessors(chain = true) -@ApiModel("考勤打卡视图对象") +@ApiModel("考勤打卡统计记录对象") public class WgzAttendanceRecordVO implements Serializable { private static final long serialVersionUID=1L; diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtMessageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtMessageServiceImpl.java index 4eb1b3d..8852f59 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtMessageServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtMessageServiceImpl.java @@ -25,13 +25,11 @@ import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.fbs.domain.FbsProjectTask; import com.ruoyi.fbs.service.IFbsProjectTaskService; +import com.ruoyi.wgz.domain.WgzDailyClock; import com.ruoyi.wgz.domain.WgzLeave; import com.ruoyi.wgz.domain.WgzPayCalculation; import com.ruoyi.wgz.domain.WgzReissueacard; -import com.ruoyi.wgz.service.IWgzLeaveService; -import com.ruoyi.wgz.service.IWgzPayCalculationService; -import com.ruoyi.wgz.service.IWgzReissueacardService; -import com.ruoyi.wgz.service.IWgzUserService; +import com.ruoyi.wgz.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -75,6 +73,9 @@ public class BgtMessageServiceImpl extends ServicePlusImpl result = page(PageUtils.buildPage(), wrapper); Page bgtMessageVOPage = new Page<>(); bgtMessageVOPage.setTotal(result.getTotal()); @@ -224,6 +228,12 @@ public class BgtMessageServiceImpl extends ServicePlusImpl务工者 模板================================================== @@ -40,15 +41,19 @@ public class BgtMessageConstant { //取消选择 public static final String BGT_LEAVE_CANSEL_HEADLINE = "您已从【%s】项目离开！"; public static final String BGT_LEAVE_CANSEL_SUBHEADING_ONE = "您在【%s】项目中被【%s】拒绝！"; + //取消选择 + public static final String BGT_LEAVE_REPORT_MAKE_UP_HEADLINE = "您【%s】项目的日报补卡已审批！"; + public static final String BGT_LEAVE_REPORT_MAKE_UP_SUBHEADING_ONE = "您【%s】项目的日报补卡,审核人【%s】已%s"; //包工头->务工者 消息类型 - public static final String BGT_TYPE_SIGN_UP = "1"; //务工者报名 - public static final String BGT_TYPE_PAY = "2"; //付款 - public static final String BGT_TYPE_LEAVE = "3"; //请假 - public static final String BGT_TYPE_MAKE_UP = "4"; //补卡 - public static final String BGT_TYPE_EXIT = "5"; //退场 - public static final String BGT_TYPE_CANSEL = "11"; //取消选择 + public static final String BGT_TYPE_SIGN_UP = "1"; //务工者报名 + public static final String BGT_TYPE_PAY = "2"; //付款 + public static final String BGT_TYPE_LEAVE = "3"; //请假 + public static final String BGT_TYPE_MAKE_UP = "4"; //补卡 + public static final String BGT_TYPE_EXIT = "5"; //退场 + public static final String BGT_TYPE_CANSEL = "11"; //取消选择 + public static final String BGT_TYPE_REPORT_MAKE_UP = "12"; //日报补卡 /** @@ -155,6 +160,10 @@ public class BgtMessageConstant { map.put(HEADLINE, String.format(BGT_LEAVE_CANSEL_HEADLINE, projectName)); map.put(SUBHEADING, String.format(BGT_LEAVE_CANSEL_SUBHEADING_ONE, projectName,auditor)); break; + case "12": + map.put(HEADLINE, String.format(BGT_LEAVE_REPORT_MAKE_UP_HEADLINE, projectName)); + map.put(SUBHEADING, String.format(BGT_LEAVE_REPORT_MAKE_UP_SUBHEADING_ONE, projectName,auditor,pass)); + break; default: break; } 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 b326afa..40cb726 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 @@ -628,6 +628,7 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl wgzAttendances = baseMapper.selectList(wrapper); //获取招工打卡时间 @@ -670,14 +671,14 @@ public class WgzAttendanceServiceImpl extends ServicePlusImpl mp = new HashMap<>(); + mp.put("projectName",recruit.getRecruitName()); + mp.put("auditor",SecurityUtils.getUsername()); + Map map = bgtMessage(mp, BGT_TYPE_REPORT_MAKE_UP, AuditStatus.PASS.getCode().equals(dto.getAuditorType())); + WgzMessage wgzMessage = new WgzMessage() + .setSenderType(USERTYPE_BGT) + .setSenderId(SecurityUtils.getAppUserId()) + .setRecipientType(USERTYPE_WGZ) + .setRecipientId(dailyClock.getUserId()) + .setHeadline(map.get(HEADLINE)) + .setSubheading(map.get(SUBHEADING)) + .setTableId(dailyClock.getId()) + .setTableName(SqlHelper.table(WgzDailyClock.class).getTableName()) + .setMessageLargeType(LARGE_OTHER) + .setMessageSmallType(SMALL_DAILY); + iWgzMessageService.sendAMessage(wgzMessage); + } + + } return updateById(dailyClock); } } diff --git a/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml b/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml index 6e37043..8086365 100644 --- a/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml @@ -67,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and DATE(wdc.dily_time) = #{dto.dilyTime} + order by wdc.create_time desc diff --git a/ruoyi-system/src/main/resources/mapper/wgz/WgzPayCalculationMapper.xml b/ruoyi-system/src/main/resources/mapper/wgz/WgzPayCalculationMapper.xml index 35b7443..dce1793 100644 --- a/ruoyi-system/src/main/resources/mapper/wgz/WgzPayCalculationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wgz/WgzPayCalculationMapper.xml @@ -193,6 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{auditorType} + order by w.create_time desc