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 a25a31a..ec6d8d0 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 @@ -88,4 +88,8 @@ public class PmTask { */ private Long jobId; + private String messageContent; + + private String sendStatus; + } diff --git a/bonus-business/src/main/java/com/bonus/job/mapper/PmTaskMapper.java b/bonus-business/src/main/java/com/bonus/job/mapper/PmTaskMapper.java index 833b2fc..7a95747 100644 --- a/bonus-business/src/main/java/com/bonus/job/mapper/PmTaskMapper.java +++ b/bonus-business/src/main/java/com/bonus/job/mapper/PmTaskMapper.java @@ -35,7 +35,7 @@ public interface PmTaskMapper { PmTask getOneLoopMsgData(PmTask o); - List getWorkerRecordByLoopId(String loopId); + List getWorkerRecordByLoopId(PmTask o); int updateOneWorkerData(WorkerVo o); 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 bca1430..6d377fe 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 @@ -249,7 +249,7 @@ public class PmTaskServiceImpl implements PmTaskService{ @Override public AjaxResult getOneLoopMsgData(PmTask o) { - List list = mapper.getWorkerRecordByLoopId(o.getLoopId()); + List list = mapper.getWorkerRecordByLoopId(o); return AjaxResult.success(list); } 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 1997848..65066a1 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 @@ -95,5 +95,6 @@ public class WorkerVo { private String reason; private String submitTime; + private String messageContent; } diff --git a/bonus-business/src/main/resources/mapper/job/PmTaskMapper.xml b/bonus-business/src/main/resources/mapper/job/PmTaskMapper.xml index ea8f9e8..ffdf7a2 100644 --- a/bonus-business/src/main/resources/mapper/job/PmTaskMapper.xml +++ b/bonus-business/src/main/resources/mapper/job/PmTaskMapper.xml @@ -8,7 +8,7 @@ - + @@ -107,6 +107,7 @@ pt.task_name, pt.remark, pt.msg_type, + btw.message_content, btw.create_time AS loopTime FROM pm_task pt @@ -160,6 +161,9 @@ left join sys_dept sd on w.org_id = sd.dept_id WHERE btw.loop_id = #{loopId} + + and btw.send_status = #{sendStatus} + diff --git a/bonus-business/src/main/resources/mapper/job/WorkerJobMapper.xml b/bonus-business/src/main/resources/mapper/job/WorkerJobMapper.xml index aa4e879..04ae4fd 100644 --- a/bonus-business/src/main/resources/mapper/job/WorkerJobMapper.xml +++ b/bonus-business/src/main/resources/mapper/job/WorkerJobMapper.xml @@ -67,10 +67,10 @@ - insert into bm_task_record (task_id, loop_id, worker_id, phone, batch_number, submit_status, reason) + insert into bm_task_record (task_id, loop_id, worker_id, phone, batch_number,message_content, submit_status, reason) values - (#{item.taskId}, #{item.loopId}, #{item.id}, #{item.phone}, #{item.batchNumber}, #{item.submitStatus}, #{item.reason}) + (#{item.taskId}, #{item.loopId}, #{item.id}, #{item.phone}, #{item.batchNumber},#{item.sendContent}, #{item.submitStatus}, #{item.reason}) @@ -86,7 +86,7 @@ FROM pm_task pt, pm_worker w WHERE pt.id = #{jobId} - AND w.birthday = CURRENT_DATE; + and DATE_FORMAT(w.birthday, '%m-%d') = DATE_FORMAT(CURRENT_DATE, '%m-%d')