From 8aa28b5ce9b5c26bef1447eea0b843e6e4218651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= Date: Tue, 3 Feb 2026 14:31:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/job/domain/PmTask.java | 2 +- .../bonus/job/service/PmTaskServiceImpl.java | 26 ++++++++++++++++--- .../com/bonus/job/task/WorkerSendMsgTask.java | 4 +-- .../java/com/bonus/message/dao/WorkerVo.java | 2 +- .../service/impl/WorkerServiceImpl.java | 1 - .../resources/mapper/job/PmTaskMapper.xml | 4 +-- 6 files changed, 28 insertions(+), 11 deletions(-) diff --git a/bonus-business/src/main/java/com/bonus/job/domain/PmTask.java b/bonus-business/src/main/java/com/bonus/job/domain/PmTask.java index 01d10aa..0a3e6c8 100644 --- a/bonus-business/src/main/java/com/bonus/job/domain/PmTask.java +++ b/bonus-business/src/main/java/com/bonus/job/domain/PmTask.java @@ -43,7 +43,7 @@ public class PmTask { /** * 人员数量 */ - private String workerCount; + private Integer workerCount; /** * 人员列表 diff --git a/bonus-business/src/main/java/com/bonus/job/service/PmTaskServiceImpl.java b/bonus-business/src/main/java/com/bonus/job/service/PmTaskServiceImpl.java index c93a467..4556163 100644 --- a/bonus-business/src/main/java/com/bonus/job/service/PmTaskServiceImpl.java +++ b/bonus-business/src/main/java/com/bonus/job/service/PmTaskServiceImpl.java @@ -7,10 +7,12 @@ import com.bonus.common.utils.DateUtils; import com.bonus.common.utils.SecurityUtils; import com.bonus.common.utils.StringUtils; import com.bonus.job.domain.SysJob; +import com.bonus.job.mapper.WorkerJobMapper; import com.bonus.job.util.CronUtils; import com.bonus.job.util.MessageSendUtil; import com.bonus.job.util.ScheduleUtils; import com.bonus.message.dao.WorkerVo; +import com.bonus.message.service.WorkerService; import lombok.extern.slf4j.Slf4j; import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; @@ -34,9 +36,27 @@ public class PmTaskServiceImpl implements PmTaskService{ @Autowired private ISysJobService jobService; + @Resource + private WorkerJobMapper workerJobMapper; + @Resource + private WorkerService workerService; + + @Override public List getMsgTaskList(PmTask task) { - return mapper.getMsgTaskList(task); + List msgTaskList = mapper.getMsgTaskList(task); + msgTaskList.forEach(o -> { + //人数，改成了sex,groupList,和workerList + List workerList; + if(o.getId() == 1){ + //生日任务默认为系统所有人 + workerList = workerService.getWorkerList(new WorkerVo()); + }else{ + workerList = workerJobMapper.getWorkerByJobId(String.valueOf(o.getId())); + } + o.setWorkerCount(workerList.size()); + }); + return msgTaskList; } @Transactional @@ -239,11 +259,11 @@ public class PmTaskServiceImpl implements PmTaskService{ String[] split = msgResult.split(","); if (split.length == 2 && "ok".equals(split[0])) { // 发送成功，更新任务状态为成功 - o.setSubmitStatus(split[0]); + o.setSubmitStatus("提交成功"); o.setBatchNumber(split[1]); } else { // 发送失败，更新任务状态为失败 - o.setSubmitStatus(split[0]); + o.setSubmitStatus("提交失败"); o.setReason(split[1]); } // 在设置发送时间时使用时分秒格式 diff --git a/bonus-business/src/main/java/com/bonus/job/task/WorkerSendMsgTask.java b/bonus-business/src/main/java/com/bonus/job/task/WorkerSendMsgTask.java index 7928225..edbe57f 100644 --- a/bonus-business/src/main/java/com/bonus/job/task/WorkerSendMsgTask.java +++ b/bonus-business/src/main/java/com/bonus/job/task/WorkerSendMsgTask.java @@ -108,7 +108,7 @@ public class WorkerSendMsgTask{ userList.forEach(user -> { user.setLoopId(String.valueOf(loopId)); user.setPhone(user.getPhone()); - user.setSubmitStatus(split[0]); + user.setSubmitStatus("提交成功"); user.setBatchNumber(split[1]); // 在设置发送时间时使用时分秒格式 user.setSendTime(DateUtils.getTime()); // 简洁且安全 @@ -119,7 +119,7 @@ public class WorkerSendMsgTask{ userList.forEach(user -> { user.setLoopId(String.valueOf(loopId)); user.setPhone(user.getPhone()); - user.setSubmitStatus(split[0]); + user.setSubmitStatus("提交失败"); user.setReason(split[1]); // 在设置发送时间时使用时分秒格式 user.setSendTime(DateUtils.getTime()); // 简洁且安全 diff --git a/bonus-business/src/main/java/com/bonus/message/dao/WorkerVo.java b/bonus-business/src/main/java/com/bonus/message/dao/WorkerVo.java index df278f4..027310a 100644 --- a/bonus-business/src/main/java/com/bonus/message/dao/WorkerVo.java +++ b/bonus-business/src/main/java/com/bonus/message/dao/WorkerVo.java @@ -61,7 +61,7 @@ public class WorkerVo { /** * 修改时间 */ - private Date updateTime; + private String updateTime; /** * 关键字 diff --git a/bonus-business/src/main/java/com/bonus/message/service/impl/WorkerServiceImpl.java b/bonus-business/src/main/java/com/bonus/message/service/impl/WorkerServiceImpl.java index c908ce0..3dfb8e3 100644 --- a/bonus-business/src/main/java/com/bonus/message/service/impl/WorkerServiceImpl.java +++ b/bonus-business/src/main/java/com/bonus/message/service/impl/WorkerServiceImpl.java @@ -69,7 +69,6 @@ public class WorkerServiceImpl implements WorkerService { */ @Override public int updateWorker(WorkerVo workerVo) { - workerVo.setUpdateTime(new Date()); if (StringUtils.isNotEmpty(workerVo.getPhone())){ //判断该手机号是否存在 WorkerVo worker = workerMapper.getWorkerByPhone(workerVo); diff --git a/bonus-business/src/main/resources/mapper/job/PmTaskMapper.xml b/bonus-business/src/main/resources/mapper/job/PmTaskMapper.xml index fadd679..623d848 100644 --- a/bonus-business/src/main/resources/mapper/job/PmTaskMapper.xml +++ b/bonus-business/src/main/resources/mapper/job/PmTaskMapper.xml @@ -26,10 +26,9 @@