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 0a3e6c8..a25a31a 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 @@ -14,7 +14,6 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class PmTask { private Integer id; - /** * 任务名称 */ 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 4556163..eb40f6b 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 @@ -146,7 +146,12 @@ public class PmTaskServiceImpl implements PmTaskService{ job.setMisfirePolicy(task.getMisfirePolicy()); job.setConcurrent(task.getConcurrent()); job.setStatus(task.getTaskStatus()); - job.setInvokeTarget("workerSendMsgTask.sendMsg('"+task.getId()+"')"); + //修改时不该任务，默认原任务，不然会影响生日等特殊任务 + if(task.getId() == 1){ + job.setInvokeTarget("workerSendMsgTask.sendHappyBirthDayMsg('1')"); + }else{ + job.setInvokeTarget("workerSendMsgTask.sendMsg('"+task.getId()+"')"); + } job.setRelationId(task.getId()); job.setRelationType("短信"); job.setUpdateBy(SecurityUtils.getUsername()); @@ -163,8 +168,6 @@ public class PmTaskServiceImpl implements PmTaskService{ } int update = mapper.update(task); if(update > 0){ - //修改时不该任务，默认原任务，不然会影响生日等特殊任务 - job.setInvokeTarget(null); int i = jobService.updateJob(job); List allList = new ArrayList<>(); List workerList = task.getWorkerList(); @@ -218,6 +221,8 @@ public class PmTaskServiceImpl implements PmTaskService{ WorkerVo bean = new WorkerVo(); bean.setBatchNumber(splitStatus[0]); bean.setPhone(splitStatus[1]); + // 在设置发送时间时使用时分秒格式 + bean.setSendTime(DateUtils.getTime()); // 简洁且安全 if("1".equals(splitStatus[2])){ bean.setSendStatus("发送成功"); }else{ @@ -266,9 +271,6 @@ public class PmTaskServiceImpl implements PmTaskService{ o.setSubmitStatus("提交失败"); o.setReason(split[1]); } - // 在设置发送时间时使用时分秒格式 - // 只要年月日 → 用 LocalDate - o.setSendTime(DateUtils.getTime()); // 简洁且安全 int i = mapper.updateOneWorkerData(o); return i > 0 ? AjaxResult.success("更新成功") : AjaxResult.error("更新失败"); } 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 edbe57f..0c786d2 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 @@ -110,8 +110,6 @@ public class WorkerSendMsgTask{ user.setPhone(user.getPhone()); user.setSubmitStatus("提交成功"); user.setBatchNumber(split[1]); - // 在设置发送时间时使用时分秒格式 - user.setSendTime(DateUtils.getTime()); // 简洁且安全 }); } else { @@ -121,8 +119,6 @@ public class WorkerSendMsgTask{ user.setPhone(user.getPhone()); user.setSubmitStatus("提交失败"); user.setReason(split[1]); - // 在设置发送时间时使用时分秒格式 - user.setSendTime(DateUtils.getTime()); // 简洁且安全 }); } mapper.insertTaskRecord(userList); 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 027310a..7f63e3e 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 @@ -93,4 +93,5 @@ public class WorkerVo { private String submitStatus; private String sendStatus; private String reason; + private String submitTime; } diff --git a/bonus-business/src/main/java/com/bonus/message/service/impl/GroupServiceImpl.java b/bonus-business/src/main/java/com/bonus/message/service/impl/GroupServiceImpl.java index a25c6b3..f1eb4c0 100644 --- a/bonus-business/src/main/java/com/bonus/message/service/impl/GroupServiceImpl.java +++ b/bonus-business/src/main/java/com/bonus/message/service/impl/GroupServiceImpl.java @@ -43,7 +43,6 @@ public class GroupServiceImpl implements GroupService { @Override @Transactional public int addGroup(GroupVo groupVo) { - groupVo.setCreateTime(new Date()); if (StringUtils.isNotEmpty(groupVo.getGroupName())){ //判断该分组是否存在 GroupVo group = groupMapper.getGroupByName(groupVo); @@ -58,7 +57,6 @@ public class GroupServiceImpl implements GroupService { groupMapper.addGroupDetails(worker); } return 1; - } /** diff --git a/bonus-business/src/main/resources/mapper/GroupMapper.xml b/bonus-business/src/main/resources/mapper/GroupMapper.xml index 3b5318e..7131b06 100644 --- a/bonus-business/src/main/resources/mapper/GroupMapper.xml +++ b/bonus-business/src/main/resources/mapper/GroupMapper.xml @@ -31,7 +31,7 @@ - update bm_task_record set batch_number= #{batchNumber},submit_status = #{submitStatus},reason = #{reason} where id = #{id} + update bm_task_record set batch_number= #{batchNumber},submit_status = #{submitStatus},reason = #{reason},send_time = null where id = #{id} - insert into bm_task_record (task_id, loop_id, worker_id, phone, batch_number, submit_status, send_time, reason) + insert into bm_task_record (task_id, loop_id, worker_id, phone, batch_number, submit_status, reason) values - (#{item.taskId}, #{item.loopId}, #{item.id}, #{item.phone}, #{item.batchNumber}, #{item.submitStatus}, #{item.sendTime}, #{item.reason}) + (#{item.taskId}, #{item.loopId}, #{item.id}, #{item.phone}, #{item.batchNumber}, #{item.submitStatus}, #{item.reason}) diff --git a/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml index f763f0f..0990cd3 100644 --- a/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -20,10 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - -