Merge branch 'dev-xym-add-special' of Server/growth-manager into master

common-module/src/main/java/com/tzld/piaoquan/growth/common/dao/mapper/SpecialSendMessageMapper.java

@@ -36,6 +36,6 @@ public interface SpecialSendMessageMapper {
 
     List<SpecialSendMessage> getGroupList(@Param("preSendDate") String preSendDate);
 
-    List<String> selectExternalUserId(@Param("staffId") Long staffId, @Param("group") Integer group,
-                                      @Param("preSendDate") String preSendDate);
+    List<String> selectExternalUserId(@Param("staffId") Long staffId, @Param("content") String content,
+                                      @Param("group") Integer group, @Param("preSendDate") String preSendDate);
 }

common-module/src/main/resources/mapper/SpecialSendMessageMapper.xml

@@ -311,7 +311,8 @@
         from we_com_special_send_message t1
         left join we_com_user t2 on t1.user_id = t2.id
         where t1.staff_id = #{staffId,jdbcType=BIGINT}
-        and t1.group = #{group,jdbcType=INTEGER}
+        and t1.content = #{content,jdbcType=INTEGER}
+        and t1.group = #{group,jdbcType=VARCHAR}
         and t1.pre_send_date = #{preSendDate,jdbcType=VARCHAR}
         and t1.is_send = 0
     </select>

offline-module/src/main/java/com/tzld/piaoquan/offline/job/WeComSpecialDataJob.java

@@ -185,7 +185,8 @@ public class WeComSpecialDataJob {
         List<SpecialSendMessage> groupList = specialSendMessageMapper.getGroupList(thatDayDateString);
         for (SpecialSendMessage specialSendMessage : groupList) {
             List<String> externalUserIds = specialSendMessageMapper.selectExternalUserId(specialSendMessage.getStaffId(),
-                    specialSendMessage.getGroup(), thatDayDateString);
+                    specialSendMessage.getContent(), specialSendMessage.getGroup(), thatDayDateString);
+            System.out.println(externalUserIds);
             boolean flag = specialPushMessage(externalUserIds, specialSendMessage);
             if (flag) {
                 SpecialSendMessage updateSpecialSendMessage = new SpecialSendMessage();