短信优化

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;
+
 }

bonus-business/src/main/java/com/bonus/job/mapper/PmTaskMapper.java

@@ -35,7 +35,7 @@ public interface PmTaskMapper {
 
     PmTask getOneLoopMsgData(PmTask o);
 
-    List<WorkerVo> getWorkerRecordByLoopId(String loopId);
+    List<WorkerVo> getWorkerRecordByLoopId(PmTask o);
 
     int updateOneWorkerData(WorkerVo o);
 

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<WorkerVo> list = mapper.getWorkerRecordByLoopId(o.getLoopId());
+        List<WorkerVo> list = mapper.getWorkerRecordByLoopId(o);
         return AjaxResult.success(list);
     }
 

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;
 
 }

bonus-business/src/main/resources/mapper/job/PmTaskMapper.xml

@@ -8,7 +8,7 @@
     <result column="msg_type" jdbcType="INTEGER" property="msgType" />
     <result column="send_content" jdbcType="VARCHAR" property="sendContent" />
     <result column="task_status" jdbcType="INTEGER" property="taskStatus" />
-    <result column="worker_count" property="workerCount"/>
+    <result column="message_content" property="messageContent"/>
     <result column="loopTime" property="loopTime"/>
     <result column="loop_id" property="loopId"/>
     <result column="concurrent" property="concurrent"/>
@@ -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}
+    <if test="sendStatus != null">
+        and btw.send_status = #{sendStatus}
+    </if>
   </select>
 
   <update id="updateOneWorkerData">

bonus-business/src/main/resources/mapper/job/WorkerJobMapper.xml

@@ -67,10 +67,10 @@
   </select>
 
   <insert id="insertTaskRecord">
-    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
     <foreach item="item" index="index" collection="list" separator=",">
-      (#{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})
     </foreach>
   </insert>
 
@@ -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')
   </select>
 
   <select id="getJobByJobId" resultType="com.bonus.job.domain.SysJob">