Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/NewNoticeTaskServiceImpl.java

@@ -250,12 +250,12 @@ public class NewNoticeTaskServiceImpl extends ServiceImpl<NoticeTaskMapper, Noti
      * 每天16.30点更新
      */
     @Transactional(rollbackFor = Exception.class)
-    @Scheduled(cron = "0 */5 * * * ?")
+//    @Scheduled(cron = "0 */5 * * * ?")
     public void call() throws Exception {
         Wrapper<NoticeTaskInfo> noticeTaskWrapper = new EntityWrapper();
         noticeTaskWrapper.eq("delete_flag", 0);
         noticeTaskWrapper.eq("accept_type","STAFF");
-        noticeTaskWrapper.notIn("accept_type","RETURN");
+        noticeTaskWrapper.notIn("notice_task_status","RETURN");
         noticeTaskWrapper.groupBy("accept_id");
         List<NoticeTaskInfo> noticeTaskInfos = this.selectList(noticeTaskWrapper);
 //        geTuiUtils.callPhone("111");

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/GeTuiUtils.java

@@ -187,6 +187,9 @@ public class GeTuiUtils {
     }
 
     public void callPhone(String userId) throws Exception {
+        CommonStaff commonStaff= commonStaffMapper.selectById(userId);
+        System.out.println("result = " + commonStaff.getStaffName());
+        System.out.println("----------------------");
       // 电话信息
 
         /*请修改为平台分配的accountId*/
@@ -196,7 +199,7 @@ public class GeTuiUtils {
         VoiceNotifyBody message = new VoiceNotifyBody();
         /*用户接收回执的服务器地址*/
         message.setCallbackUrl("http://192.168.1.102:9780/voice/api/VoiceWeb/receiveRecord");
-        CommonStaff commonStaff= commonStaffMapper.selectById(userId);
+//        CommonStaff commonStaff= commonStaffMapper.selectById(userId);
 //        message.setCalleeNumber("18840825257");
         if(commonStaff != null){
         message.setCalleeNumber(commonStaff.getStaffMobilePhone());
@@ -205,7 +208,7 @@ public class GeTuiUtils {
         message.setDisplayNumber("");
 
         /*设置平台分配的模板ID*/
-        message.setTemplateId("401045");
+        message.setTemplateId("401047");
 
         LinkedHashMap<String,String> params = new LinkedHashMap<String,String>();
         /*设置模板参数*/